Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/jedis5-breaking.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/redis/clients/jedis/CommandObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -3724,18 +3724,6 @@ public final CommandObject<Long> jsonDebugMemory(String key, Path path) {
public final CommandObject<List<Long>> jsonDebugMemory(String key, Path2 path) {
return new CommandObject<>(commandArguments(JsonCommand.DEBUG).add("MEMORY").key(key).add(path), BuilderFactory.LONG_LIST);
}

public final CommandObject<List<Object>> jsonResp(String key) {
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key), BuilderFactory.ENCODED_OBJECT_LIST);
}

public final CommandObject<List<Object>> jsonResp(String key, Path path) {
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST);
}

public final CommandObject<List<List<Object>>> jsonResp(String key, Path2 path) {
return new CommandObject<>(commandArguments(JsonCommand.RESP).key(key).add(path), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
}
// RedisJSON commands

// RedisTimeSeries commands
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/redis/clients/jedis/UnifiedJedis.java
Original file line number Diff line number Diff line change
Expand Up @@ -4219,21 +4219,6 @@ public long jsonDebugMemory(String key, Path path) {
public List<Long> jsonDebugMemory(String key, Path2 path) {
return executeCommand(commandObjects.jsonDebugMemory(key, path));
}

@Override
public List<Object> jsonResp(String key) {
return executeCommand(commandObjects.jsonResp(key));
}

@Override
public List<Object> jsonResp(String key, Path path) {
return executeCommand(commandObjects.jsonResp(key, path));
}

@Override
public List<List<Object>> jsonResp(String key, Path2 path) {
return executeCommand(commandObjects.jsonResp(key, path));
}
// RedisJSON commands

// RedisTimeSeries commands
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,4 @@ default <T> List<T> jsonMGet(Class<T> clazz, String... keys) {
long jsonDebugMemory(String key);

long jsonDebugMemory(String key, Path path);

List<Object> jsonResp(String key);

List<Object> jsonResp(String key, Path path);
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,4 @@ default List<JSONArray> jsonMGet(String... keys) {
List<List<String>> jsonObjKeys(String key, Path2 path);

List<Long> jsonDebugMemory(String key, Path2 path);

List<List<Object>> jsonResp(String key, Path2 path);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<Object> 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<Object> arr = (List<Object>) 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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<List<Object>> fullResp = jsonClient.jsonResp("resp", ROOT_PATH);
assertEquals(1, fullResp.size());

List<Object> 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<Object> arr = (List<Object>) 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.");
Expand Down