DATAREDIS-626 - Polishing.

Refactor server and scripting commands to their own implementations and interfaces. Fix JavaDoc indentations. Fix typos. Replace explicit type arguments with diamond syntax. Replace anonymous inner classes with method references and lambdas, where possible. Use shared ClientResources with LettuceConnectionFactory tests. Align reactive command implementation visibility with blocking command implementation visibility to package-protected. These implementations are not an extension point and subject to be used through their interfaces. Original pull request: spring-projects#247.

Author: mp911de

src/main/asciidoc/new-features.adoc

@@ -9,7 +9,9 @@ New and noteworthy in the latest releases.
 * Upgrade to Java 8.
 * Removed support for SRP and JRedis drivers.
 * Upgrade to `Lettuce` 5.0.
-* Reactive connection support using https://github.com/mp911de/lettuce[mp911de/lettuce]
+* Reactive connection support using https://github.com/lettuce-io/lettuce-core[lettuce-io/lettuce-core].
+* Introduce Redis feature-specific interfaces for `RedisConnection`.
+
 
 [[new-in-1.8.0]]
 == New in Spring Data Redis 1.8
@@ -30,7 +32,7 @@ New and noteworthy in the latest releases.
 * Support for Spring Data Repository abstractions (see <<redis.repositories>>).
 
 [[new-in-1-6-0]]
-== New in Spring Data Redis 1.6 
+== New in Spring Data Redis 1.6
 
 * The `Lettuce` Redis driver switched from https://github.com/wg/lettuce[wg/lettuce] to https://github.com/mp911de/lettuce[mp911de/lettuce].
 * Support for `ZRANGEBYLEX`.
@@ -39,7 +41,7 @@ New and noteworthy in the latest releases.
 * Generic Jackson2 `RedisSerializer` making use of Jackson's polymorphic deserialization.
 
 [[new-in-1-5-0]]
-== New in Spring Data Redis 1.5 
+== New in Spring Data Redis 1.5
 
 * Add support for Redis HyperLogLog commands `PFADD`, `PFCOUNT` and `PFMERGE`.
 * Configurable `JavaType` lookup for Jackson based `RedisSerializers`.

src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java

@@ -15,21 +15,8 @@
  */
 package org.springframework.data.redis.connection;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -215,13 +202,7 @@ public <S, T> MulitNodeResult<T> executeCommandAsyncOnNodes(final ClusterCommand
 Map<NodeExecution, Future<NodeResult<T>>> futures = new LinkedHashMap<NodeExecution, Future<NodeResult<T>>>();
 for (final RedisClusterNode node : resolvedRedisClusterNodes) {
 
-futures.put(new NodeExecution(node), executor.submit(new Callable<NodeResult<T>>() {
-
-@Override
-public NodeResult<T> call() throws Exception {
-return executeCommandOnSingleNode(callback, node);
-}
-}));
+futures.put(new NodeExecution(node), executor.submit(() -> executeCommandOnSingleNode(callback, node)));
 }
 
 return collectResults(futures);
@@ -310,13 +291,8 @@ public <S, T> MulitNodeResult<T> executeMuliKeyCommand(final MultiKeyClusterComm
 
 if (entry.getKey().isMaster()) {
 for (final byte[] key : entry.getValue()) {
-futures.put(new NodeExecution(entry.getKey(), key), executor.submit(new Callable<NodeResult<T>>() {
-
-@Override
-public NodeResult<T> call() throws Exception {
-return executeMultiKeyCommandOnSingleNode(cmd, entry.getKey(), key);
-}
-}));
+futures.put(new NodeExecution(entry.getKey(), key),
+executor.submit(() -> executeMultiKeyCommandOnSingleNode(cmd, entry.getKey(), key)));
 }
 }
 }

src/main/java/org/springframework/data/redis/connection/DefaultedRedisClusterConnection.java

@@ -15,10 +15,120 @@
  */
 package org.springframework.data.redis.connection;
 
+import java.util.List;
+import java.util.Properties;
+
+import org.springframework.data.redis.core.types.RedisClientInfo;
+
 /**
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.0
  */
 public interface DefaultedRedisClusterConnection extends RedisClusterConnection, DefaultedRedisConnection {
 
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void bgReWriteAof(RedisClusterNode node) {
+serverCommands().bgReWriteAof(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void bgSave(RedisClusterNode node) {
+serverCommands().bgSave(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default Long lastSave(RedisClusterNode node) {
+return serverCommands().lastSave(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void save(RedisClusterNode node) {
+serverCommands().save(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default Long dbSize(RedisClusterNode node) {
+return serverCommands().dbSize(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void flushDb(RedisClusterNode node) {
+serverCommands().flushDb(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void flushAll(RedisClusterNode node) {
+serverCommands().flushAll(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default Properties info(RedisClusterNode node) {
+return serverCommands().info(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default Properties info(RedisClusterNode node, String section) {
+return serverCommands().info(node, section);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void shutdown(RedisClusterNode node) {
+serverCommands().shutdown(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default List<String> getConfig(RedisClusterNode node, String pattern) {
+return serverCommands().getConfig(node, pattern);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void setConfig(RedisClusterNode node, String param, String value) {
+serverCommands().setConfig(node, param, value);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default void resetConfigStats(RedisClusterNode node) {
+serverCommands().resetConfigStats(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default Long time(RedisClusterNode node) {
+return serverCommands().time(node);
+}
+
+/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
+@Override
+@Deprecated
+default List<RedisClientInfo> getClientList(RedisClusterNode node) {
+return serverCommands().getClientList(node);
+}
 }