From 5c68c38c6dd3bf3c96a7f029137e1c8befe70073 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Mon, 30 Apr 2018 18:12:24 +0300
Subject: [PATCH] refactoring

---
 .../redisson/config/SingleServerConfig.java   | 34 +++----------------
 .../connection/SingleConnectionManager.java   |  6 +---
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/config/SingleServerConfig.java b/redisson/src/main/java/org/redisson/config/SingleServerConfig.java
index 097cb8942..dd416c455 100644
--- a/redisson/src/main/java/org/redisson/config/SingleServerConfig.java
+++ b/redisson/src/main/java/org/redisson/config/SingleServerConfig.java
@@ -57,15 +57,6 @@ public class SingleServerConfig extends BaseConfig<SingleServerConfig> {
      */
     private int database = 0;
 
-    /**
-     * Should the server address be monitored for changes in DNS? Useful for
-     * AWS ElastiCache where the client is pointed at the endpoint for a replication group
-     * which is a DNS alias to the current master node.<br>
-     * <em>NB: applications must ensure the JVM DNS cache TTL is low enough to support this.</em>
-     * e.g., http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-jvm-ttl.html
-     */
-    private boolean dnsMonitoring = true;
-
     /**
      * Interval in milliseconds to check DNS
      */
@@ -79,7 +70,6 @@ public class SingleServerConfig extends BaseConfig<SingleServerConfig> {
         setAddress(config.getAddress());
         setConnectionPoolSize(config.getConnectionPoolSize());
         setSubscriptionConnectionPoolSize(config.getSubscriptionConnectionPoolSize());
-        setDnsMonitoring(config.isDnsMonitoring());
         setDnsMonitoringInterval(config.getDnsMonitoringInterval());
         setSubscriptionConnectionMinimumIdleSize(config.getSubscriptionConnectionMinimumIdleSize());
         setConnectionMinimumIdleSize(config.getConnectionMinimumIdleSize());
@@ -143,27 +133,11 @@ public class SingleServerConfig extends BaseConfig<SingleServerConfig> {
     }
 
     /**
-     * Monitoring of the endpoint address for DNS changes.
-     * <p>
-     * Applications must ensure the JVM DNS cache TTL is low enough to support this
+     * Interval in milliseconds to check the endpoint's DNS<p>
+     * Applications must ensure the JVM DNS cache TTL is low enough to support this.<p>
+     * Set <code>-1</code> to disable.
      * <p>
-     * Default is <code>true</code>
-     *
-     * @param dnsMonitoring flag
-     * @return config
-     */
-    public SingleServerConfig setDnsMonitoring(boolean dnsMonitoring) {
-        this.dnsMonitoring = dnsMonitoring;
-        return this;
-    }
-    public boolean isDnsMonitoring() {
-        return dnsMonitoring;
-    }
-
-    /**
-     * Interval in milliseconds to check the endpoint DNS if {@link #isDnsMonitoring()} is true.
-     *
-     * Default is <code>5000</code>
+     * Default is <code>5000</code>.
      *
      * @param dnsMonitoringInterval time
      * @return config
diff --git a/redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
index 251f76b5a..341fb7435 100644
--- a/redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
@@ -57,11 +57,7 @@ public class SingleConnectionManager extends MasterSlaveConnectionManager {
         newconfig.setSubscriptionConnectionPoolSize(cfg.getSubscriptionConnectionPoolSize());
         newconfig.setConnectTimeout(cfg.getConnectTimeout());
         newconfig.setIdleConnectionTimeout(cfg.getIdleConnectionTimeout());
-        if (cfg.isDnsMonitoring()) {
-            newconfig.setDnsMonitoringInterval(cfg.getDnsMonitoringInterval());
-        } else {
-            newconfig.setDnsMonitoringInterval(-1);
-        }
+        newconfig.setDnsMonitoringInterval(cfg.getDnsMonitoringInterval());
 
         newconfig.setMasterConnectionMinimumIdleSize(cfg.getConnectionMinimumIdleSize());
         newconfig.setSubscriptionConnectionMinimumIdleSize(cfg.getSubscriptionConnectionMinimumIdleSize());