expand jedis socket config

Author: sazzad16

src/main/java/redis/clients/jedis/BinaryJedis.java

@@ -137,6 +137,11 @@ public BinaryJedis(final String host, final int port, final int connectionTimeou
     client.setInfiniteSoTimeout(infiniteSoTimeout);
   }
 
+  public BinaryJedis(final HostAndPort hostAndPort, final JedisSocketConfig config, final int infiniteSoTimeout) {
+    this(hostAndPort, config);
+    client.setInfiniteSoTimeout(infiniteSoTimeout);
+  }
+
   public BinaryJedis(final JedisShardInfo shardInfo) {
     this(shardInfo.getHost(), shardInfo.getPort(), shardInfo.getConnectionTimeout(),
         shardInfo.getSoTimeout(), shardInfo.getSsl(), shardInfo.getSslSocketFactory(),

src/main/java/redis/clients/jedis/BinaryJedisCluster.java

@@ -84,21 +84,23 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
     this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig, ssl, null, null, null, null);
   }
 
+  @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig poolConfig,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
     this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, null, password, clientName,
         poolConfig, ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
   }
 
+  @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
       int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
       HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
-    this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig,
-        connectionTimeout, soTimeout, user, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
-    this.maxAttempts = maxAttempts;
+    this(jedisClusterNode, connectionTimeout, soTimeout, 0, maxAttempts, user, password, clientName, poolConfig,
+        ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
   }
 
+  @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
       int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
@@ -107,6 +109,14 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
     this.maxAttempts = maxAttempts;
   }
 
