解决远程函数最多只能加载默认每页数量 10 个

Author: TommyLemon

src/main/java/apijson/framework/APIJSONFunctionParser.java

@@ -26,6 +26,7 @@
 import java.util.*;
 
 import static apijson.JSON.*;
+import static apijson.JSONRequest.KEY_COUNT;
 import static apijson.RequestMethod.*;
 import static apijson.framework.APIJSONConstant.FUNCTION_;
 import static apijson.framework.APIJSONConstant.SCRIPT_;
@@ -179,8 +180,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 				item.put(SCRIPT_, script);
 			}   // Script >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
+			item.put(KEY_COUNT, 0);
 			request.put("[]", item);
-			request.put(apijson.JSONRequest.KEY_COUNT, 0);
 		}   // [] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
@@ -191,24 +192,24 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 
 		//初始化默认脚本引擎,避免增量
 		if (isAll || SCRIPT_EXECUTOR_MAP.get("js") == null) {
-			ScriptExecutor javaScriptExecutor = new JavaScriptExecutor();
+			ScriptExecutor<T, M, L> javaScriptExecutor = new JavaScriptExecutor<>();
 			javaScriptExecutor.init();
 			SCRIPT_EXECUTOR_MAP.put("js", javaScriptExecutor);
 			SCRIPT_EXECUTOR_MAP.put("JavaScript", javaScriptExecutor);
 			SCRIPT_EXECUTOR_MAP.put("javascript", javaScriptExecutor);
 		}
 
 		Map<String, M> scriptMap = new HashMap<>();
-		L scriptList = (L) JSON.get(response, "[]"); // response.getJSONArray(SCRIPT_ + "[]");
+		L scriptList = JSON.get(response, "[]"); // response.getJSONArray(SCRIPT_ + "[]");
 		if (scriptList != null && ! scriptList.isEmpty()) {
 			//if (isAll) {
 			//    SCRIPT_MAP = new LinkedHashMap<>();
 			//}
 			Map<String, M> newMap = new LinkedHashMap<>();
 
 			for (int i = 0; i < scriptList.size(); i++) {
-				M item = (M) JSON.get(scriptList, i);
-				item = item == null ? null : (M) JSON.get(item, SCRIPT_);
+				M item = JSON.get(scriptList, i);
+				item = item == null ? null : JSON.get(item, SCRIPT_);
 				if (item == null) { // 关联查不到很正常
 					continue;
 				}
@@ -267,7 +268,7 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 				// }
 				//脚本语言执行
 				if (SCRIPT_EXECUTOR_MAP.containsKey(language)){
-					ScriptExecutor scriptExecutor = SCRIPT_EXECUTOR_MAP.get(language);
+					ScriptExecutor<T, M, L> scriptExecutor = (ScriptExecutor<T, M, L>) SCRIPT_EXECUTOR_MAP.get(language);
 					M script = scriptMap.get(name);
 					scriptExecutor.load(name, getString(script, "script"));
 				}

src/main/java/apijson/framework/javax/APIJSONFunctionParser.java

@@ -26,6 +26,7 @@
 import java.util.*;
 
 import static apijson.JSON.*;
+import static apijson.JSONRequest.KEY_COUNT;
 import static apijson.RequestMethod.*;
 import static apijson.framework.javax.APIJSONConstant.FUNCTION_;
 import static apijson.framework.javax.APIJSONConstant.SCRIPT_;
@@ -179,8 +180,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 				item.put(SCRIPT_, script);
 			}   // Script >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
+			item.put(KEY_COUNT, 0);
 			request.put("[]", item);
-			request.put(apijson.JSONRequest.KEY_COUNT, 0);
 		}   // [] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
@@ -191,24 +192,24 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 
 		//初始化默认脚本引擎,避免增量
 		if (isAll || SCRIPT_EXECUTOR_MAP.get("js") == null) {
-			ScriptExecutor javaScriptExecutor = new JavaScriptExecutor();
+			ScriptExecutor<T, M, L> javaScriptExecutor = new JavaScriptExecutor<>();
 			javaScriptExecutor.init();
 			SCRIPT_EXECUTOR_MAP.put("js", javaScriptExecutor);
 			SCRIPT_EXECUTOR_MAP.put("JavaScript", javaScriptExecutor);
 			SCRIPT_EXECUTOR_MAP.put("javascript", javaScriptExecutor);
 		}
 
 		Map<String, M> scriptMap = new HashMap<>();
-		L scriptList = (L) JSON.get(response, "[]"); // response.getJSONArray(SCRIPT_ + "[]");
+		L scriptList = JSON.get(response, "[]"); // response.getJSONArray(SCRIPT_ + "[]");
 		if (scriptList != null && ! scriptList.isEmpty()) {
 			//if (isAll) {
 			//    SCRIPT_MAP = new LinkedHashMap<>();
 			//}
 			Map<String, M> newMap = new LinkedHashMap<>();
 
 			for (int i = 0; i < scriptList.size(); i++) {
-				M item = (M) JSON.get(scriptList, i);
-				item = item == null ? null : (M) JSON.get(item, SCRIPT_);
+				M item = JSON.get(scriptList, i);
+				item = item == null ? null : JSON.get(item, SCRIPT_);
 				if (item == null) { // 关联查不到很正常
 					continue;
 				}
@@ -267,7 +268,7 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> M init(
 				// }
 				//脚本语言执行
 				if (SCRIPT_EXECUTOR_MAP.containsKey(language)){
-					ScriptExecutor scriptExecutor = SCRIPT_EXECUTOR_MAP.get(language);
+					ScriptExecutor<T, M, L> scriptExecutor = (ScriptExecutor<T, M, L>) SCRIPT_EXECUTOR_MAP.get(language);
 					M script = scriptMap.get(name);
 					scriptExecutor.load(name, getString(script, "script"));
 				}