From 144ed156c3b13abf2f3d6afb5eda8c5cc9611d48 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 2 Aug 2023 17:30:26 +0300
Subject: [PATCH] refactoring

---
 .../java/org/redisson/cluster/ClusterConnectionManager.java | 4 +---
 .../org/redisson/connection/SentinelConnectionManager.java  | 6 +-----
 .../main/java/org/redisson/connection/ServiceManager.java   | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index b39470023..2590d76fb 100644
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -15,7 +15,6 @@
  */
 package org.redisson.cluster;
 
-import io.netty.resolver.AddressResolver;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
 import io.netty.util.concurrent.ScheduledFuture;
@@ -360,8 +359,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
                 if (configEndpointHostName != null) {
                     String address = cfg.getNodeAddresses().iterator().next();
                     RedisURI uri = new RedisURI(address);
-                    AddressResolver<InetSocketAddress> resolver = serviceManager.getResolverGroup().getResolver(serviceManager.getGroup().next());
-                    Future<List<InetSocketAddress>> allNodes = resolver.resolveAll(InetSocketAddress.createUnresolved(uri.getHost(), uri.getPort()));
+                    Future<List<InetSocketAddress>> allNodes = serviceManager.resolveAll(uri);
                     allNodes.addListener(new FutureListener<List<InetSocketAddress>>() {
                         @Override
                         public void operationComplete(Future<List<InetSocketAddress>> future) throws Exception {
diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index c93072494..dc5da6667 100755
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -15,7 +15,6 @@
  */
 package org.redisson.connection;
 
-import io.netty.resolver.AddressResolver;
 import io.netty.util.NetUtil;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
@@ -58,7 +57,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
 
     private final Set<RedisURI> disconnectedSlaves = new HashSet<>();
     private ScheduledFuture<?> monitorFuture;
-    private final AddressResolver<InetSocketAddress> sentinelResolver;
     private final Set<RedisURI> disconnectedSentinels = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     private RedisStrictCommand<RedisURI> masterHostCommand;
@@ -71,8 +69,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         super(cfg, serviceManager);
         this.serviceManager.setNatMapper(cfg.getNatMapper());
 
-        this.sentinelResolver = serviceManager.getResolverGroup().getResolver(serviceManager.getGroup().next());
-
         for (String address : cfg.getSentinelAddresses()) {
             RedisURI addr = new RedisURI(address);
             scheme = addr.getScheme();
@@ -284,7 +280,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
 
     private void performSentinelDNSCheck(FutureListener<List<InetSocketAddress>> commonListener) {
         for (RedisURI host : sentinelHosts) {
-            Future<List<InetSocketAddress>> allNodes = sentinelResolver.resolveAll(InetSocketAddress.createUnresolved(host.getHost(), host.getPort()));
+            Future<List<InetSocketAddress>> allNodes = serviceManager.resolveAll(host);
             allNodes.addListener((FutureListener<List<InetSocketAddress>>) future -> {
                 if (!future.isSuccess()) {
                     log.error("Unable to resolve {}", host.getHost(), future.cause());
diff --git a/redisson/src/main/java/org/redisson/connection/ServiceManager.java b/redisson/src/main/java/org/redisson/connection/ServiceManager.java
index 0ba2487e7..57751e2d2 100644
--- a/redisson/src/main/java/org/redisson/connection/ServiceManager.java
+++ b/redisson/src/main/java/org/redisson/connection/ServiceManager.java
@@ -252,6 +252,11 @@ public class ServiceManager {
         return group;
     }
 
+    public Future<List<InetSocketAddress>> resolveAll(RedisURI uri) {
+        AddressResolver<InetSocketAddress> resolver = resolverGroup.getResolver(group.next());
+        return resolver.resolveAll(InetSocketAddress.createUnresolved(uri.getHost(), uri.getPort()));
+    }
+
     public AddressResolverGroup<InetSocketAddress> getResolverGroup() {
         return resolverGroup;
     }