解决误用 apijson.framework.APIJSONCreator，解决反序列化自定义 List<T> 报错 TypeToken 中泛型未明确类型

Author: TommyLemon

src/main/java/apijson/gson/APIJSONApplication.java

@@ -15,8 +15,10 @@
 package apijson.gson;
 
 import apijson.NotNull;
-import apijson.framework.APIJSONCreator;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import com.google.gson.Gson;
@@ -35,15 +37,20 @@ public class APIJSONApplication extends apijson.framework.APIJSONApplication {
     public static TypeToken<?> JSON_ARRAY_TOKEN;
     public static Class<?> JSON_ARRAY_CLASS;
     static {
-        JSON_OBJECT_TOKEN = new TypeToken<Map<String, Object>>(){};
+        APIJSONParser.IS_RETURN_STACK_TRACE = false;
+
+        GSON = new Gson();
+
+        JSON_OBJECT_TOKEN = new TypeToken<LinkedHashMap<String, Object>>(){};
         JSON_OBJECT_CLASS = JSON_OBJECT_TOKEN.getRawType();
 
-        JSON_ARRAY_TOKEN = new TypeToken<List<Object>>(){};
+        JSON_ARRAY_TOKEN = new TypeToken<ArrayList<Object>>(){};
         JSON_ARRAY_CLASS = JSON_ARRAY_TOKEN.getRawType();
 
-        GSON = apijson.gson.APIJSONApplication.GSON;
         // apijson.JSON.DEFAULT_JSON_PARSER = JSON.DEFAULT_JSON_PARSER; // 解决 DEFAULT_JSON_PARSER 初始化前就自测导致抛异常
 
+        DEFAULT_APIJSON_CREATOR = new APIJSONCreator<>();
+
         JSON.DEFAULT_JSON_PARSER = new JSONParser() {
             @Override
             public Map<String, Object> createJSONObject() {
@@ -94,7 +101,22 @@ public List<Object> parseArray(Object json) {
 
             @Override
             public <T> List<T> parseArray(Object json, Class<T> clazz) {
-                return GSON.fromJson(toJSONString(json), new TypeToken<List<T>>(){}.getType());
+                List<Object> list = parseArray(json);
+                if (list == null) {
+                    return null;
+                }
+
+                List<T> list2 = new ArrayList<>();
+                for (int i = 0; i < list.size(); i++) {
+                    Object obj = list.get(i);
+                    if (obj != null && clazz != null && ! clazz.isAssignableFrom(obj.getClass())) {
+                        String str = toJSONString(obj);
+                        obj = clazz.isAssignableFrom(String.class) ? str : GSON.fromJson(str, clazz);
+                    }
+                    list2.add((T) obj);
+                }
+
+                return list2;
             }
         };
     }
@@ -124,8 +146,7 @@ public static void init(boolean shutdownWhenServerError) throws Exception {
      * @return
      * @throws Exception
      */
-    public static <T, M extends Map<String, Object>, L extends List<Object>> void init(
-            @NotNull APIJSONCreator<T, M, L> creator) throws Exception {
+    public static <T> void init(@NotNull APIJSONCreator<T> creator) throws Exception {
         init(true, creator);
     }
     /**初始化，加载所有配置并校验
@@ -134,8 +155,7 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> void in
      * @return
      * @throws Exception
      */
-    public static <T, M extends Map<String, Object>, L extends List<Object>> void init(
-            boolean shutdownWhenServerError, @NotNull APIJSONCreator<T, M, L> creator) throws Exception {
+    public static <T> void init(boolean shutdownWhenServerError, @NotNull APIJSONCreator<T> creator) throws Exception {
         apijson.framework.APIJSONApplication.init(shutdownWhenServerError, creator);
     }
 

src/main/java/apijson/gson/APIJSONParser.java

@@ -99,9 +99,9 @@ public APIJSONFunctionParser<T> getFunctionParser() {
 	public APIJSONObjectParser<T> createObjectParser(Map<String, Object> request, String parentPath
 			, SQLConfig<T, Map<String, Object>, List<Object>> arrayConfig
 			, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
-		return (APIJSONObjectParser<T>) super.createObjectParser(
-				request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable
-		);
+		return new APIJSONObjectParser<T>(
+				this.getSession(), request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable
+		) {}.setMethod(this.getMethod()).setParser(this);
 	}
 
 	public static Map<String, Object> parseRequest(String request) {
@@ -114,4 +114,11 @@ public static Map<String, Object> parseRequest(String request) {
 		}
 	}
 
+	// 没用，提前打日志已经序列化了
+	//@Override
+	//public Map<String, Object> parseResponse(Map<String, Object> request) {
+	//	Map<String, Object> response = super.parseResponse(request);
+	//	response.remove("trace:stack");  // FIXME 暂时先这样避免 gson 序列化报错，考虑后续提前转成 JSON Object
+	//	return response;
+	//}
 }

src/main/java/apijson/gson/APIJSONSQLConfig.java

@@ -69,9 +69,10 @@ public APIJSONSQLConfig(RequestMethod method, int count, int page) {
 	//		, Map<String, Object>, List<Object>>> joinList, boolean isProcedure) throws Exception {
 	//	return newSQLConfig(method, table, alias, request, joinList, isProcedure, new SimpleCallback<T>() {});
 	//}
-	public static <T> SQLConfig<T, Map<String, Object>, List<Object>> newSQLConfig(
+	public static <T> SQLConfig<T, Map<String, Object>, List<Object>> newSQLConfig2(
 			RequestMethod method, String table, String alias
-			, LinkedHashMap<String, Object> request, List<Join<T, Map<String, Object>, List<Object>>> joinList, boolean isProcedure) throws Exception {
+			, Map<String, Object> request, List<Join<T, Map<String, Object>, List<Object>>> joinList, boolean isProcedure
+	) throws Exception {
 		return newSQLConfig(method, table, alias, request, joinList, isProcedure, new SimpleCallback<T>() {});
 	}