Merge branch 'master' of github.com:xetorthio/jedis

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

@@ -1095,7 +1095,12 @@ public class BinaryClient extends Connection {
 	sendCommand(RESTORE, key, toByteArray(ttl), serializedValue);
     }
 
+    @Deprecated
     public void pexpire(final byte[] key, final int milliseconds) {
+	pexpire(key, (long) milliseconds);
+    }
+
+    public void pexpire(final byte[] key, final long milliseconds) {
 	sendCommand(PEXPIRE, key, toByteArray(milliseconds));
     }
 

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

@@ -3324,7 +3324,12 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 	return client.getStatusCodeReply();
     }
 
+    @Deprecated
     public Long pexpire(final byte[] key, final int milliseconds) {
+	return pexpire(key, (long) milliseconds);
+    }
+
+    public Long pexpire(final byte[] key, final long milliseconds) {
 	checkIsInMulti();
 	client.pexpire(key, milliseconds);
 	return client.getIntegerReply();

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

@@ -781,7 +781,12 @@ public class Client extends BinaryClient implements Commands {
 	restore(SafeEncoder.encode(key), ttl, serializedValue);
     }
 
+    @Deprecated
     public void pexpire(final String key, final int milliseconds) {
+	pexpire(key, (long) milliseconds);
+    }
+
+    public void pexpire(final String key, final long milliseconds) {
 	pexpire(SafeEncoder.encode(key), milliseconds);
     }
 

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

@@ -3062,7 +3062,12 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 	return client.getStatusCodeReply();
     }
 
+    @Deprecated
     public Long pexpire(final String key, final int milliseconds) {
+	return pexpire(key, (long) milliseconds);
+    }
+
+    public Long pexpire(final String key, final long milliseconds) {
 	checkIsInMulti();
 	client.pexpire(key, milliseconds);
 	return client.getIntegerReply();

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

@@ -1098,12 +1098,22 @@ abstract class PipelineBase extends Queable implements BinaryRedisPipeline,
 	return getResponse(BuilderFactory.LONG);
     }
 
+    @Deprecated
     public Response<Long> pexpire(String key, int milliseconds) {
+	return pexpire(key, (long) milliseconds);
+    }
+
+    @Deprecated
+    public Response<Long> pexpire(byte[] key, int milliseconds) {
+	return pexpire(key, (long) milliseconds);
+    }
+
+    public Response<Long> pexpire(String key, long milliseconds) {
 	getClient(key).pexpire(key, milliseconds);
 	return getResponse(BuilderFactory.LONG);
     }
 
-    public Response<Long> pexpire(byte[] key, int milliseconds) {
+    public Response<Long> pexpire(byte[] key, long milliseconds) {
 	getClient(key).pexpire(key, milliseconds);
 	return getResponse(BuilderFactory.LONG);
     }