新增 JSON.format

TommyLemon · TommyLemon · commit 6526493c7e81 · 2025-04-13T01:28:29.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/JSON.java b/APIJSONORM/src/main/java/apijson/JSON.java
@@ -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
@@ -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;
 		}
@@ -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);
 	}
 
 
diff --git a/APIJSONORM/src/main/java/apijson/JSONParser.java b/APIJSONORM/src/main/java/apijson/JSONParser.java
@@ -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);
 }
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
@@ -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;
@@ -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];

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> Object`
`495`	`495`	`return invokeScript(parser, methodName, parameterTypes, args, returnType, current, scriptExecutor);`
`496`	`496`	`}`
`497`	`497`
`498`		`- Method m = parser.getClass().getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常`
	`498`	`+ Class<? extends AbstractFunctionParser> cls = parser.getClass();`
	`499`	`+ Method m = cls.getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常`
`499`	`500`
`500`	`501`	`if (Log.DEBUG) {`
`501`	`502`	`String rt = Log.DEBUG && m.getReturnType() != null ? m.getReturnType().getSimpleName() : null;`
`@@ -656,6 +657,7 @@ else if (v instanceof Collection) { // 泛型兼容？ // JSONArray`
`656`	`657`	`}`
`657`	`658`	`else {`
`658`	`659`	`types = new Class<?>[length + 1];`
	`660`	`+ //types[0] = Object.class; // 泛型擦除 JSON.JSON_OBJECT_CLASS;`
`659`	`661`	`types[0] = JSON.JSON_OBJECT_CLASS;`
`660`	`662`
`661`	`663`	`values = new Object[length + 1];`