升级 APIJSON 8，移除 fastjson

Author: TommyLemon

README.md

@@ -76,7 +76,7 @@ https://github.com/APIJSON/APIJSON-Demo/blob/master/APIJSON-Java-Server/APIJSONB
 ```java
 @RestController
 @RequestMapping("")
-public class DemoController extends APIJSONRouterController<Long> { 
+public class DemoController extends APIJSONRouterController<Long, JSONObject, JSONArray> { 
 }
 ```
 ![image](https://user-images.githubusercontent.com/5738175/167263296-3bfd8782-c163-4461-bbed-f264be529e76.png)

pom.xml

@@ -35,23 +35,17 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.83</version>
-		</dependency>
-
 		<!-- 可使用 libs 目录的 apijson-orm.jar 来替代，两种方式二选一 -->
-		<dependency>
-			<groupId>com.github.Tencent</groupId>
-			<artifactId>APIJSON</artifactId>
-			<version>7.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.APIJSON</groupId>
-			<artifactId>apijson-framework</artifactId>
-			<version>7.1.7</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.github.Tencent</groupId>-->
+<!--			<artifactId>APIJSON</artifactId>-->
+<!--			<version>8.0.0.0.0</version>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>com.github.APIJSON</groupId>-->
+<!--			<artifactId>apijson-framework</artifactId>-->
+<!--			<version>7.2.0.0</version>-->
+<!--		</dependency>-->
 	</dependencies>
 
 	<build>

src/main/java/apijson/router/APIJSONRouterApplication.java

@@ -18,6 +18,9 @@
 import apijson.framework.APIJSONApplication;
 import apijson.framework.APIJSONCreator;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**启动入口 Application 基类
  * 右键这个类 > Run As > Java Application
@@ -46,7 +49,8 @@ public static void init(boolean shutdownWhenServerError) throws Exception {
 	 * @return 
 	 * @throws Exception
 	 */
-	public static <T extends Object> void init(@NotNull APIJSONCreator<T> creator) throws Exception {
+	public static <T, M extends Map<String, Object>, L extends List<Object>> void init(
+			@NotNull APIJSONCreator<T, M, L> creator) throws Exception {
 		init(true, creator);
 	}
 	/**初始化，加载所有配置并校验
@@ -55,7 +59,8 @@ public static <T extends Object> void init(@NotNull APIJSONCreator<T> creator) t
 	 * @return 
 	 * @throws Exception
 	 */
-	public static <T extends Object> void init(boolean shutdownWhenServerError, @NotNull APIJSONCreator<T> creator) 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 {
 		//	避免多个插件重复调用这句	APIJSONApplication.init(shutdownWhenServerError, creator);
 		System.out.println("\n\n\n\n\n<<<<<<<<<<<<<<<<<<<<<<<<< APIJSON Router 开始启动 >>>>>>>>>>>>>>>>>>>>>>>>\n");
 

src/main/java/apijson/router/APIJSONRouterController.java

@@ -14,21 +14,16 @@
 
 package apijson.router;
 
+import static apijson.JSON.getJSONObject;
+import static apijson.JSON.getString;
 import static apijson.RequestMethod.GET;
 import static apijson.framework.APIJSONConstant.METHODS;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 import jakarta.servlet.http.HttpSession;
 
-import com.alibaba.fastjson.JSONObject;
-
 import apijson.JSON;
 import apijson.JSONRequest;
 import apijson.Log;
@@ -47,7 +42,8 @@
 /**APIJSON router controller，建议在子项目被 @RestController 注解的类继承它或通过它的实例调用相关方法
  * @author Lemon
  */
-public class APIJSONRouterController<T extends Object> extends APIJSONController<T> {
+public class APIJSONRouterController<T, M extends Map<String, Object>, L extends List<Object>>
+		extends APIJSONController<T, M, L> {
 	public static final String TAG = "APIJSONRouterController";
 
 	//通用接口，非事务型操作 和 简单事务型操作 都可通过这些接口自动化实现<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -74,44 +70,65 @@ public String router(String method, String tag, Map<String, String> params, Stri
 	 * @return
 	 */
 	public String router(String method, String tag, Map<String, String> params, String request, HttpSession session, boolean compatCommonAPI) {
+		RequestMethod requestMethod = null;
+		try {
+			 requestMethod = RequestMethod.valueOf(method.toUpperCase());
+		} catch (Throwable e) {
+			// 下方 METHODS.contains(method) 会抛异常
+		}
+		Parser<T, M, L> parser = newParser(session, requestMethod);
+
 		if (METHODS.contains(method) == false) {
-			return APIJSONParser.newErrorResult(new IllegalArgumentException("URL 路径 /{method}/{tag} 中 method 值 " + method
-					+ " 错误！只允许 " + METHODS + " 中的一个！")).toJSONString();
+			return JSON.toJSONString(
+					parser.newErrorResult(
+							new IllegalArgumentException("URL 路径 /{method}/{tag} 中 method 值 "
+									+ method + " 错误！只允许 " + METHODS + " 中的一个！"
+							)
+					)
+			);
 		}
-		
+
 		String t = compatCommonAPI && tag != null && tag.endsWith("[]") ? tag.substring(0, tag.length() - 2) : tag;
 		if (StringUtil.isName(t) == false) {
-			return APIJSONParser.newErrorResult(new IllegalArgumentException("URL 路径 /" + method + "/{tag} 的 tag 中 " + t
-					+ " 错误！tag 不能为空，且只允许变量命名格式！")).toJSONString();
+			return JSON.toJSONString(
+					parser.newErrorResult(
+							new IllegalArgumentException("URL 路径 /" + method + "/{tag} 的 tag 中 "
+									+ t + " 错误！tag 不能为空，且只允许变量命名格式！"
+							)
+					)
+			);
 		}
 
 		String versionStr = params == null ? null : params.remove(APIJSONConstant.VERSION);
 		Integer version;
 		try {
 			version = StringUtil.isEmpty(versionStr, false) ? null : Integer.valueOf(versionStr);
-		} 
+		}
 		catch (Exception e) {
-			return APIJSONParser.newErrorResult(new IllegalArgumentException("URL 路径 /" + method
-					+ "/" + tag + "?version=value 中 value 值 " + versionStr + " 错误！必须符合整数格式！")).toJSONString();
+			return JSON.toJSONString(
+					parser.newErrorResult(new IllegalArgumentException("URL 路径 /" + method + "/"
+							+ tag + "?version=value 中 value 值 " + versionStr + " 错误！必须符合整数格式！")
+					)
+			);
 		}
 
 		if (version == null) {
 			version = 0;
 		}
 
 		try {
-			// 从 Document 查这样的接口		
+			// 从 Document 查这样的接口
 			String cacheKey = AbstractVerifier.getCacheKeyForRequest(method, tag);
-			SortedMap<Integer, JSONObject> versionedMap = APIJSONRouterVerifier.DOCUMENT_MAP.get(cacheKey);
+			SortedMap<Integer, Map<String, Object>> versionedMap = APIJSONRouterVerifier.DOCUMENT_MAP.get(cacheKey);
 
-			JSONObject result = versionedMap == null ? null : versionedMap.get(version);
+			Map<String, Object> result = versionedMap == null ? null : versionedMap.get(version);
 			if (result == null) {  // version <= 0 时使用最新，version > 0 时使用 > version 的最接近版本（最小版本）
-				Set<Entry<Integer, JSONObject>> set = versionedMap == null ? null : versionedMap.entrySet();
+				Set<Entry<Integer, Map<String, Object>>> set = versionedMap == null ? null : versionedMap.entrySet();
 
 				if (set != null && set.isEmpty() == false) {
-					Entry<Integer, JSONObject> maxEntry = null;
+					Entry<Integer, Map<String, Object>> maxEntry = null;
 
-					for (Entry<Integer, JSONObject> entry : set) {
+					for (Entry<Integer, Map<String, Object>> entry : set) {
 						if (entry == null || entry.getKey() == null || entry.getValue() == null) {
 							continue;
 						}
@@ -144,11 +161,11 @@ public String router(String method, String tag, Map<String, String> params, Stri
 			}
 
 			@SuppressWarnings("unchecked")
-			APIJSONCreator<T> creator = (APIJSONCreator<T>) APIJSONParser.APIJSON_CREATOR;
+			APIJSONCreator<T, M, L> creator = (APIJSONCreator<T, M, L>) APIJSONParser.APIJSON_CREATOR;
 			if (result == null && Log.DEBUG && APIJSONRouterVerifier.DOCUMENT_MAP.isEmpty()) {
 
 				//获取指定的JSON结构 <<<<<<<<<<<<<<
-				SQLConfig config = creator.createSQLConfig().setMethod(GET).setTable(APIJSONConstant.DOCUMENT_);
+				SQLConfig<T, M, L> config = creator.createSQLConfig().setMethod(GET).setTable(APIJSONConstant.DOCUMENT_);
 				config.setPrepared(false);
 				config.setColumn(Arrays.asList("request,apijson"));
 
@@ -171,7 +188,7 @@ public String router(String method, String tag, Map<String, String> params, Stri
 				//			DOCUMENT_MAP.put(cacheKey, versionedMap);
 			}
 
-			String apijson = result == null ? null : result.getString("apijson");
+			String apijson = result == null ? null : getString(result, "apijson");
 			if (StringUtil.isEmpty(apijson, true)) {  //
 				if (compatCommonAPI) {
 					return crudByTag(method, tag, params, request, session);
@@ -181,37 +198,31 @@ public String router(String method, String tag, Map<String, String> params, Stri
 						+ "/" + tag + (versionStr == null ? "" : "?version=" + versionStr) + " 对应的接口不存在！");
 			}
 
-			JSONObject rawReq = JSON.parseObject(request);
+			M rawReq = JSON.parseObject(request);
 			if (rawReq == null) {
-				rawReq = new JSONObject(true);
+				rawReq = JSON.createJSONObject();
 			}
 			if (params != null && params.isEmpty() == false) {
 				rawReq.putAll(params);
 			}
 
-			RequestMethod requestMethod = RequestMethod.valueOf(method.toUpperCase());
-			Parser<T> parser = newParser(session, requestMethod);
-
 			if (parser.isNeedVerifyContent()) {
-				Verifier<T> verifier = creator.createVerifier();
+				Verifier<T, M, L> verifier = creator.createVerifier();
 
 				//获取指定的JSON结构 <<<<<<<<<<<<
-				JSONObject object;
-				object = parser.getStructure("Request", method.toUpperCase(), tag, version);
-				if (object == null) { //empty表示随意操作  || object.isEmpty()) {
+				Map<String, Object> target = parser.getStructure("Request", method.toUpperCase(), tag, version);
+				if (target == null) { //empty表示随意操作  || object.isEmpty()) {
 					throw new UnsupportedOperationException("找不到 version: " + version + ", method: " + method.toUpperCase() + ", tag: " + tag + " 对应的 structure ！"
 							+ "非开放请求必须是后端 Request 表中校验规则允许的操作！如果需要则在 Request 表中新增配置！");
 				}
 
-				JSONObject target = object;
-
-				//JSONObject clone 浅拷贝没用，Structure.parse 会导致 structure 里面被清空，第二次从缓存里取到的就是 {}
-				verifier.verifyRequest(requestMethod, "", target, rawReq, 0, null, null, creator);
+				//M clone 浅拷贝没用，Structure.parse 会导致 structure 里面被清空，第二次从缓存里取到的就是 {}
+				verifier.verifyRequest(requestMethod, "", JSON.createJSONObject(target), rawReq, 0, null, null, creator);
 			}
 
-			JSONObject apijsonReq = JSON.parseObject(apijson);
+			M apijsonReq = JSON.parseObject(apijson);
 			if (apijsonReq == null) {
-				apijsonReq = new JSONObject(true);
+				apijsonReq = JSON.createJSONObject();
 			}
 
 			Set<Entry<String, Object>> rawSet = rawReq.entrySet();
@@ -225,11 +236,11 @@ public String router(String method, String tag, Map<String, String> params, Stri
 					String[] pathKeys = key.split("\\.");
 					//逐层到达child的直接容器JSONObject parent
 					int last = pathKeys.length - 1;
-					JSONObject parent = apijsonReq;
+					M parent = apijsonReq;
 					for (int i = 0; i < last; i++) {//一步一步到达指定位置
-						JSONObject p = parent.getJSONObject(pathKeys[i]);
+						M p = getJSONObject(parent, pathKeys[i]);
 						if (p == null) {
-							p = new JSONObject(true);
+							p = JSON.createJSONObject();
 							parent.put(key, p);
 						}
 						parent = p;
@@ -244,7 +255,7 @@ public String router(String method, String tag, Map<String, String> params, Stri
 			return parser.setNeedVerifyContent(false).parse(apijsonReq);
 		}
 		catch (Exception e) {
-			return APIJSONParser.newErrorResult(e).toJSONString();
+			return JSON.toJSONString(parser.newErrorResult(e));
 		}
 	}