Skip to content

Allow exclusion of GSON dependency #3223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2022
Merged

Allow exclusion of GSON dependency #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9c2ce1
Allow exclusion of json dependenies
agavrilov76 Dec 6, 2022
7d0b554
Merge branch 'master' into fix-gson
sazzad16 Dec 7, 2022
a53c357
Merge branch 'master' into fix-gson
sazzad16 Dec 11, 2022
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
33 changes: 15 additions & 18 deletions src/main/java/redis/clients/jedis/CommandObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3295,11 +3295,11 @@ public final CommandObject<String> jsonSet(String key, Path2 path, Object object
}

public final CommandObject<String> jsonSetWithEscape(String key, Path2 path, Object object) {
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GSON.toJson(object)), BuilderFactory.STRING);
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GsonJson.toJson(object)), BuilderFactory.STRING);
}

public final CommandObject<String> jsonSet(String key, Path path, Object pojo) {
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GSON.toJson(pojo)), BuilderFactory.STRING);
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GsonJson.toJson(pojo)), BuilderFactory.STRING);
}

public final CommandObject<String> jsonSetWithPlainString(String key, Path path, String string) {
Expand All @@ -3311,11 +3311,11 @@ public final CommandObject<String> jsonSet(String key, Path2 path, Object object
}

public final CommandObject<String> jsonSetWithEscape(String key, Path2 path, Object object, JsonSetParams params) {
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GSON.toJson(object)).addParams(params), BuilderFactory.STRING);
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GsonJson.toJson(object)).addParams(params), BuilderFactory.STRING);
}

public final CommandObject<String> jsonSet(String key, Path path, Object pojo, JsonSetParams params) {
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GSON.toJson(pojo)).addParams(params), BuilderFactory.STRING);
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(GsonJson.toJson(pojo)).addParams(params), BuilderFactory.STRING);
}

public final CommandObject<Object> jsonGet(String key) {
Expand Down Expand Up @@ -3395,15 +3395,15 @@ public final CommandObject<Class<?>> jsonType(String key, Path path) {
}

public final CommandObject<Long> jsonStrAppend(String key, Object string) {
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(GSON.toJson(string)), BuilderFactory.LONG);
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(GsonJson.toJson(string)), BuilderFactory.LONG);
}

public final CommandObject<List<Long>> jsonStrAppend(String key, Path2 path, Object string) {
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(path).add(GSON.toJson(string)), BuilderFactory.LONG_LIST);
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(path).add(GsonJson.toJson(string)), BuilderFactory.LONG_LIST);
}

public final CommandObject<Long> jsonStrAppend(String key, Path path, Object string) {
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(path).add(GSON.toJson(string)), BuilderFactory.LONG);
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(path).add(GsonJson.toJson(string)), BuilderFactory.LONG);
}

public final CommandObject<Long> jsonStrLen(String key) {
Expand Down Expand Up @@ -3442,15 +3442,15 @@ public final CommandObject<List<Long>> jsonArrAppend(String key, Path2 path, Obj
public final CommandObject<List<Long>> jsonArrAppendWithEscape(String key, Path2 path, Object... objects) {
CommandArguments args = commandArguments(JsonCommand.ARRAPPEND).key(key).add(path);
for (Object object : objects) {
args.add(GSON.toJson(object));
args.add(GsonJson.toJson(object));
}
return new CommandObject<>(args, BuilderFactory.LONG_LIST);
}

public final CommandObject<Long> jsonArrAppend(String key, Path path, Object... pojos) {
CommandArguments args = commandArguments(JsonCommand.ARRAPPEND).key(key).add(path);
for (Object pojo : pojos) {
args.add(GSON.toJson(pojo));
args.add(GsonJson.toJson(pojo));
}
return new CommandObject<>(args, BuilderFactory.LONG);
}
Expand All @@ -3460,11 +3460,11 @@ public final CommandObject<List<Long>> jsonArrIndex(String key, Path2 path, Obje
}

public final CommandObject<List<Long>> jsonArrIndexWithEscape(String key, Path2 path, Object scalar) {
return new CommandObject<>(commandArguments(JsonCommand.ARRINDEX).key(key).add(path).add(GSON.toJson(scalar)), BuilderFactory.LONG_LIST);
return new CommandObject<>(commandArguments(JsonCommand.ARRINDEX).key(key).add(path).add(GsonJson.toJson(scalar)), BuilderFactory.LONG_LIST);
}

public final CommandObject<Long> jsonArrIndex(String key, Path path, Object scalar) {
return new CommandObject<>(commandArguments(JsonCommand.ARRINDEX).key(key).add(path).add(GSON.toJson(scalar)), BuilderFactory.LONG);
return new CommandObject<>(commandArguments(JsonCommand.ARRINDEX).key(key).add(path).add(GsonJson.toJson(scalar)), BuilderFactory.LONG);
}

public final CommandObject<List<Long>> jsonArrInsert(String key, Path2 path, int index, Object... objects) {
Expand All @@ -3475,15 +3475,15 @@ public final CommandObject<List<Long>> jsonArrInsert(String key, Path2 path, int
public final CommandObject<List<Long>> jsonArrInsertWithEscape(String key, Path2 path, int index, Object... objects) {
CommandArguments args = commandArguments(JsonCommand.ARRINSERT).key(key).add(path).add(index);
for (Object object : objects) {
args.add(GSON.toJson(object));
args.add(GsonJson.toJson(object));
}
return new CommandObject<>(args, BuilderFactory.LONG_LIST);
}

public final CommandObject<Long> jsonArrInsert(String key, Path path, int index, Object... pojos) {
CommandArguments args = commandArguments(JsonCommand.ARRINSERT).key(key).add(path).add(index);
for (Object pojo : pojos) {
args.add(GSON.toJson(pojo));
args.add(GsonJson.toJson(pojo));
}
return new CommandObject<>(args, BuilderFactory.LONG);
}
Expand Down Expand Up @@ -4036,9 +4036,6 @@ public Map.Entry<T, Map<String, Object>> build(Object data) {
BuilderFactory.SEARCH_PROFILE_PROFILE.build(list.get(1)));
}
}

private static final Gson GSON = new Gson();

private class GsonObjectBuilder<T> extends Builder<T> {

private final Class<T> clazz;
Expand All @@ -4049,7 +4046,7 @@ public GsonObjectBuilder(Class<T> clazz) {

@Override
public T build(Object data) {
return GSON.fromJson(BuilderFactory.STRING.build(data), clazz);
return GsonJson.fromJson(BuilderFactory.STRING.build(data), clazz);
}
}

Expand All @@ -4067,7 +4064,7 @@ public List<T> build(Object data) {
return null;
}
List<String> list = BuilderFactory.STRING_LIST.build(data);
return list.stream().map(s -> GSON.fromJson(s, clazz)).collect(Collectors.toList());
return list.stream().map(s -> GsonJson.fromJson(s, clazz)).collect(Collectors.toList());
}
}

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/redis/clients/jedis/GsonJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package redis.clients.jedis;

import com.google.gson.Gson;

class GsonJson {

private static final Gson GSON = new Gson();

static <T> T fromJson(final String json, final Class<T> classOfT) {
return GSON.fromJson(json, classOfT);
}

static String toJson(final Object src) {
return GSON.toJson(src);
}
}