+  public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, JedisSocketConfig socketConfig,
+      int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName,
+      GenericObjectPoolConfig poolConfig) {
+    this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig,
+        socketConfig, infiniteSoTimeout, user, password, clientName);
+    this.maxAttempts = maxAttempts;
+  }
+
   @Override
   public void close() {
     if (connectionHandler != null) {

src/main/java/redis/clients/jedis/Connection.java

@@ -39,7 +39,7 @@ public Connection(final String host) {
   }
 
   public Connection(final String host, final int port) {
-    this(host, port, null);
+    this(host, port, DefaultJedisSocketConfig.DEFAULT_SOCKET_CONFIG);
   }
 
   @Deprecated
@@ -57,7 +57,11 @@ public Connection(final String host, final int port, final boolean ssl,
   }
 
   public Connection(final String host, final int port, final JedisSocketConfig jedisSocketConfig) {
-    this(new DefaultJedisSocketFactory(host, port, jedisSocketConfig));
+    this(new HostAndPort(host, port), jedisSocketConfig);
+  }
+
+  public Connection(final HostAndPort hostAndPort, final JedisSocketConfig jedisSocketConfig) {
+    this(new DefaultJedisSocketFactory(hostAndPort, jedisSocketConfig));
   }
 
   public Connection(final JedisSocketFactory jedisSocketFactory) {
@@ -177,10 +181,14 @@ public void connect() {
         inputStream = new RedisInputStream(socket.getInputStream());
       } catch (IOException ioe) {
         broken = true;
-        throw new JedisConnectionException("Failed connecting to " + socketFactory.getDescription(), ioe);
+        throw new JedisConnectionException("Failed to create input/output stream", ioe);
       } catch (JedisConnectionException jce) {
         broken = true;
         throw jce;
+      } finally {
+        if (broken) {
+          IOUtils.closeQuietly(socket);
+        }
       }
     }
   }

src/main/java/redis/clients/jedis/DefaultJedisSocketConfig.java

@@ -6,6 +6,8 @@
 
 public class DefaultJedisSocketConfig implements JedisSocketConfig {
 
+  public static final DefaultJedisSocketConfig DEFAULT_SOCKET_CONFIG = DefaultJedisSocketConfig.builder().build();
+
   private final int connectionTimeout;
   private final int soTimeout;
 

src/main/java/redis/clients/jedis/DefaultJedisSocketFactory.java

@@ -13,15 +13,14 @@
 
 public class DefaultJedisSocketFactory implements JedisSocketFactory {
 
-  private final String host;
-  private final int port;
+  private final HostAndPort hostPort;
   private final JedisSocketConfig config;
 
   @Deprecated
   public DefaultJedisSocketFactory(String host, int port, int connectionTimeout, int soTimeout,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
       HostnameVerifier hostnameVerifier) {
-    this(host, port,
+    this(new HostAndPort(host, port),
         DefaultJedisSocketConfig.builder()
             .withConnectionTimeout(connectionTimeout)
             .withSoTimeout(soTimeout)
@@ -33,10 +32,9 @@ public DefaultJedisSocketFactory(String host, int port, int connectionTimeout, i
     );
   }
 
-  public DefaultJedisSocketFactory(String host, int port, JedisSocketConfig socketConfig) {
-    this.host = host;
-    this.port = port;
-    this.config = socketConfig != null ? socketConfig : DefaultJedisSocketConfig.builder().build();
+  public DefaultJedisSocketFactory(HostAndPort hostAndPort, JedisSocketConfig socketConfig) {
+    this.hostPort = hostAndPort;
+    this.config = socketConfig != null ? socketConfig : DefaultJedisSocketConfig.DEFAULT_SOCKET_CONFIG;
   }
 
   @Override
@@ -51,15 +49,16 @@ public Socket createSocket() throws JedisConnectionException {
       socket.setSoLinger(true, 0); // Control calls close () method, the underlying socket is closed immediately
       // <-@wjw_add
 
-      socket.connect(new InetSocketAddress(getHost(), getPort()), getConnectionTimeout());
+      HostAndPort hostAndPort = getSocketHostAndPort();
+      socket.connect(new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPort()), getConnectionTimeout());
       socket.setSoTimeout(getSoTimeout());
 
       if (config.isSSL()) {
         SSLSocketFactory sslSocketFactory = config.getSSLSocketFactory();
         if (null == sslSocketFactory) {
           sslSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
         }
-        socket = sslSocketFactory.createSocket(socket, getHost(), getPort(), true);
+        socket = sslSocketFactory.createSocket(socket, hostAndPort.getHost(), hostAndPort.getPort(), true);
 
         SSLParameters sslParameters = config.getSSLParameters();
         if (null != sslParameters) {
@@ -85,14 +84,28 @@ public Socket createSocket() throws JedisConnectionException {
     }
   }
 
+  public HostAndPort getHostAndPort() {
+    return this.hostPort;
+  }
+
+  public HostAndPort getSocketHostAndPort() {
+    HostAndPortMapper mapper = config.getHostAndPortMapper();
+    HostAndPort hostAndPort = getHostAndPort();
+    if (mapper != null) {
+      HostAndPort mapped = mapper.getHostAndPort(hostAndPort);
+      if (mapped != null) return mapped;
+    }
+    return hostAndPort;
+  }
+
   @Override
   public String getDescription() {
-    return host + ":" + port;
+    return this.hostPort.toString();
   }
 
   @Override
   public String getHost() {
-    return host;
+    return this.hostPort.getHost();
   }
 
   @Override
@@ -102,7 +115,7 @@ public void setHost(String host) {
 
   @Override
   public int getPort() {
-    return port;
+    return this.hostPort.getPort();
   }
 
   @Override

src/main/java/redis/clients/jedis/HostAndPortMapper.java

@@ -2,7 +2,5 @@
 
 public interface HostAndPortMapper {
 
-  HostAndPort getHostAndPort(String host, int port);
-
   HostAndPort getHostAndPort(HostAndPort hap);
 }

src/main/java/redis/clients/jedis/Jedis.java

@@ -57,10 +57,6 @@ public Jedis(final String host, final int port) {
     super(host, port);
   }
 
-  public Jedis(final String host, final int port, final JedisSocketConfig config) {
-    super(host, port, config);
-  }
-
   public Jedis(final String host, final int port, final boolean ssl) {
     super(host, port, ssl);
   }
@@ -94,6 +90,10 @@ public Jedis(final String host, final int port, final int connectionTimeout, fin
     super(host, port, connectionTimeout, soTimeout, infiniteSoTimeout);
   }
 
+  public Jedis(final HostAndPort hostAndPort, final JedisSocketConfig config, final int infiniteSoTimeout) {
+    super(hostAndPort, config, infiniteSoTimeout);
+  }
+
   public Jedis(final String host, final int port, final int connectionTimeout, final int soTimeout,
       final boolean ssl) {
     super(host, port, connectionTimeout, soTimeout, ssl);

src/main/java/redis/clients/jedis/JedisCluster.java

@@ -193,6 +193,12 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
         clientName, poolConfig, ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
   }
 
+  public JedisCluster(Set<HostAndPort> jedisClusterNode, JedisSocketConfig socketConfig,
+      int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName,
+      final GenericObjectPoolConfig poolConfig) {
+    super(jedisClusterNode, socketConfig, infiniteSoTimeout, maxAttempts, user, password, clientName, poolConfig);
+  }
+
   @Override
   public String set(final String key, final String value) {
     return new JedisClusterCommand<String>(connectionHandler, maxAttempts) {

src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java

@@ -34,6 +34,11 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObject
     this(nodes, poolConfig, connectionTimeout, soTimeout, infiniteSoTimeout, user, password, clientName, false, null, null, null, null);
   }
 
+  public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObjectPoolConfig poolConfig,
+      final JedisSocketConfig socketConfig, String user, String password, String clientName) {
+    this(nodes, poolConfig, socketConfig, 0, user, password, clientName);
+  }
+
   @Deprecated
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes, GenericObjectPoolConfig poolConfig,
       int connectionTimeout, int soTimeout, String password, String clientName,
@@ -69,18 +74,40 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObject
       int connectionTimeout, int soTimeout, int infiniteSoTimeout, String user, String password, String clientName,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
       HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap portMap) {
-    this(nodes, poolConfig, connectionTimeout, soTimeout, infiniteSoTimeout, user, password,
-        clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier, (HostAndPortMapper) portMap);
+    this(nodes,
+        DefaultJedisSocketConfig.builder().withConnectionTimeout(connectionTimeout).withSoTimeout(soTimeout)
+            .withSsl(ssl).withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
+            .withHostnameVerifier(hostnameVerifier).build(),
+        poolConfig,
+        DefaultJedisSocketConfig.builder().withConnectionTimeout(connectionTimeout).withSoTimeout(soTimeout)
+            .withSsl(ssl).withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
+            .withHostnameVerifier(hostnameVerifier).withHostAndPortMapper(portMap).build(),
+        infiniteSoTimeout, user, password, clientName);
   }
 
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObjectPoolConfig poolConfig,
       int connectionTimeout, int soTimeout, int infiniteSoTimeout, String user, String password, String clientName,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
       HostnameVerifier hostnameVerifier, HostAndPortMapper portMap) {
-    this.cache = new JedisClusterInfoCache(poolConfig, connectionTimeout, soTimeout, infiniteSoTimeout,
-        user, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier, portMap);
-    initializeSlotsCache(nodes, connectionTimeout, soTimeout, infiniteSoTimeout,
-        user, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier);
+    this(nodes, poolConfig,
+        DefaultJedisSocketConfig.builder().withConnectionTimeout(connectionTimeout).withSoTimeout(soTimeout)
+            .withSsl(ssl).withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
+            .withHostnameVerifier(hostnameVerifier).withHostAndPortMapper(portMap).build(),
+        infiniteSoTimeout, user, password, clientName);
+  }
+
+  @Deprecated
+  public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final JedisSocketConfig seedNodesSocketConfig,
+      final GenericObjectPoolConfig poolConfig, final JedisSocketConfig clusterNodesSocketConfig,
+      int infiniteSoTimeout, String user, String password, String clientName) {
+    this.cache = new JedisClusterInfoCache(poolConfig, clusterNodesSocketConfig, infiniteSoTimeout, user, password, clientName);
+    initializeSlotsCache(nodes, seedNodesSocketConfig, infiniteSoTimeout, user, password, clientName);
+  }
+
+  public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObjectPoolConfig poolConfig,
+      final JedisSocketConfig socketConfig, int infiniteSoTimeout, String user, String password, String clientName) {
+    this.cache = new JedisClusterInfoCache(poolConfig, socketConfig, infiniteSoTimeout, user, password, clientName);
+    initializeSlotsCache(nodes, socketConfig, infiniteSoTimeout, user, password, clientName);
   }
 
   abstract Jedis getConnection();
@@ -95,14 +122,11 @@ public Map<String, JedisPool> getNodes() {
     return cache.getNodes();
   }
 
-  private void initializeSlotsCache(Set<HostAndPort> startNodes,
-      int connectionTimeout, int soTimeout, int infiniteSoTimeout, String user, String password, String clientName,
-      boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier) {
-    for (HostAndPort hostAndPort : startNodes) {
-
-      try (Jedis jedis = new Jedis(hostAndPort.getHost(), hostAndPort.getPort(), connectionTimeout, 
-          soTimeout, infiniteSoTimeout, ssl, sslSocketFactory, sslParameters, hostnameVerifier)) { 
+  private void initializeSlotsCache(Set<HostAndPort> startNodes, final JedisSocketConfig socketConfig,
+      int infiniteSoTimeout, String user, String password, String clientName) {
 
+    for (HostAndPort hostAndPort : startNodes) {
+      try (Jedis jedis = new Jedis(hostAndPort, socketConfig, infiniteSoTimeout)) { 
         if (user != null) {
           jedis.auth(user, password);
         } else if (password != null) {

src/main/java/redis/clients/jedis/JedisClusterHostAndPortMap.java

@@ -3,17 +3,13 @@
 /**
  * @deprecated Use HostAndPortMapper
  */
+@Deprecated
 public interface JedisClusterHostAndPortMap extends HostAndPortMapper {
 
   HostAndPort getSSLHostAndPort(String host, int port);
 
-  @Override
-  default HostAndPort getHostAndPort(String host, int port) {
-    return getSSLHostAndPort(host, port);
-  }
-
   @Override
   default HostAndPort getHostAndPort(HostAndPort hap) {
-    return getHostAndPort(hap.getHost(), hap.getPort());
+    return getSSLHostAndPort(hap.getHost(), hap.getPort());
   }
 }