byte[] conversion for numbers in Params classes (#2019)

This would also be required when upgrading to JDK 1.8.
redis · Jul 17, 2019 · c9c118a · c9c118a
1 parent 1bebbcd
commit c9c118a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/redis/clients/jedis/params/GeoRadiusParam.java b/src/main/java/redis/clients/jedis/params/GeoRadiusParam.java
@@ -65,7 +65,7 @@ public byte[][] getByteParams(byte[]... args) {
 
     if (contains(COUNT)) {
       byteParams.add(SafeEncoder.encode(COUNT));
-      byteParams.add(Protocol.toByteArray((Integer) getParam(COUNT)));
+      byteParams.add(Protocol.toByteArray((int) getParam(COUNT)));
     }
 
     if (contains(ASC)) {

diff --git a/src/main/java/redis/clients/jedis/params/Params.java b/src/main/java/redis/clients/jedis/params/Params.java
@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import redis.clients.jedis.Protocol;
 import redis.clients.jedis.util.SafeEncoder;
 
 public abstract class Params {
@@ -29,6 +30,14 @@ public byte[][] getByteParams() {
       if (value != null) {
         if (value instanceof byte[]) {
           byteParams.add((byte[]) value);
+        } else if (value instanceof Boolean) {
+          byteParams.add(Protocol.toByteArray((boolean) value));
+        } else if (value instanceof Integer) {
+          byteParams.add(Protocol.toByteArray((int) value));
+        } else if (value instanceof Long) {
+          byteParams.add(Protocol.toByteArray((long) value));
+        } else if (value instanceof Double) {
+          byteParams.add(Protocol.toByteArray((double) value));
         } else {
           byteParams.add(SafeEncoder.encode(String.valueOf(value)));
         }

diff --git a/src/main/java/redis/clients/jedis/params/SetParams.java b/src/main/java/redis/clients/jedis/params/SetParams.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 
+import redis.clients.jedis.Protocol;
 import redis.clients.jedis.util.SafeEncoder;
 
 public class SetParams extends Params {
@@ -71,11 +72,11 @@ public byte[][] getByteParams(byte[]... args) {
 
     if (contains(EX)) {
       byteParams.add(SafeEncoder.encode(EX));
-      byteParams.add(SafeEncoder.encode(String.valueOf(getParam(EX))));
+      byteParams.add(Protocol.toByteArray((int) getParam(EX)));
     }
     if (contains(PX)) {
       byteParams.add(SafeEncoder.encode(PX));
-      byteParams.add(SafeEncoder.encode(String.valueOf(getParam(PX))));
+      byteParams.add(Protocol.toByteArray((long) getParam(PX)));
     }
 
     return byteParams.toArray(new byte[byteParams.size()][]);