From 76770710a92d2d90d03af2ccdd023b46f4f6133e Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 22 Dec 2021 10:19:23 +0300
Subject: [PATCH] refactoring

---
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 .../spring/data/connection/RedissonClusterConnection.java   | 4 ++--
 .../src/test/java/org/redisson/RedisRunner.java             | 6 +++++-
 19 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/redisson-spring-data/redisson-spring-data-16/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-16/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-16/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-16/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 93fce4b30..c782b0c57 100644
--- a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -147,10 +147,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Red
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-17/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-17/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-17/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-17/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index fc8e4212d..21a2f974b 100644
--- a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -147,10 +147,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Red
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-18/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-18/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-18/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-18/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 01273d952..d50dea78c 100644
--- a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -148,10 +148,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Red
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-20/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-20/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-20/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-20/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-21/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-21/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-21/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-21/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-22/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-22/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-22/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-22/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-23/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-23/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-23/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-23/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-24/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-24/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-24/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-24/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-25/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-25/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-25/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-25/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();
diff --git a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
index 279a72c5c..3ba471134 100644
--- a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
+++ b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonClusterConnection.java
@@ -154,10 +154,10 @@ public class RedissonClusterConnection extends RedissonConnection implements Def
     @Override
     public ClusterInfo clusterGetClusterInfo() {
         RFuture<Map<String, String>> f = executorService.readAsync((String)null, StringCodec.INSTANCE, RedisCommands.CLUSTER_INFO);
-        syncFuture(f);
+        Map<String, String> entries = syncFuture(f);
 
         Properties props = new Properties();
-        for (Entry<String, String> entry : f.getNow().entrySet()) {
+        for (Entry<String, String> entry : entries.entrySet()) {
             props.setProperty(entry.getKey(), entry.getValue());
         }
         return new ClusterInfo(props);
diff --git a/redisson-spring-data/redisson-spring-data-26/src/test/java/org/redisson/RedisRunner.java b/redisson-spring-data/redisson-spring-data-26/src/test/java/org/redisson/RedisRunner.java
index bfa28f182..5f6a07eda 100644
--- a/redisson-spring-data/redisson-spring-data-26/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson-spring-data/redisson-spring-data-26/src/test/java/org/redisson/RedisRunner.java
@@ -16,7 +16,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisClientConfig;
@@ -893,9 +895,11 @@ public class RedisRunner {
                 RedisConnection connection = c.connect();
                 try {
                     connection.async(new RedisStrictCommand<Void>("SHUTDOWN", "NOSAVE", new VoidReplayConvertor()))
-                            .await(3, TimeUnit.SECONDS);
+                            .toCompletableFuture().get(3, TimeUnit.SECONDS);
                 } catch (InterruptedException interruptedException) {
                     //shutdown via command failed, lets wait and kill it later.
+                } catch (ExecutionException | TimeoutException e) {
+                    // skip
                 }
                 c.shutdown();
                 connection.closeAsync().syncUninterruptibly();