Skip to content

Commit 3d874e1

Browse files
authored
Remove JSON.RESP command support (#3502)
* Remove JSON.RESP command support * breaking change list
1 parent 29a8d34 commit 3d874e1

File tree

7 files changed

+5
-91
lines changed

7 files changed

+5
-91
lines changed

docs/jedis5-breaking.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
- `BINARY_MAP_FROM_PAIRS`
6868
- `STRING_ORDERED_SET`
6969

70+
- Following methods supporting JSON.RESP command have been removed:
71+
- `jsonResp(String key)`
72+
- `jsonResp(String key, Path path)`
73+
- `jsonResp(String key, Path2 path)`
74+
7075
- `RedisJsonCommands` and `RedisJsonPipelineCommands` interfaces have been moved into `redis.clients.jedis.json.commands` package.
7176

7277
- `Queable` class is removed.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3724,18 +3724,6 @@ public final CommandObject<Long> jsonDebugMemory(String key, Path path) {
37243724
public final CommandObject<List<Long>> jsonDebugMemory(String key, Path2 path) {
37253725
return new CommandObject<>(commandArguments(JsonCommand.DEBUG).add("MEMORY").key(key).add(path), BuilderFactory.LONG_LIST);
37263726
}
3727-
3728-
public final CommandObject<List<Object>> jsonResp(String key) {
3729-
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key), BuilderFactory.ENCODED_OBJECT_LIST);
3730-
}
3731-
3732-
public final CommandObject<List<Object>> jsonResp(String key, Path path) {
3733-
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST);
3734-
}
3735-
3736-
public final CommandObject<List<List<Object>>> jsonResp(String key, Path2 path) {
3737-
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
3738-
}
37393727
// RedisJSON commands
37403728

37413729
// RedisTimeSeries commands

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4219,21 +4219,6 @@ public long jsonDebugMemory(String key, Path path) {
42194219
public List<Long> jsonDebugMemory(String key, Path2 path) {
42204220
return executeCommand(commandObjects.jsonDebugMemory(key, path));
42214221
}
4222-
4223-
@Override
4224-
public List<Object> jsonResp(String key) {
4225-
return executeCommand(commandObjects.jsonResp(key));
4226-
}
4227-
4228-
@Override
4229-
public List<Object> jsonResp(String key, Path path) {
4230-
return executeCommand(commandObjects.jsonResp(key, path));
4231-
}
4232-
4233-
@Override
4234-
public List<List<Object>> jsonResp(String key, Path2 path) {
4235-
return executeCommand(commandObjects.jsonResp(key, path));
4236-
}
42374222
// RedisJSON commands
42384223

42394224
// RedisTimeSeries commands

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,4 @@ default <T> List<T> jsonMGet(Class<T> clazz, String... keys) {
9797
long jsonDebugMemory(String key);
9898

9999
long jsonDebugMemory(String key, Path path);
100-
101-
List<Object> jsonResp(String key);
102-
103-
List<Object> jsonResp(String key, Path path);
104100
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,4 @@ default List<JSONArray> jsonMGet(String... keys) {
8686
List<List<String>> jsonObjKeys(String key, Path2 path);
8787

8888
List<Long> jsonDebugMemory(String key, Path2 path);
89-
90-
List<List<Object>> jsonResp(String key, Path2 path);
9189
}

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -493,38 +493,6 @@ public void plainString() {
493493
assertEquals(json, jsonClient.jsonGetAsPlainString("plain", ROOT_PATH));
494494
}
495495

496-
@Test
497-
public void resp() {
498-
assertNull(jsonClient.jsonResp("resp"));
499-
assertNull(jsonClient.jsonResp("resp", ROOT_PATH));
500-
501-
String json = "{\"foo\": {\"hello\":\"world\"}, \"bar\": [null, 3, 2.5, true]}";
502-
jsonClient.jsonSetWithPlainString("resp", ROOT_PATH, json);
503-
504-
List<Object> resp = jsonClient.jsonResp("resp");
505-
assertEquals("{", resp.get(0));
506-
507-
assertEquals("foo", resp.get(1));
508-
assertEquals(Arrays.asList("{", "hello", "world"), resp.get(2));
509-
510-
assertEquals("bar", resp.get(3));
511-
List<Object> arr = (List<Object>) resp.get(4);
512-
assertEquals("[", arr.get(0));
513-
assertNull(arr.get(1));
514-
assertEquals(Long.valueOf(3), arr.get(2));
515-
//assertEquals("2.5", arr.get(3));
516-
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
517-
assertEquals("true", arr.get(4));
518-
519-
arr = jsonClient.jsonResp("resp", Path.of(".bar"));
520-
assertEquals("[", arr.get(0));
521-
assertNull(arr.get(1));
522-
assertEquals(Long.valueOf(3), arr.get(2));
523-
//assertEquals("2.5", arr.get(3));
524-
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
525-
assertEquals("true", arr.get(4));
526-
}
527-
528496
@Test
529497
public void testJsonGsonParser() {
530498
Tick person = new Tick("foo", Instant.now());

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -507,32 +507,6 @@ public void debugMemory() {
507507
assertEquals(1, jsonClient.jsonDebugMemory("json", Path2.of("$..bar")).size());
508508
}
509509

510-
@Test
511-
public void resp() {
512-
assertNull(jsonClient.jsonResp("resp", ROOT_PATH));
513-
514-
String json = "{\"foo\": {\"hello\":\"world\"}, \"bar\": [null, 3, 2.5, true]}";
515-
jsonClient.jsonSet("resp", ROOT_PATH, json);
516-
517-
List<List<Object>> fullResp = jsonClient.jsonResp("resp", ROOT_PATH);
518-
assertEquals(1, fullResp.size());
519-
520-
List<Object> resp = fullResp.get(0);
521-
assertEquals("{", resp.get(0));
522-
523-
assertEquals("foo", resp.get(1));
524-
assertEquals(Arrays.asList("{", "hello", "world"), resp.get(2));
525-
526-
assertEquals("bar", resp.get(3));
527-
List<Object> arr = (List<Object>) resp.get(4);
528-
assertEquals("[", arr.get(0));
529-
assertNull(arr.get(1));
530-
assertEquals(Long.valueOf(3), arr.get(2));
531-
//assertEquals("2.5", arr.get(3));
532-
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
533-
assertEquals("true", arr.get(4));
534-
}
535-
536510
private void assertJsonArrayEquals(JSONArray a, Object _b) {
537511
if (!(_b instanceof JSONArray)) {
538512
fail("Actual value is not JSONArray.");

0 commit comments

Comments
 (0)