Unify JedisSocketConfig into JedisClientConfig

Author: sazzad16

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

@@ -14,7 +14,6 @@
 import static redis.clients.jedis.Protocol.Keyword.WITHSCORES;
 import static redis.clients.jedis.Protocol.Keyword.FREQ;
 import static redis.clients.jedis.Protocol.Keyword.HELP;
-import static redis.clients.jedis.Protocol.Keyword.COUNT;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,8 +40,8 @@ public class BinaryClient extends Connection {
 
   private boolean isInMulti;
 
-  private String user;
-  private String password;
+  @Deprecated private String user;
+  @Deprecated private String password;
 
   private int db;
 
@@ -72,8 +71,8 @@ public BinaryClient(final String host, final int port, final boolean ssl,
     super(host, port, ssl, sslSocketFactory, sslParameters, hostnameVerifier);
   }
 
-  public BinaryClient(final String host, final int port, final JedisSocketConfig jedisSocketConfig) {
-    super(host, port, jedisSocketConfig);
+  public BinaryClient(final HostAndPort hostPort, final JedisClientConfig clientConfig) {
+    super(hostPort, clientConfig);
   }
 
   public BinaryClient(final JedisSocketFactory jedisSocketFactory) {
@@ -88,25 +87,12 @@ public boolean isInWatch() {
     return isInWatch;
   }
 
-  private byte[][] joinParameters(byte[] first, byte[][] rest) {
-    byte[][] result = new byte[rest.length + 1][];
-    result[0] = first;
-    System.arraycopy(rest, 0, result, 1, rest.length);
-    return result;
-  }
-
-  private byte[][] joinParameters(byte[] first, byte[] second, byte[][] rest) {
-    byte[][] result = new byte[rest.length + 2][];
-    result[0] = first;
-    result[1] = second;
-    System.arraycopy(rest, 0, result, 2, rest.length);
-    return result;
-  }
-
+  @Deprecated
   public void setUser(final String user) {
     this.user = user;
   }
 
+  @Deprecated
   public void setPassword(final String password) {
     this.password = password;
   }
@@ -115,6 +101,10 @@ public void setDb(int db) {
     this.db = db;
   }
 
+  public int getDB() {
+    return db;
+  }
+
   @Override
   public void connect() {
     if (!isConnected()) {
@@ -133,6 +123,25 @@ public void connect() {
     }
   }
 
+  @Override
+  public void disconnect() {
+    db = 0;
+    super.disconnect();
+  }
+
+  @Override
+  public void close() {
+    db = 0;
+    super.close();
+  }
+
+  public void resetState() {
+    if (isInWatch()) {
+      unwatch();
+      getStatusCodeReply();
+    }
+  }
+
   public void ping() {
     sendCommand(PING);
   }
@@ -962,29 +971,6 @@ public void getrange(final byte[] key, final long startOffset, final long endOff
     sendCommand(GETRANGE, key, toByteArray(startOffset), toByteArray(endOffset));
   }
 
-  public int getDB() {
-    return db;
-  }
-
-  @Override
-  public void disconnect() {
-    db = 0;
-    super.disconnect();
-  }
-
-  @Override
-  public void close() {
-    db = 0;
-    super.close();
-  }
-
-  public void resetState() {
-    if (isInWatch()) {
-      unwatch();
-      getStatusCodeReply();
-    }
-  }
-
   public void eval(final byte[] script, final byte[] keyCount, final byte[][] params) {
     sendCommand(EVAL, joinParameters(script, keyCount, params));
   }
@@ -1619,4 +1605,19 @@ public void xinfoConsumers (byte[] key, byte[] group) {
     sendCommand(XINFO,Keyword.CONSUMERS.raw,key,group);
   }
 
+  private static byte[][] joinParameters(byte[] first, byte[][] rest) {
+    byte[][] result = new byte[rest.length + 1][];
+    result[0] = first;
+    System.arraycopy(rest, 0, result, 1, rest.length);
+    return result;
+  }
+
+  private static byte[][] joinParameters(byte[] first, byte[] second, byte[][] rest) {
+    byte[][] result = new byte[rest.length + 2][];
+    result[0] = first;
+    result[1] = second;
+    System.arraycopy(rest, 0, result, 2, rest.length);
+    return result;
+  }
+
 }