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
新增 JSON.format
  • Loading branch information
@TommyLemon
TommyLemon committed Apr 12, 2025
commit 6526493c7e817d1568cb00ee6fba2a75dae62403
16 changes: 13 additions & 3 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 @@ -32,8 +32,8 @@ public JSONArray createJSONArray() {
}

@Override
public String toJSONString(Object obj) {
return JSON.toJSONString(obj);
public String toJSONString(Object obj, boolean format) {
throw new UnsupportedOperationException();
}

@Override
Expand Down Expand Up @@ -178,11 +178,21 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> List<T>
return null;
}

/**
* @param obj
* @return
*/
public static String format(Object obj) {
return toJSONString(obj, true);
}
/**
* @param obj
* @return
*/
public static String toJSONString(Object obj) {
return toJSONString(obj, false);
}
public static String toJSONString(Object obj, boolean format) {
if (obj == null) {
return null;
}
Expand Down Expand Up @@ -235,7 +245,7 @@ public static String toJSONString(Object obj) {
// return sb.toString();
//}

return DEFAULT_JSON_PARSER.toJSONString(obj);
return DEFAULT_JSON_PARSER.toJSONString(obj, format);
}


Expand Down
8 changes: 7 additions & 1 deletion APIJSONORM/src/main/java/apijson/JSONParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@ public interface JSONParser<M extends Map<String, Object>, L extends List<Object

<T> List<T> parseArray(Object json, Class<T> clazz);

String toJSONString(Object obj);
default String format(Object obj) {
return toJSONString(obj, true);
}
default String toJSONString(Object obj) {
return toJSONString(obj, false);
}
String toJSONString(Object obj, boolean format);
}
4 changes: 3 additions & 1 deletion 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 @@ -495,7 +495,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> Object
return invokeScript(parser, methodName, parameterTypes, args, returnType, current, scriptExecutor);
}

Method m = parser.getClass().getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常
Class<? extends AbstractFunctionParser> cls = parser.getClass();
Method m = cls.getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常

if (Log.DEBUG) {
String rt = Log.DEBUG && m.getReturnType() != null ? m.getReturnType().getSimpleName() : null;
Expand Down Expand Up @@ -656,6 +657,7 @@ else if (v instanceof Collection) { // 泛型兼容？ // JSONArray
}
else {
types = new Class<?>[length + 1];
//types[0] = Object.class; // 泛型擦除 JSON.JSON_OBJECT_CLASS;
types[0] = JSON.JSON_OBJECT_CLASS;

values = new Object[length + 1];
Expand Down