Support JSON.MERGE Command

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

@@ -3425,6 +3425,15 @@ public final <T> CommandObject<T> jsonGet(String key, Class<T> clazz, Path... pa
     return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), new JsonObjectBuilder<>(clazz));
   }
 
+  public final CommandObject<String> jsonMerge(String key, Path2 path, Object object) {
+    return new CommandObject<>(commandArguments(JsonCommand.MERGE).key(key).add(path).add(object), BuilderFactory.STRING);
+  }
+
+  public final CommandObject<String> jsonMerge(String key, Path path, Object pojo) {
+    return new CommandObject<>(commandArguments(JsonCommand.MERGE).key(key).add(path).add(
+        getJsonObjectMapper().toJson(pojo)), BuilderFactory.STRING);
+  }
+
   public final CommandObject<List<JSONArray>> jsonMGet(Path2 path, String... keys) {
     return new CommandObject<>(commandArguments(JsonCommand.MGET).keys((Object[]) keys).add(path), JsonBuilderFactory.JSON_ARRAY_LIST);
   }

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

@@ -3593,6 +3593,16 @@ public <T> Response<T> jsonGet(String key, Class<T> clazz, Path... paths) {
     return appendCommand(commandObjects.jsonGet(key, clazz, paths));
   }
 
+  @Override
+  public Response<String> jsonMerge(String key, Path2 path, Object object) {
+    return appendCommand(commandObjects.jsonMerge(key, path, object));
+  }
+
+  @Override
+  public Response<String> jsonMerge(String key, Path path, Object object) {
+    return appendCommand(commandObjects.jsonMerge(key, path, object));
+  }
+
   @Override
   public Response<List<JSONArray>> jsonMGet(Path2 path, String... keys) {
     return appendCommand(commandObjects.jsonMGet(path, keys));

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

@@ -3546,6 +3546,16 @@ public <T> Response<T> jsonGet(String key, Class<T> clazz, Path... paths) {
     return appendCommand(commandObjects.jsonGet(key, clazz, paths));
   }
 
+    @Override
+    public Response<String> jsonMerge(String key, Path path, Object object) {
+      return appendCommand(commandObjects.jsonMerge(key, path, object));
+    }
+
+    @Override
+    public Response<String> jsonMerge(String key, Path2 path, Object object) {
+      return appendCommand(commandObjects.jsonMerge(key, path, object));
+    }
+
   @Override
   public Response<List<JSONArray>> jsonMGet(Path2 path, String... keys) {
     return appendCommand(commandObjects.jsonMGet(path, keys));

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

@@ -50,7 +50,7 @@ public abstract class TransactionBase extends Queable implements PipelineCommand
 
   /**
    * Creates a new transaction.
-   * 
+   *
    * A MULTI command will be added to be sent to server. WATCH/UNWATCH/MULTI commands must not be
    * called with this object.
    * @param connection connection
@@ -3644,6 +3644,16 @@ public <T> Response<T> jsonGet(String key, Class<T> clazz, Path... paths) {
     return appendCommand(commandObjects.jsonGet(key, clazz, paths));
   }
 
+  @Override
+  public Response<String> jsonMerge(String key, Path2 path, Object object) {
+    return appendCommand(commandObjects.jsonMerge(key, path, object));
+  }
+
+  @Override
+  public Response<String> jsonMerge(String key, Path path, Object object) {
+    return appendCommand(commandObjects.jsonMerge(key, path, object));
+  }
+
   @Override
   public Response<List<JSONArray>> jsonMGet(Path2 path, String... keys) {
     return appendCommand(commandObjects.jsonMGet(path, keys));

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

@@ -3917,6 +3917,16 @@ public <T> T jsonGet(String key, Class<T> clazz, Path... paths) {
     return executeCommand(commandObjects.jsonGet(key, clazz, paths));
   }
 
+  @Override
+  public String jsonMerge(String key, Path2 path, Object object) {
+    return executeCommand(commandObjects.jsonMerge(key, path, object));
+  }
+
+  @Override
+  public String jsonMerge(String key, Path path, Object pojo) {
+    return executeCommand(commandObjects.jsonMerge(key, path, pojo));
+  }
+
   @Override
   public List<JSONArray> jsonMGet(Path2 path, String... keys) {
     return executeCommand(commandObjects.jsonMGet(path, keys));

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

@@ -9,6 +9,7 @@ public enum JsonCommand implements ProtocolCommand {
     DEL("JSON.DEL"),
     GET("JSON.GET"),
     MGET("JSON.MGET"),
+    MERGE("JSON.MERGE"),
     SET("JSON.SET"),
     TYPE("JSON.TYPE"),
     STRAPPEND("JSON.STRAPPEND"),

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

@@ -55,6 +55,10 @@ default String jsonSetLegacy(String key, Object pojo, JsonSetParams params) {
 
   <T> T jsonGet(String key, Class<T> clazz, Path... paths);
 
+  String jsonMerge(String key, Path2 path, Object object);
+
+  String jsonMerge(String key, Path path, Object pojo);
+
   default List<JSONArray> jsonMGet(String... keys) {
     return jsonMGet(Path2.ROOT_PATH, keys);
   }

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

@@ -57,6 +57,10 @@ default Response<String> jsonSetLegacy(String key, Object pojo, JsonSetParams pa
 
   <T> Response<T> jsonGet(String key, Class<T> clazz, Path... paths);
 
+  Response<String> jsonMerge(String key, Path2 path, Object object);
+
+  Response<String> jsonMerge(String key, Path path, Object pojo);
+
   default Response<List<JSONArray>> jsonMGet(String... keys) {
     return jsonMGet(Path2.ROOT_PATH, keys);
   }

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

@@ -186,6 +186,22 @@ public void typeChecksShouldSucceed() {
     assertNull(client.jsonType("foobar", Path.of(".fooErr")));
   }
 
+  // @Test
+  // public void testJsonMerge() {
+  //   // Test with root path
+  //   assertEquals("OK", client.jsonSet("test_merge", "{\"person\":{\"name\":\"John Doe\",\"age\":25,\"address\":{\"home\":\"123 Main Street\"},\"phone\":\"123-456-7890\"}}"));
+  //   assertEquals("OK", client.jsonMerge("test_merge", new Path("$"), "{\"person\":{\"age\":30}}"));
+  //   assertEquals("{[person={name=John Doe, age=30.0, address={home=123 Main Street}, phone=123-456-7890]}}", client.jsonGet("test_merge").toString());
+
+  //   // Test with root path path $.a.b
+  //   assertEquals("OK", client.jsonMerge("test_merge", new Path("$.person.address"), "{\"work\":\"Redis office\"}"));
+  //   assertEquals("{[[person={name=John Doe, age=30.0, address={home=123 Main Street, work=Redis office}, phone=123-456-7890]]}}", client.jsonGet("test_merge").toString());
+
+  //   // Test with null value to delete a value
+  //   assertEquals("OK", client.jsonMerge("test_merge", new Path("$.person"), "{\"age\":null}"));
+  //   assertEquals("{[person={name=John Doe, phone=123-456-7890, address={home=123 Main Street, work=Redis office}]}}", client.jsonGet("test_merge").toString());
+  // }
+
   @Test
   public void mgetWithPathWithAllKeysExist() {
     Baz baz1 = new Baz("quuz1", "grault1", "waldo1");

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

@@ -181,6 +181,25 @@ public void typeChecksShouldSucceed() {
     assertEquals(Collections.emptyList(), client.jsonType("foobar", Path2.of(".fooErr")));
   }
 
+  @Test
+  public void testJsonMerge() {
+    // Test with root path
+    assertEquals("OK", client.jsonSet("test_merge", "{\"person\":{\"name\":\"John Doe\",\"age\":25,\"address\":{\"home\":\"123 Main Street\"},\"phone\":\"123-456-7890\"}}"));
+    assertEquals("OK", client.jsonMerge("test_merge", new Path2("$"), "{\"person\":{\"age\":30}}"));
+    assertEquals("{person={name=John Doe, age=30.0, address={home=123 Main Street}, phone=123-456-7890}}", client.jsonGet("test_merge").toString());
+
+    // Test with root path path $.a.b
+    assertEquals("OK", client.jsonMerge("test_merge", new Path2("$.person.address"), "{\"work\":\"Redis office\"}"));
+    assertEquals("{person={name=John Doe, age=30.0, address={home=123 Main Street, work=Redis office}, phone=123-456-7890}}", client.jsonGet("test_merge").toString());
+
+    // Test with null value to delete a value
+    assertEquals("OK", client.jsonMerge("test_merge", new Path2("$.person"), "{\"age\":null}"));
+    assertEquals("{person={name=John Doe, phone=123-456-7890, address={home=123 Main Street, work=Redis office}}}", client.jsonGet("test_merge").toString());
+
+    // cleanup
+    assertEquals(1L, client.del("test_merge"));
+  }
+
   @Test
   public void mgetWithPathWithAllKeysExist() {
     Baz baz1 = new Baz("quuz1", "grault1", "waldo1");