refactoring set command to use SetParams for the optional parameters

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

@@ -14,6 +14,8 @@
 import static redis.clients.jedis.Protocol.Keyword.WITHSCORES;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -100,9 +102,10 @@ public void set(final byte[] key, final byte[] value) {
     sendCommand(Command.SET, key, value);
   }
 
-  public void set(final byte[] key, final byte[] value, final byte[] nxxx, final byte[] expx,
-      final long time) {
-    sendCommand(Command.SET, key, value, nxxx, expx, toByteArray(time));
+  public void set(final byte[] key, final byte[] value, final byte[] nxxx, final byte[] expx, final byte[] time) {
+    List<byte[]> params = Arrays.asList(key, value, nxxx, expx, time);
+
+    sendCommand(Command.SET, removeNulls(params));
   }
 
   public void get(final byte[] key) {
@@ -1092,15 +1095,6 @@ public void psetex(final byte[] key, final int milliseconds, final byte[] value)
     sendCommand(PSETEX, key, toByteArray(milliseconds), value);
   }
 
-  public void set(final byte[] key, final byte[] value, final byte[] nxxx) {
-    sendCommand(Command.SET, key, value, nxxx);
-  }
-
-  public void set(final byte[] key, final byte[] value, final byte[] nxxx, final byte[] expx,
-      final int time) {
-    sendCommand(Command.SET, key, value, nxxx, expx, toByteArray(time));
-  }
-
   public void srandmember(final byte[] key, final int count) {
     sendCommand(SRANDMEMBER, key, toByteArray(count));
   }
@@ -1193,4 +1187,11 @@ public void pfcount(final byte[]... keys) {
   public void pfmerge(final byte[] destkey, final byte[]... sourcekeys) {
     sendCommand(PFMERGE, joinParameters(destkey, sourcekeys));
   }
+
+  private byte[][] removeNulls(List<byte[]> list) {
+    ArrayList<byte[]> noNullsList = new ArrayList<byte[]>(list);
+    noNullsList.removeAll(Collections.singleton(null));
+
+    return noNullsList.toArray(new byte[noNullsList.size()][]);
+  }
 }

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

@@ -136,7 +136,7 @@ public String set(final byte[] key, final byte[] value) {
    * @return Status code reply
    */
   public String set(final byte[] key, final byte[] value, final byte[] nxxx, final byte[] expx,
-      final long time) {
+      final byte[] time) {
     checkIsInMulti();
     client.set(key, value, nxxx, expx, time);
     return client.getStatusCodeReply();
@@ -3066,19 +3066,6 @@ public String psetex(final byte[] key, final int milliseconds, final byte[] valu
     return client.getStatusCodeReply();
   }
 
-  public String set(final byte[] key, final byte[] value, final byte[] nxxx) {
-    checkIsInMulti();
-    client.set(key, value, nxxx);
-    return client.getStatusCodeReply();
-  }
-
-  public String set(final byte[] key, final byte[] value, final byte[] nxxx, final byte[] expx,
-      final int time) {
-    checkIsInMulti();
-    client.set(key, value, nxxx, expx, time);
-    return client.getStatusCodeReply();
-  }
-
   public String clientKill(final byte[] client) {
     checkIsInMulti();
     this.client.clientKill(client);

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

@@ -11,7 +11,7 @@
 public interface BinaryJedisCommands {
   String set(byte[] key, byte[] value);
 
-  String set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, long time);
+  String set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, byte[] time);
 
   byte[] get(byte[] key);
 

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

@@ -53,7 +53,7 @@ public String set(byte[] key, byte[] value) {
     return j.set(key, value);
   }
 
-  public String set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, long time) {
+  public String set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, byte[] time) {
     Jedis j = getShard(key);
     return j.set(key, value, nxxx, expx, time);
   }

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

@@ -9,6 +9,7 @@
 import java.util.Map.Entry;
 
 import redis.clients.jedis.JedisCluster.Reset;
+import redis.clients.jedis.params.set.SetParams;
 import redis.clients.util.SafeEncoder;
 
 public class Client extends BinaryClient implements Commands {
@@ -29,10 +30,23 @@ public void set(final String key, final String value) {
     set(SafeEncoder.encode(key), SafeEncoder.encode(value));
   }
 
-  public void set(final String key, final String value, final String nxxx, final String expx,
-      final long time) {
-    set(SafeEncoder.encode(key), SafeEncoder.encode(value), SafeEncoder.encode(nxxx),
-      SafeEncoder.encode(expx), time);
+  public void set(final String key, final String value, final SetParams params) {
+
+    byte[] nxxxBytes = null;
+    String nxxx = params.getNxxx();
+    if(nxxx != null) {
+      nxxxBytes = SafeEncoder.encode(nxxx);
+    }
+
+    byte[] expxBytes = null;
+    byte[] expxValue = null;
+    String expx = params.getExpx();
+    if(expx != null) {
+      expxBytes = SafeEncoder.encode(expx);
+      expxValue = SafeEncoder.encode(String.valueOf(params.getParam(expx)));
+    }
+
+    set(SafeEncoder.encode(key), SafeEncoder.encode(value), nxxxBytes, expxBytes, expxValue);
   }
 
   public void get(final String key) {
@@ -793,16 +807,6 @@ public void psetex(final String key, final int milliseconds, final String value)
     psetex(SafeEncoder.encode(key), milliseconds, SafeEncoder.encode(value));
   }
 
-  public void set(final String key, final String value, final String nxxx) {
-    set(SafeEncoder.encode(key), SafeEncoder.encode(value), SafeEncoder.encode(nxxx));
-  }
-
-  public void set(final String key, final String value, final String nxxx, final String expx,
-      final int time) {
-    set(SafeEncoder.encode(key), SafeEncoder.encode(value), SafeEncoder.encode(nxxx),
-      SafeEncoder.encode(expx), time);
-  }
-
   public void srandmember(final String key, final int count) {
     srandmember(SafeEncoder.encode(key), count);
   }

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

@@ -3,13 +3,13 @@
 import java.util.Map;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.params.set.SetParams;
 
 public interface Commands {
 
   public void set(final String key, final String value);
 
-  public void set(final String key, final String value, final String nxxx, final String expx,
-      final long time);
+  public void set(final String key, final String value, SetParams params);
 
   public void get(final String key);
 

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

@@ -1,15 +1,23 @@
 package redis.clients.jedis;
 
+import java.net.URI;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
 import redis.clients.jedis.JedisCluster.Reset;
+import redis.clients.jedis.params.set.SetParams;
 import redis.clients.util.Pool;
 import redis.clients.util.SafeEncoder;
 import redis.clients.util.Slowlog;
 
-import java.net.URI;
-import java.util.*;
-import java.util.Map.Entry;
-
 public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommands,
     AdvancedJedisCommands, ScriptingCommands, BasicCommands, ClusterCommands, SentinelCommands {
 
@@ -71,16 +79,14 @@ public String set(final String key, String value) {
    * GB).
    * @param key
    * @param value
-   * @param nxxx NX|XX, NX -- Only set the key if it does not already exist. XX -- Only set the key
+   * @param params NX|XX, NX -- Only set the key if it does not already exist. XX -- Only set the key
    *          if it already exist.
-   * @param expx EX|PX, expire time units: EX = seconds; PX = milliseconds
-   * @param time expire time in the units of {@param #expx}
+   *          EX|PX, expire time units: EX = seconds; PX = milliseconds
    * @return Status code reply
    */
-  public String set(final String key, final String value, final String nxxx, final String expx,
-      final long time) {
+  public String set(final String key, final String value, final SetParams params) {
     checkIsInMulti();
-    client.set(key, value, nxxx, expx, time);
+    client.set(key, value, params);
     return client.getStatusCodeReply();
   }
 
@@ -2906,19 +2912,6 @@ public String psetex(final String key, final int milliseconds, final String valu
     return client.getStatusCodeReply();
   }
 
-  public String set(final String key, final String value, final String nxxx) {
-    checkIsInMulti();
-    client.set(key, value, nxxx);
-    return client.getStatusCodeReply();
-  }
-
-  public String set(final String key, final String value, final String nxxx, final String expx,
-      final int time) {
-    checkIsInMulti();
-    client.set(key, value, nxxx, expx, time);
-    return client.getStatusCodeReply();
-  }
-
   public String clientKill(final String client) {
     checkIsInMulti();
     this.client.clientKill(client);

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

@@ -9,6 +9,7 @@
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.params.set.SetParams;
 
 public class JedisCluster implements JedisCommands, BasicCommands, Closeable {
   public static final short HASHSLOTS = 16384;
@@ -77,12 +78,11 @@ public String execute(Jedis connection) {
   }
 
   @Override
-  public String set(final String key, final String value, final String nxxx, final String expx,
-      final long time) {
+  public String set(final String key, final String value, final SetParams params) {
     return new JedisClusterCommand<String>(connectionHandler, timeout, maxRedirections) {
       @Override
       public String execute(Jedis connection) {
-        return connection.set(key, value, nxxx, expx, time);
+        return connection.set(key, value, params);
       }
     }.run(key);
   }

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

@@ -4,13 +4,15 @@
 import java.util.Map;
 import java.util.Set;
 
+import redis.clients.jedis.params.set.SetParams;
+
 /**
  * Common interface for sharded and non-sharded Jedis
  */
 public interface JedisCommands {
   String set(String key, String value);
 
-  String set(String key, String value, String nxxx, String expx, long time);
+  String set(String key, String value, SetParams params);
 
   String get(String key);
 

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

@@ -7,6 +7,7 @@
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.params.set.SetParams;
 
 abstract class PipelineBase extends Queable implements BinaryRedisPipeline, RedisPipeline {
 
@@ -499,6 +500,16 @@ public Response<String> set(byte[] key, byte[] value) {
     getClient(key).set(key, value);
     return getResponse(BuilderFactory.STRING);
   }
+
+  public Response<String> set(String key, String value, SetParams params) {
+    getClient(key).set(key, value, params);
+    return getResponse(BuilderFactory.STRING);
+  }
+
+  public Response<String> set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, byte[] time) {
+    getClient(key).set(key, value, nxxx, expx, time);
+    return getResponse(BuilderFactory.STRING);
+  }
 
   public Response<Boolean> setbit(String key, long offset, boolean value) {
     getClient(key).setbit(key, offset, value);
@@ -1200,26 +1211,6 @@ public Response<String> psetex(byte[] key, int milliseconds, byte[] value) {
     return getResponse(BuilderFactory.STRING);
   }
 
-  public Response<String> set(String key, String value, String nxxx) {
-    getClient(key).set(key, value, nxxx);
-    return getResponse(BuilderFactory.STRING);
-  }
-
-  public Response<String> set(byte[] key, byte[] value, byte[] nxxx) {
-    getClient(key).set(key, value, nxxx);
-    return getResponse(BuilderFactory.STRING);
-  }
-
-  public Response<String> set(String key, String value, String nxxx, String expx, int time) {
-    getClient(key).set(key, value, nxxx, expx, time);
-    return getResponse(BuilderFactory.STRING);
-  }
-
-  public Response<String> set(byte[] key, byte[] value, byte[] nxxx, byte[] expx, int time) {
-    getClient(key).set(key, value, nxxx, expx, time);
-    return getResponse(BuilderFactory.STRING);
-  }
-
   public Response<Double> hincrByFloat(String key, String field, double increment) {
     getClient(key).hincrByFloat(key, field, increment);
     return getResponse(BuilderFactory.DOUBLE);

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

@@ -8,6 +8,7 @@
 import java.util.regex.Pattern;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.params.set.SetParams;
 import redis.clients.util.Hashing;
 import redis.clients.util.Pool;
 
@@ -37,9 +38,9 @@ public String set(String key, String value) {
   }
 
   @Override
-  public String set(String key, String value, String nxxx, String expx, long time) {
+  public String set(String key, String value, SetParams params) {
     Jedis j = getShard(key);
-    return j.set(key, value, nxxx, expx, time);
+    return j.set(key, value, params);
   }
 
   public String get(String key) {

src/main/java/redis/clients/jedis/params/Params.java

@@ -0,0 +1,37 @@
+package redis.clients.jedis.params;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class Params {
+
+  private Map<String, Object> params;
+
+  @SuppressWarnings("unchecked")
+  public <T> T getParam(String name) {
+    if(params == null) return null;
+
+    return (T) params.get(name);
+  }
+
+  public boolean contains(String name) {
+    if(params == null) return false;
+
+    return params.containsKey(name);
+  }
+
+  protected void addParam(String name, Object value) {
+    if(params == null) {
+      params = new HashMap<String, Object>();
+    }
+    params.put(name, value);
+  }
+
+  protected void addParam(String name) {
+    if(params == null) {
+      params = new HashMap<String, Object>();
+    }
+    params.put(name, true);
+  }
+
+}