refactoring

redisson/src/main/java/org/redisson/Redisson.java

@@ -381,12 +381,6 @@ public class Redisson implements RedissonClient {
         return getExecutorService(name, connectionManager.getCodec(), options);
     }
 
-    @Override
-    @Deprecated
-    public RScheduledExecutorService getExecutorService(Codec codec, String name) {
-        return getExecutorService(name, codec);
-    }
-
     @Override
     public RScheduledExecutorService getExecutorService(String name, Codec codec) {
         return getExecutorService(name, codec, ExecutorOptions.defaults());

redisson/src/main/java/org/redisson/api/RedissonClient.java

@@ -942,22 +942,7 @@ public interface RedissonClient {
      * @return ScheduledExecutorService object
      */
     RScheduledExecutorService getExecutorService(String name, ExecutorOptions options);
-    
-    /**
-     * Returns ScheduledExecutorService by name 
-     * using provided codec for task, response and request serialization
-     * 
-     * Please use getExecutorService(String name, Codec codec) method instead.
-     * 
-     * @deprecated - use {@link #getExecutorService(String, Codec)} instead.
-     * 
-     * @param name - name of object
-     * @param codec - codec for task, response and request
-     * @return ScheduledExecutorService object
-     */
-    @Deprecated
-    RScheduledExecutorService getExecutorService(Codec codec, String name);
-    
+
     /**
      * Returns ScheduledExecutorService by name 
      * using provided codec for task, response and request serialization

redisson/src/main/java/org/redisson/config/BaseConfig.java

@@ -39,13 +39,6 @@ public class BaseConfig<T extends BaseConfig<T>> {
      */
     private int idleConnectionTimeout = 10000;
 
-    /**
-     * Ping timeout used in <code>Node.ping</code> and <code>Node.pingAll<code> operation.
-     * Value in milliseconds.
-     *
-     */
-    private int pingTimeout = 1000;
-
     /**
      * Timeout during connecting to any Redis server.
      * Value in milliseconds.
@@ -111,7 +104,6 @@ public class BaseConfig<T extends BaseConfig<T>> {
         setRetryInterval(config.getRetryInterval());
         setTimeout(config.getTimeout());
         setClientName(config.getClientName());
-        setPingTimeout(config.getPingTimeout());
         setConnectTimeout(config.getConnectTimeout());
         setIdleConnectionTimeout(config.getIdleConnectionTimeout());
         setSslEnableEndpointIdentification(config.isSslEnableEndpointIdentification());
@@ -250,16 +242,6 @@ public class BaseConfig<T extends BaseConfig<T>> {
         return clientName;
     }
 
-    @Deprecated
-    public T setPingTimeout(int pingTimeout) {
-        this.pingTimeout = pingTimeout;
-        return (T) this;
-    }
-
-    public int getPingTimeout() {
-        return pingTimeout;
-    }
-
     /**
      * Timeout during connecting to any Redis server.
      * <p>
@@ -296,24 +278,6 @@ public class BaseConfig<T extends BaseConfig<T>> {
         return idleConnectionTimeout;
     }
 
-    /*
-     * Use setFailedSlaveReconnectionInterval instead
-     */
-    @Deprecated
-    public T setReconnectionTimeout(int slaveRetryTimeout) {
-        log.warn("'reconnectionTimeout' setting in unavailable. Please use 'failedSlaveReconnectionInterval' setting instead!");
-        return (T) this;
-    }
-
-    /*
-     * Use setFailedSlaveCheckInterval instead
-     */
-    @Deprecated
-    public T setFailedAttempts(int slaveFailedAttempts) {
-        log.warn("'failedAttempts' setting in unavailable. Please use 'failedSlaveCheckInterval' setting instead!");
-        return (T) this;
-    }
-    
     public boolean isSslEnableEndpointIdentification() {
         return sslEnableEndpointIdentification;
     }

redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java

@@ -187,21 +187,6 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
         return loadBalancer;
     }
 
-    /**
-     * @deprecated use {@link #setSubscriptionConnectionPoolSize(int)}
-     * 
-     * @param slaveSubscriptionConnectionPoolSize - pool size
-     * @return config
-     */
-    @Deprecated
-    public T setSlaveSubscriptionConnectionPoolSize(int slaveSubscriptionConnectionPoolSize) {
-        return setSubscriptionConnectionPoolSize(slaveSubscriptionConnectionPoolSize);
-    }
-    @Deprecated
-    public int getSlaveSubscriptionConnectionPoolSize() {
-        return getSubscriptionConnectionPoolSize();
-    }
-
     /**
      * Maximum connection pool size for subscription (pub/sub) channels
      * <p>
@@ -257,21 +242,6 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
         return masterConnectionMinimumIdleSize;
     }
 
-    /**
-     * @deprecated use {@link #setSubscriptionConnectionMinimumIdleSize(int)}
-     * 
-     * @param slaveSubscriptionConnectionMinimumIdleSize - pool size
-     * @return config
-     */
-    @Deprecated
-    public T setSlaveSubscriptionConnectionMinimumIdleSize(int slaveSubscriptionConnectionMinimumIdleSize) {
-        return setSubscriptionConnectionMinimumIdleSize(slaveSubscriptionConnectionMinimumIdleSize);
-    }
-    @Deprecated
-    public int getSlaveSubscriptionConnectionMinimumIdleSize() {
-        return getSubscriptionConnectionMinimumIdleSize();
-    }
-
     /**
      * Redis 'slave' node minimum idle subscription (pub/sub) connection amount for <b>each</b> slave node.
      * <p>

redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java

@@ -411,7 +411,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
         c.setRetryInterval(cfg.getRetryInterval());
         c.setRetryAttempts(cfg.getRetryAttempts());
         c.setTimeout(cfg.getTimeout());
-        c.setPingTimeout(cfg.getPingTimeout());
         c.setLoadBalancer(cfg.getLoadBalancer());
         c.setPassword(cfg.getPassword());
         c.setUsername(cfg.getUsername());

redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java

@@ -48,7 +48,6 @@ public class SingleConnectionManager extends MasterSlaveConnectionManager {
         newconfig.setRetryAttempts(cfg.getRetryAttempts());
         newconfig.setRetryInterval(cfg.getRetryInterval());
         newconfig.setTimeout(cfg.getTimeout());
-        newconfig.setPingTimeout(cfg.getPingTimeout());
         newconfig.setPassword(cfg.getPassword());
         newconfig.setUsername(cfg.getUsername());
         newconfig.setDatabase(cfg.getDatabase());

redisson/src/test/java/org/redisson/spring/support/SpringNamespaceWikiTest.java

@@ -127,7 +127,6 @@ public class SpringNamespaceWikiTest {
             method.setAccessible(true);
             SingleServerConfig single = (SingleServerConfig) method.invoke(config, (Object[]) null);
             assertEquals(10000, single.getIdleConnectionTimeout());
-            assertEquals(20000, single.getPingTimeout());
             assertEquals(30000, single.getConnectTimeout());
             assertEquals(40000, single.getTimeout());
             assertEquals(5, single.getRetryAttempts());

redisson/src/test/resources/org/redisson/spring/support/namespace_wiki_single_with_placeholder.xml

@@ -34,7 +34,6 @@
     >
         <redisson:single-server
             idle-connection-timeout="${redisson.idleConnectionTimeout}"
-            ping-timeout="${redisson.pingTimeout}"
             connect-timeout="${redisson.connectTimeout}"
             timeout="${redisson.timeout}"
             retry-attempts="${redisson.retryAttempts}"