Visitar URL original
去除 fastjson 并支持各种 JSON 库 by TommyLemon · Pull Request #810 · APIJSON/APIJSON · GitHub
Skip to content

去除 fastjson 并支持各种 JSON 库 #810

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
TommyLemon merged 10 commits into from
Apr 12, 2025
Merged

去除 fastjson 并支持各种 JSON 库 #810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6712e96
去除 fastjson，JSONObject 用 M extends Map<String, Object> 替代，JSONArray 用…
TommyLemon Mar 29, 2025
7ef7b26
完善 JSON 处理，所有流程类都实现默认 JSON 的序列化和反序列化
TommyLemon Mar 30, 2025
ae023cb
所有流程类都统一JSON 的序列化和反序列化，避免转换报错 cannot cast apijson.JSONObject to com.a…
TommyLemon Mar 30, 2025
f11c3a1
解决未返回列表、对象内返回 @RAW@LIST、JSON 键值对未保持写入顺序等
TommyLemon Mar 30, 2025
e5001aa
解决 JOIN 报错 JSON 转换类型不匹配
TommyLemon Mar 30, 2025
aa35bf6
解决 远程函数 报错 JSON 转换类型不匹配
TommyLemon Mar 30, 2025
42ca342
完善和优化 JSON 处理，解决 fastjson 等 JSON 库自动序列化 AbstractSQLConfig.getSetStrin…
TommyLemon Apr 6, 2025
01d31b5
优化日志和注释
TommyLemon Apr 6, 2025
1662e21
解决 fastjson 等 JSON 库可能泄漏 Subquery 及包含的 SQLConfig 等信息
TommyLemon Apr 6, 2025
6526493
新增 JSON.format
TommyLemon Apr 12, 2025
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
Prev Previous commit
Next Next commit
解决 远程函数 报错 JSON 转换类型不匹配
  • Loading branch information
@TommyLemon
TommyLemon committed Mar 30, 2025
commit aa35bf6aa755287c6659e7f178578586497d702f
3 changes: 3 additions & 0 deletions APIJSONORM/src/main/java/apijson/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
* @author Lemon
*/
public class JSON {
public static Class<?> JSON_OBJECT_CLASS = JSONObject.class;
public static Class<?> JSON_ARRAY_CLASS = JSONArray.class;

static final String TAG = "JSON";

public static JSONParser<? extends Map<String, Object>, ? extends List<Object>> DEFAULT_JSON_PARSER = new JSONParser<JSONObject, JSONArray>() {
Expand Down
14 changes: 7 additions & 7 deletions APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public <T extends Object> List<T> getArgList(String path) {
*/
public <T extends Object> List<T> getArgList(String path, Class<T> clazz) {
String s = getArgStr(path);
return JSON.parseArray(s, clazz, (JSONParser<? extends Map<String, Object>, List<Object>>) this);
return JSON.parseArray(s, clazz);
}

/**根据路径取值
Expand Down Expand Up @@ -349,13 +349,13 @@ public static <T extends Object> T getArgValue(Map<String, Object> obj, String p
if (v instanceof Map) {
return (T) v;
}
return (T) JSON.parseObject(JSON.toJSONString(v));
return (T) JSON.parseObject(v);
}
if (List.class.isAssignableFrom(clazz)) {
if (v instanceof List) {
return (T) v;
}
return (T) JSON.parseArray(JSON.toJSONString(v));
return (T) JSON.parseArray(v);
}
// Fallback to string conversion
return (T) v;
Expand Down Expand Up @@ -386,7 +386,7 @@ public Object invoke(@NotNull String function, @NotNull M current, boolean conta
throw new IllegalArgumentException("字符 " + function + " 不合法！");
}

return invoke(this, function, (JSONObject) current, containRaw);
return invoke(this, function, current, containRaw);
}

/**反射调用
Expand Down Expand Up @@ -657,7 +657,7 @@ else if (v instanceof Collection) { // 泛型兼容？ // JSONArray
}
else {
types = new Class<?>[length + 1];
types[0] = JSONObject.class;
types[0] = JSON.JSON_OBJECT_CLASS;

values = new Object[length + 1];
values[0] = request;
Expand Down Expand Up @@ -940,13 +940,13 @@ public <V> V getArgVal(String key, Class<V> clazz, boolean defaultValue) throws
if (obj instanceof Map) {
return (V) obj;
}
return (V) JSON.parseObject(JSON.toJSONString(obj));
return (V) JSON.parseObject(obj);
}
if (List.class.isAssignableFrom(clazz)) {
if (obj instanceof List) {
return (V) obj;
}
return (V) JSON.parseArray(JSON.toJSONString(obj));
return (V) JSON.parseArray(obj);
}
// Fallback to string conversion
return (V) obj;
Expand Down