Support Json commands after RESP3 update (#3460)

* JSON.GET v2 RESP3

* JSON.NUMINCRBY v2 RESP3

* JSON.TYPE v2 RESP3

* cleanup prints

* edit

* Use interface in RedisJsonV1Test

* JSON v1 commands with RESP3

* Comment out RedisJSON v1 with RESP3

* more

* pipeline test

* pipeline commands

* Allow RESP3 in existing methods

even though there are newer methods suffixed with 'Resp3'

* cleanup commented codes

* remove more commented codes

* breaking changes list

* rephrase doc

* Address json module changes

* Comment unused code

* CLEANUP commented implementations

* merge fix

Author: sazzad16

docs/jedis5-breaking.md

@@ -40,6 +40,10 @@
   - `tsMRevRange(long fromTimestamp, long toTimestamp, String... filters)`
   - `tsMRevRange(TSMRangeParams multiRangeParams)`
 
+- `jsonNumIncrBy(String key, Path2 path, double value)` method now returns `Object` instead of `JSONArray`.
+  - Previously when it was returning JSONArray, returned would still be JSONArray. So simple type casting should be enough to handle this change.
+  - The returning object will be `List<Double>` when running under RESP3 protocol.
+
 - `getAgeSeconds()` in `AccessControlLogEntry` now returns `Double` instead of `String`.
 
 - Both `ftConfigGet(String option)` and `ftConfigGet(String indexName, String option)` methods now return `Map<String, Object>` instead of `Map<String, String>`.

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

@@ -3460,7 +3460,8 @@ public final CommandObject<String> jsonMerge(String key, Path path, Object pojo)
   }
 
   public final CommandObject<Object> jsonGet(String key) {
-    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), new JsonObjectBuilder<>(Object.class));
+    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key),
+        protocol != RedisProtocol.RESP3 ? JSON_GENERIC_OBJECT : JsonBuilderFactory.JSON_OBJECT);
   }
 
   public final <T> CommandObject<T> jsonGet(String key, Class<T> clazz) {
@@ -3472,7 +3473,7 @@ public final CommandObject<Object> jsonGet(String key, Path2... paths) {
   }
 
   public final CommandObject<Object> jsonGet(String key, Path... paths) {
-    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), new JsonObjectBuilder<>(Object.class));
+    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), JSON_GENERIC_OBJECT);
   }
 
   public final CommandObject<String> jsonGetAsPlainString(String key, Path path) {
@@ -3528,7 +3529,8 @@ public final CommandObject<Class<?>> jsonType(String key) {
   }
 
   public final CommandObject<List<Class<?>>> jsonType(String key, Path2 path) {
-    return new CommandObject<>(commandArguments(JsonCommand.TYPE).key(key).add(path), JsonBuilderFactory.JSON_TYPE_LIST);
+    return new CommandObject<>(commandArguments(JsonCommand.TYPE).key(key).add(path),
+        protocol != RedisProtocol.RESP3 ? JsonBuilderFactory.JSON_TYPE_LIST : JsonBuilderFactory.JSON_TYPE_RESPONSE_RESP3_COMPATIBLE);
   }
 
   public final CommandObject<Class<?>> jsonType(String key, Path path) {
@@ -3562,8 +3564,9 @@ public final CommandObject<Long> jsonStrLen(String key, Path path) {
     return new CommandObject<>(commandArguments(JsonCommand.STRLEN).key(key).add(path), BuilderFactory.LONG);
   }
 
-  public final CommandObject<JSONArray> jsonNumIncrBy(String key, Path2 path, double value) {
-    return new CommandObject<>(commandArguments(JsonCommand.NUMINCRBY).key(key).add(path).add(value), JsonBuilderFactory.JSON_ARRAY);
+  public final CommandObject<Object> jsonNumIncrBy(String key, Path2 path, double value) {
+    return new CommandObject<>(commandArguments(JsonCommand.NUMINCRBY).key(key).add(path).add(value),
+        JsonBuilderFactory.JSON_ARRAY_OR_DOUBLE_LIST);
   }
 
   public final CommandObject<Double> jsonNumIncrBy(String key, Path path, double value) {
@@ -4260,6 +4263,11 @@ public T build(Object data) {
     }
   }
 
+  /**
+   * {@link JsonObjectBuilder} for {@code Object.class}.
+   */
+  private final Builder<Object> JSON_GENERIC_OBJECT = new JsonObjectBuilder<>(Object.class);
+
   private class JsonObjectListBuilder<T> extends Builder<List<T>> {
 
     private final Class<T> clazz;

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

@@ -3607,7 +3607,7 @@ public Response<Long> jsonStrLen(String key, Path path) {
   }
 
   @Override
-  public Response<JSONArray> jsonNumIncrBy(String key, Path2 path, double value) {
+  public Response<Object> jsonNumIncrBy(String key, Path2 path, double value) {
     return appendCommand(commandObjects.jsonNumIncrBy(key, path, value));
   }
 

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

@@ -3775,7 +3775,7 @@ public Response<Long> jsonStrLen(String key, Path path) {
   }
 
   @Override
-  public Response<JSONArray> jsonNumIncrBy(String key, Path2 path, double value) {
+  public Response<Object> jsonNumIncrBy(String key, Path2 path, double value) {
     return appendCommand(commandObjects.jsonNumIncrBy(key, path, value));
   }
 

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

@@ -4056,7 +4056,7 @@ public Long jsonStrLen(String key, Path path) {
   }
 
   @Override
-  public JSONArray jsonNumIncrBy(String key, Path2 path, double value) {
+  public Object jsonNumIncrBy(String key, Path2 path, double value) {
     return executeCommand(commandObjects.jsonNumIncrBy(key, path, value));
   }
 

src/main/java/redis/clients/jedis/json/JsonBuilderFactory.java

@@ -9,6 +9,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import redis.clients.jedis.Builder;
+import redis.clients.jedis.BuilderFactory;
 import redis.clients.jedis.exceptions.JedisException;
 
 public final class JsonBuilderFactory {
@@ -60,6 +61,21 @@ public List<Class<?>> build(Object data) {
     }
   };
 
+  public static final Builder<List<List<Class<?>>>> JSON_TYPE_RESPONSE_RESP3 = new Builder<List<List<Class<?>>>>() {
+    @Override
+    public List<List<Class<?>>> build(Object data) {
+      return ((List<Object>) data).stream().map(JSON_TYPE_LIST::build).collect(Collectors.toList());
+    }
+  };
+
+  public static final Builder<List<Class<?>>> JSON_TYPE_RESPONSE_RESP3_COMPATIBLE = new Builder<List<Class<?>>>() {
+    @Override
+    public List<Class<?>> build(Object data) {
+      List<List<Class<?>>> fullReply = JSON_TYPE_RESPONSE_RESP3.build(data);
+      return fullReply == null ? null : fullReply.get(0);
+    }
+  };
+
   public static final Builder<Object> JSON_OBJECT = new Builder<Object>() {
     @Override
     public Object build(Object data) {
@@ -70,7 +86,6 @@ public Object build(Object data) {
       if (!(data instanceof byte[])) {
         return data;
       }
-
       String str = STRING.build(data);
       if (str.charAt(0) == '{') {
         try {
@@ -103,6 +118,15 @@ public JSONArray build(Object data) {
     }
   };
 
+  public static final Builder<Object> JSON_ARRAY_OR_DOUBLE_LIST = new Builder<Object>() {
+    @Override
+    public Object build(Object data) {
+      if (data == null) return null;
+      if (data instanceof List) return BuilderFactory.DOUBLE_LIST.build(data);
+      return JSON_ARRAY.build(data);
+    }
+  };
+
   public static final Builder<List<JSONArray>> JSON_ARRAY_LIST = new Builder<List<JSONArray>>() {
     @Override
     public List<JSONArray> build(Object data) {

src/main/java/redis/clients/jedis/json/commands/RedisJsonV2Commands.java

@@ -59,7 +59,7 @@ default List<JSONArray> jsonMGet(String... keys) {
 
   List<Long> jsonStrLen(String key, Path2 path);
 
-  JSONArray jsonNumIncrBy(String key, Path2 path, double value);
+  Object jsonNumIncrBy(String key, Path2 path, double value);
 
   List<Long> jsonArrAppend(String key, Path2 path, Object... objects);
 

src/main/java/redis/clients/jedis/json/commands/RedisJsonV2PipelineCommands.java

@@ -60,7 +60,7 @@ default Response<List<JSONArray>> jsonMGet(String... keys) {
 
   Response<List<Long>> jsonStrLen(String key, Path2 path);
 
-  Response<JSONArray> jsonNumIncrBy(String key, Path2 path, double value);
+  Response<Object> jsonNumIncrBy(String key, Path2 path, double value);
 
   Response<List<Long>> jsonArrAppend(String key, Path2 path, Object... objects);
 

src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java

@@ -14,16 +14,19 @@
 import java.util.Collections;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import redis.clients.jedis.Pipeline;
+import redis.clients.jedis.RedisProtocol;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
 import redis.clients.jedis.search.*;
 import redis.clients.jedis.search.aggr.*;
+import redis.clients.jedis.util.RedisProtocolUtil;
 
 public class RedisModulesPipelineTest extends RedisModuleCommandsTestBase {
 
@@ -88,6 +91,8 @@ public void search() {
 
   @Test
   public void jsonV1() {
+    Assume.assumeFalse(RedisProtocolUtil.getRedisProtocol() == RedisProtocol.RESP3);
+
     Map<String, String> hm1 = new HashMap<>();
     hm1.put("hello", "world");
     hm1.put("oh", "snap");

src/test/java/redis/clients/jedis/modules/json/JsonObjects.java

@@ -17,6 +17,16 @@ public IRLObject() {
       this.str = "string";
       this.bool = true;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) return true;
+      if (obj == null) return false;
+      if (getClass() != obj.getClass()) return false;
+      final IRLObject other = (IRLObject) obj;
+      return Objects.equals(str, other.str)
+          && Objects.equals(bool, other.bool);
+    }
   }
 
   @SuppressWarnings("unused")