From 1cae15f0bb7fba7b67bd1f1112f5db5e3e00168c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 28 Feb 2022 09:40:41 +0100
Subject: [PATCH] Polishing #2023

---
 src/main/java/io/lettuce/core/TimeoutOptions.java    |  2 +-
 .../io/lettuce/core/api/RedisServerCommands.java     |  2 ++
 .../topology/TopologyRefreshIntegrationTests.java    | 12 +++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
index 971f008589..f7c0807514 100644
--- a/src/main/java/io/lettuce/core/TimeoutOptions.java
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -23,7 +23,7 @@
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
- * Options for command timeouts. This options configure how and whether commands time out once they were dispatched. Command
+ * Options for command timeouts. These 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>
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 36434642ba..53e7d5de90 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -392,6 +392,7 @@ public interface RedisServerCommands<K, V> {
      * @return String simple-string-reply.
      * @deprecated since 6.1.7, use {@link #replicaof(String, int)} instead.
      */
+    @Deprecated
     String slaveof(String host, int port);
 
     /**
@@ -400,6 +401,7 @@ public interface RedisServerCommands<K, V> {
      * @return String simple-string-reply.
      * @deprecated since 6.1.7, use {@link #replicaofNoOne()} instead.
      */
+    @Deprecated
     String slaveofNoOne();
 
     /**
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 bcc09c0b46..4059de6ad6 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -20,7 +20,6 @@
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 
@@ -64,10 +63,13 @@
 class TopologyRefreshIntegrationTests extends TestSupport {
 
     private static final String host = TestSettings.hostAddr();
+
     private final RedisClient client;
 
     private RedisClusterClient clusterClient;
+
     private RedisCommands<String, String> redis1;
+
     private RedisCommands<String, String> redis2;
 
     @Inject
@@ -77,8 +79,8 @@ class TopologyRefreshIntegrationTests extends TestSupport {
 
     @BeforeEach
     void openConnection() {
-        clusterClient = RedisClusterClient.create(client.getResources(), RedisURI.Builder
-                .redis(host, ClusterTestSettings.port1).build());
+        clusterClient = RedisClusterClient.create(client.getResources(),
+                RedisURI.Builder.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();
     }
@@ -272,11 +274,10 @@ void adaptiveTriggerOnMoveRedirection() {
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots()).hasSize(0);
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node2.getNodeId()).getSlots()).hasSize(16384);
 
-        Future<String> b = connection.reactive().set("b", value).toFuture();// slot 3300
+        connection.reactive().set("b", value).toFuture();// slot 3300
 
         Wait.untilEquals(12000, () -> clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots().size())
                 .waitOrTimeout();
-        System.out.println(b);
 
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots()).hasSize(12000);
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node2.getNodeId()).getSlots()).hasSize(4384);
@@ -308,4 +309,5 @@ private void runReconnectTest(
         }
         clusterConnection.getStatefulConnection().close();
     }
+
 }