diff --git a/docs/jedis5-breaking.md b/docs/jedis5-breaking.md index 6f5b50247f..f287b3e0c4 100644 --- a/docs/jedis5-breaking.md +++ b/docs/jedis5-breaking.md @@ -67,6 +67,11 @@ - `BINARY_MAP_FROM_PAIRS` - `STRING_ORDERED_SET` +- Following methods supporting JSON.RESP command have been removed: + - `jsonResp(String key)` + - `jsonResp(String key, Path path)` + - `jsonResp(String key, Path2 path)` + - `RedisJsonCommands` and `RedisJsonPipelineCommands` interfaces have been moved into `redis.clients.jedis.json.commands` package. - `Queable` class is removed. diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java index c96c4ede1b..79ec632882 100644 --- a/src/main/java/redis/clients/jedis/CommandObjects.java +++ b/src/main/java/redis/clients/jedis/CommandObjects.java @@ -3724,18 +3724,6 @@ public final CommandObject jsonDebugMemory(String key, Path path) { public final CommandObject> jsonDebugMemory(String key, Path2 path) { return new CommandObject<>(commandArguments(JsonCommand.DEBUG).add("MEMORY").key(key).add(path), BuilderFactory.LONG_LIST); } - - public final CommandObject> jsonResp(String key) { - return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key), BuilderFactory.ENCODED_OBJECT_LIST); - } - - public final CommandObject> jsonResp(String key, Path path) { - return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST); - } - - public final CommandObject>> jsonResp(String key, Path2 path) { - return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST_LIST); - } // RedisJSON commands // RedisTimeSeries commands diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java index e896dc882f..ccfb99461f 100644 --- a/src/main/java/redis/clients/jedis/UnifiedJedis.java +++ b/src/main/java/redis/clients/jedis/UnifiedJedis.java @@ -4219,21 +4219,6 @@ public long jsonDebugMemory(String key, Path path) { public List jsonDebugMemory(String key, Path2 path) { return executeCommand(commandObjects.jsonDebugMemory(key, path)); } - - @Override - public List jsonResp(String key) { - return executeCommand(commandObjects.jsonResp(key)); - } - - @Override - public List jsonResp(String key, Path path) { - return executeCommand(commandObjects.jsonResp(key, path)); - } - - @Override - public List> jsonResp(String key, Path2 path) { - return executeCommand(commandObjects.jsonResp(key, path)); - } // RedisJSON commands // RedisTimeSeries commands diff --git a/src/main/java/redis/clients/jedis/json/commands/RedisJsonV1Commands.java b/src/main/java/redis/clients/jedis/json/commands/RedisJsonV1Commands.java index 4d2e96fec9..60d3318640 100644 --- a/src/main/java/redis/clients/jedis/json/commands/RedisJsonV1Commands.java +++ b/src/main/java/redis/clients/jedis/json/commands/RedisJsonV1Commands.java @@ -97,8 +97,4 @@ default List jsonMGet(Class clazz, String... keys) { long jsonDebugMemory(String key); long jsonDebugMemory(String key, Path path); - - List jsonResp(String key); - - List jsonResp(String key, Path path); } diff --git a/src/main/java/redis/clients/jedis/json/commands/RedisJsonV2Commands.java b/src/main/java/redis/clients/jedis/json/commands/RedisJsonV2Commands.java index 95ff38aa34..2e5f400650 100644 --- a/src/main/java/redis/clients/jedis/json/commands/RedisJsonV2Commands.java +++ b/src/main/java/redis/clients/jedis/json/commands/RedisJsonV2Commands.java @@ -86,6 +86,4 @@ default List jsonMGet(String... keys) { List> jsonObjKeys(String key, Path2 path); List jsonDebugMemory(String key, Path2 path); - - List> jsonResp(String key, Path2 path); } diff --git a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java index 6a672a0ede..cc9dcfdc05 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java @@ -493,38 +493,6 @@ public void plainString() { assertEquals(json, jsonClient.jsonGetAsPlainString("plain", ROOT_PATH)); } - @Test - public void resp() { - assertNull(jsonClient.jsonResp("resp")); - assertNull(jsonClient.jsonResp("resp", ROOT_PATH)); - - String json = "{\"foo\": {\"hello\":\"world\"}, \"bar\": [null, 3, 2.5, true]}"; - jsonClient.jsonSetWithPlainString("resp", ROOT_PATH, json); - - List resp = jsonClient.jsonResp("resp"); - assertEquals("{", resp.get(0)); - - assertEquals("foo", resp.get(1)); - assertEquals(Arrays.asList("{", "hello", "world"), resp.get(2)); - - assertEquals("bar", resp.get(3)); - List arr = (List) resp.get(4); - assertEquals("[", arr.get(0)); - assertNull(arr.get(1)); - assertEquals(Long.valueOf(3), arr.get(2)); - //assertEquals("2.5", arr.get(3)); - MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5)); - assertEquals("true", arr.get(4)); - - arr = jsonClient.jsonResp("resp", Path.of(".bar")); - assertEquals("[", arr.get(0)); - assertNull(arr.get(1)); - assertEquals(Long.valueOf(3), arr.get(2)); - //assertEquals("2.5", arr.get(3)); - MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5)); - assertEquals("true", arr.get(4)); - } - @Test public void testJsonGsonParser() { Tick person = new Tick("foo", Instant.now()); diff --git a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java index 959e950914..bc9c34edb6 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java @@ -507,32 +507,6 @@ public void debugMemory() { assertEquals(1, jsonClient.jsonDebugMemory("json", Path2.of("$..bar")).size()); } - @Test - public void resp() { - assertNull(jsonClient.jsonResp("resp", ROOT_PATH)); - - String json = "{\"foo\": {\"hello\":\"world\"}, \"bar\": [null, 3, 2.5, true]}"; - jsonClient.jsonSet("resp", ROOT_PATH, json); - - List> fullResp = jsonClient.jsonResp("resp", ROOT_PATH); - assertEquals(1, fullResp.size()); - - List resp = fullResp.get(0); - assertEquals("{", resp.get(0)); - - assertEquals("foo", resp.get(1)); - assertEquals(Arrays.asList("{", "hello", "world"), resp.get(2)); - - assertEquals("bar", resp.get(3)); - List arr = (List) resp.get(4); - assertEquals("[", arr.get(0)); - assertNull(arr.get(1)); - assertEquals(Long.valueOf(3), arr.get(2)); - //assertEquals("2.5", arr.get(3)); - MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5)); - assertEquals("true", arr.get(4)); - } - private void assertJsonArrayEquals(JSONArray a, Object _b) { if (!(_b instanceof JSONArray)) { fail("Actual value is not JSONArray.");