From 46c0459d1e84982f4fabb522a9c07b71d405529c Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 13 Aug 2020 13:22:18 +0300
Subject: [PATCH] refactoring

---
 .../org/redisson/cluster/ClusterConnectionManager.java |  8 ++------
 .../connection/MasterSlaveConnectionManager.java       |  4 ++--
 .../java/org/redisson/connection/MasterSlaveEntry.java | 10 ++++------
 .../main/java/org/redisson/connection/SingleEntry.java |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index 311ec1523..8ddeb3b27 100644
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -289,12 +289,12 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
 
             MasterSlaveEntry entry;
             if (config.checkSkipSlavesInit()) {
-                entry = new SingleEntry(ClusterConnectionManager.this, config);
+                entry = new SingleEntry(ClusterConnectionManager.this, config, configEndpointHostName);
             } else {
                 Set<String> slaveAddresses = partition.getSlaveAddresses().stream().map(r -> r.toString()).collect(Collectors.toSet());
                 config.setSlaveAddresses(slaveAddresses);
 
-                entry = new MasterSlaveEntry(ClusterConnectionManager.this, config);
+                entry = new MasterSlaveEntry(ClusterConnectionManager.this, config, configEndpointHostName);
             }
 
             RFuture<RedisClient> f = entry.setupMasterEntry(new RedisURI(config.getMasterAddress()));
@@ -700,10 +700,6 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
         }
     }
     
-    public String getConfigEndpointHostName() {
-        return configEndpointHostName;
-    }
-
     private int indexOf(byte[] array, byte element) {
         for (int i = 0; i < array.length; ++i) {
             if (array[i] == element) {
diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index 1098a34d2..e880395b0 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -355,9 +355,9 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
     protected void initSingleEntry() {
         try {
             if (config.checkSkipSlavesInit()) {
-                masterSlaveEntry = new SingleEntry(this, config);
+                masterSlaveEntry = new SingleEntry(this, config, null);
             } else {
-                masterSlaveEntry = new MasterSlaveEntry(this, config);
+                masterSlaveEntry = new MasterSlaveEntry(this, config, null);
             }
             RFuture<RedisClient> masterFuture = masterSlaveEntry.setupMasterEntry(new RedisURI(config.getMasterAddress()));
             masterFuture.syncUninterruptibly();
diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java
index ea15d6b74..b60ec22be 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java
@@ -66,19 +66,17 @@ public class MasterSlaveEntry {
 
     final AtomicBoolean active = new AtomicBoolean(true);
     
-    String sslHostname;
+    final String sslHostname;
     
-    public MasterSlaveEntry(ConnectionManager connectionManager, MasterSlaveServersConfig config) {
+    public MasterSlaveEntry(ConnectionManager connectionManager, MasterSlaveServersConfig config, String sslHostname) {
         this.connectionManager = connectionManager;
         this.config = config;
 
         slaveBalancer = new LoadBalancerManager(config, connectionManager, this);
         writeConnectionPool = new MasterConnectionPool(config, connectionManager, this);
         pubSubConnectionPool = new MasterPubSubConnectionPool(config, connectionManager, this);
-        
-        if (connectionManager instanceof ClusterConnectionManager) {
-            sslHostname = ((ClusterConnectionManager) connectionManager).getConfigEndpointHostName();
-        }
+
+        this.sslHostname = sslHostname;
     }
 
     public MasterSlaveServersConfig getConfig() {
diff --git a/redisson/src/main/java/org/redisson/connection/SingleEntry.java b/redisson/src/main/java/org/redisson/connection/SingleEntry.java
index 75ce857b3..48b40d30b 100644
--- a/redisson/src/main/java/org/redisson/connection/SingleEntry.java
+++ b/redisson/src/main/java/org/redisson/connection/SingleEntry.java
@@ -28,8 +28,8 @@ import org.redisson.misc.RedisURI;
  */
 public class SingleEntry extends MasterSlaveEntry {
 
-    public SingleEntry(ConnectionManager connectionManager, MasterSlaveServersConfig config) {
-        super(connectionManager, config);
+    public SingleEntry(ConnectionManager connectionManager, MasterSlaveServersConfig config, String sslHostname) {
+        super(connectionManager, config, sslHostname);
     }
 
     @Override