优化 SQL 执行缓存；优化主键泛型；部分常量改为可自定义静态变量；解决高并发下 id 冲突导致新增记录失败等

Author: TommyLemon

APIJSONORM/src/main/java/apijson/RequestMethod.java

@@ -45,6 +45,7 @@ public enum RequestMethod {
 	 */
 	DELETE;
 
+	public static final RequestMethod[] ALL = new RequestMethod[]{ GET, HEAD, GETS, HEADS, POST, PUT, DELETE};
 
 	/**是否为GET请求方法
 	 * @param method

APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java

@@ -178,15 +178,15 @@ public static Object invoke(@NotNull AbstractFunctionParser parser, @NotNull Str
 						+ "\n请检查函数名和参数数量是否与已定义的函数一致！"
 						+ "\n且必须为 function(key0,key1,...) 这种单函数格式！"
 						+ "\nfunction必须符合Java函数命名，key是用于在request内取值的键！"
-						+ "\n调用时不要有空格！");
+						+ "\n调用时不要有空格！" + e.getMessage());
 			}
 			if (e instanceof InvocationTargetException) {
 				Throwable te = ((InvocationTargetException) e).getTargetException();
 				if (StringUtil.isEmpty(te.getMessage(), true) == false) { //到处把函数声明throws Exception改成throws Throwable挺麻烦
 					throw te instanceof Exception ? (Exception) te : new Exception(te.getMessage());
 				}
 				throw new IllegalArgumentException("字符 " + function + " 对应的远程函数传参类型错误！"
-						+ "\n请检查 key:value 中value的类型是否满足已定义的函数 " + getFunction(fb.getMethod(), fb.getKeys()) + " 的要求！");
+						+ "\n请检查 key:value 中value的类型是否满足已定义的函数 " + getFunction(fb.getMethod(), fb.getKeys()) + " 的要求！" + e.getMessage());
 			}
 			throw e;
 		}

APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java

@@ -908,7 +908,7 @@ public JSONObject onSQLExecute() throws Exception {
 						&& (table.equals(arrayTable));
 
 				// 提取并缓存数组主表的列表数据
-				rawList = (List<JSONObject>) result.remove(SQLExecutor.KEY_RAW_LIST);
+				rawList = (List<JSONObject>) result.remove(AbstractSQLExecutor.KEY_RAW_LIST);
 				if (rawList != null) {
 					String arrayPath = parentPath.substring(0, parentPath.lastIndexOf("[]") + 2);
 
@@ -936,7 +936,7 @@ public JSONObject onSQLExecute() throws Exception {
 				parser.putQueryResult(path, result);  // 解决获取关联数据时requestObject里不存在需要的关联数据
 
 				if (isSimpleArray && rawList != null) {
-					result.put(SQLExecutor.KEY_RAW_LIST, rawList);
+					result.put(AbstractSQLExecutor.KEY_RAW_LIST, rawList);
 				}
 			}
 		}

APIJSONORM/src/main/java/apijson/orm/AbstractParser.java

@@ -50,7 +50,7 @@
 /**parser for parsing request to JSONObject
  * @author Lemon
  */
-public abstract class AbstractParser<T> implements Parser<T>, ParserCreator<T>, VerifierCreator<T>, SQLCreator {
+public abstract class AbstractParser<T extends Object> implements Parser<T>, ParserCreator<T>, VerifierCreator<T>, SQLCreator {
 	protected static final String TAG = "AbstractParser";
 
 	/**
@@ -72,6 +72,49 @@ public abstract class AbstractParser<T> implements Parser<T>, ParserCreator<T>,
 	public static boolean IS_PRINT_REQUEST_ENDTIME_LOG = false;
 
 
+	public static int DEFAULT_QUERY_COUNT = 10;
+	public static int MAX_QUERY_PAGE = 100;
+	public static int MAX_QUERY_COUNT = 100;
+	public static int MAX_UPDATE_COUNT = 10;
+	public static int MAX_SQL_COUNT = 200;
+	public static int MAX_OBJECT_COUNT = 5;
+	public static int MAX_ARRAY_COUNT = 5;
+	public static int MAX_QUERY_DEPTH = 5;
+	
+	@Override
+	public int getDefaultQueryCount() {
+		return DEFAULT_QUERY_COUNT;
+	}
+	@Override
+	public int getMaxQueryPage() {
+		return MAX_QUERY_PAGE;
+	}
+	@Override
+	public int getMaxQueryCount() {
+		return MAX_QUERY_COUNT;
+	}
+	@Override
+	public int getMaxUpdateCount() {
+		return MAX_UPDATE_COUNT;
+	}
+	@Override
+	public int getMaxSQLCount() {
+		return MAX_SQL_COUNT;
+	}
+	@Override
+	public int getMaxObjectCount() {
+		return MAX_OBJECT_COUNT;
+	}
+	@Override
+	public int getMaxArrayCount() {
+		return MAX_ARRAY_COUNT;
+	}
+	@Override
+	public int getMaxQueryDepth() {
+		return MAX_QUERY_DEPTH;
+	}
+
+
 	/**
 	 * method = null
 	 */
@@ -1276,7 +1319,7 @@ else if (childKeys.length == 1 && JSONRequest.isTableKey(childKeys[0])) {  // 
 				 */
 				JSONObject fo = i != 0 || arrTableKey == null ? null : parent.getJSONObject(arrTableKey);
 				@SuppressWarnings("unchecked")
-				List<JSONObject> list = fo == null ? null : (List<JSONObject>) fo.remove(SQLExecutor.KEY_RAW_LIST);
+				List<JSONObject> list = fo == null ? null : (List<JSONObject>) fo.remove(AbstractSQLExecutor.KEY_RAW_LIST);
 
 				if (list != null && list.isEmpty() == false) {
 					isExtract = false;
@@ -1629,43 +1672,6 @@ else if (join != null){
 		return joinList;
 	}
 
-
-
-
-	@Override
-	public int getDefaultQueryCount() {
-		return DEFAULT_QUERY_COUNT;
-	}
-	@Override
-	public int getMaxQueryPage() {
-		return MAX_QUERY_PAGE;
-	}
-	@Override
-	public int getMaxQueryCount() {
-		return MAX_QUERY_COUNT;
-	}
-	@Override
-	public int getMaxUpdateCount() {
-		return MAX_UPDATE_COUNT;
-	}
-	@Override
-	public int getMaxSQLCount() {
-		return MAX_SQL_COUNT;
-	}
-	@Override
-	public int getMaxObjectCount() {
-		return MAX_OBJECT_COUNT;
-	}
-	@Override
-	public int getMaxArrayCount() {
-		return MAX_ARRAY_COUNT;
-	}
-	@Override
-	public int getMaxQueryDepth() {
-		return MAX_QUERY_DEPTH;
-	}
-
-
 	/**根据路径取值
 	 * @param parent
 	 * @param pathKeys

APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java

@@ -103,22 +103,21 @@ public abstract class AbstractSQLConfig implements SQLConfig {
 	public static String PREFFIX_DISTINCT = "DISTINCT ";
 
 	// * 和 / 不能同时出现，防止 /* */ 段注释！ # 和 -- 不能出现，防止行注释！ ; 不能出现，防止隔断SQL语句！空格不能出现，防止 CRUD,DROP,SHOW TABLES等语句！
-	private static final Pattern PATTERN_RANGE;
-	private static final Pattern PATTERN_FUNCTION;
+	private static Pattern PATTERN_RANGE;
+	private static Pattern PATTERN_FUNCTION;
 
 	/**
 	 * 表名映射，隐藏真实表名，对安全要求很高的表可以这么做
 	 */
-	public static final Map<String, String> TABLE_KEY_MAP;
-	public static final List<String> CONFIG_TABLE_LIST;
-	public static final List<String> DATABASE_LIST;
+	public static Map<String, String> TABLE_KEY_MAP;
+	public static List<String> CONFIG_TABLE_LIST;
+	public static List<String> DATABASE_LIST;
 
 	// 自定义原始 SQL 片段 Map<key, substring>：当 substring 为 null 时忽略；当 substring 为 "" 时整个 value 是 raw SQL；其它情况则只是 substring 这段为 raw SQL
-	public static final Map<String, String> RAW_MAP;
+	public static Map<String, String> RAW_MAP;
 	// 允许调用的 SQL 函数：当 substring 为 null 时忽略；当 substring 为 "" 时整个 value 是 raw SQL；其它情况则只是 substring 这段为 raw SQL
-	public static final Map<String, String> SQL_AGGREGATE_FUNCTION_MAP;
-	public static final Map<String, String> SQL_FUNCTION_MAP;
-
+	public static Map<String, String> SQL_AGGREGATE_FUNCTION_MAP;
+	public static Map<String, String> SQL_FUNCTION_MAP;
 
 	static {  // 凡是 SQL 边界符、分隔符、注释符 都不允许，例如 ' " ` ( ) ; # -- /**/ ，以免拼接 SQL 时被注入意外可执行指令
 		PATTERN_RANGE = Pattern.compile("^[0-9%,!=\\<\\>/\\.\\+\\-\\*\\^]+$"); // ^[a-zA-Z0-9_*%!=<>(),"]+$ 导致 exists(select*from(Comment)) 通过！
@@ -4339,7 +4338,7 @@ protected void onGetCrossJoinString(Join j) throws UnsupportedOperationException
 	 * @return
 	 * @throws Exception 
 	 */
-	public static SQLConfig newSQLConfig(RequestMethod method, String table, String alias, JSONObject request, List<Join> joinList, boolean isProcedure, Callback callback) throws Exception {
+	public static <T extends Object> SQLConfig newSQLConfig(RequestMethod method, String table, String alias, JSONObject request, List<Join> joinList, boolean isProcedure, Callback<T> callback) throws Exception {
 		if (request == null) { // User:{} 这种空内容在查询时也有效
 			throw new NullPointerException(TAG + ": newSQLConfig  request == null!");
 		}
@@ -4357,7 +4356,7 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
 		String schema = request.getString(KEY_SCHEMA);
 		String datasource = request.getString(KEY_DATASOURCE);
 
-		SQLConfig config = callback.getSQLConfig(method, database, schema, table);
+		SQLConfig config = callback.getSQLConfig(method, database, schema, datasource, table);
 		config.setAlias(alias);
 
 		config.setDatabase(database); //不删，后面表对象还要用的，必须放在 parseJoin 前
@@ -4404,7 +4403,7 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
 
 		Object id = request.get(idKey);
 		if (id == null && method == POST) {
-			id = callback.newId(method, database, schema, table); // null 表示数据库自增 id
+			id = callback.newId(method, database, schema, datasource, table); // null 表示数据库自增 id
 		}
 
 		if (id != null) { //null无效
@@ -4992,7 +4991,7 @@ else if (newHaving != null) {
 	 * @return
 	 * @throws Exception
 	 */
-	public static SQLConfig parseJoin(RequestMethod method, SQLConfig config, List<Join> joinList, Callback callback) throws Exception {
+	public static <T extends Object> SQLConfig parseJoin(RequestMethod method, SQLConfig config, List<Join> joinList, Callback<T> callback) throws Exception {
 		boolean isQuery = RequestMethod.isQueryMethod(method);
 		config.setKeyPrefix(isQuery && config.isMain() == false);
 
@@ -5203,15 +5202,15 @@ else if (key.endsWith("-")) {//缩减，PUT查询时处理
 	}
 
 
-	public static interface IdCallback {
+	public static interface IdCallback<T extends Object> {
 		/**为 post 请求新建 id， 只能是 Long 或 String
 		 * @param method
 		 * @param database
 		 * @param schema
 		 * @param table
 		 * @return
 		 */
-		Object newId(RequestMethod method, String database, String schema, String table);
+		T newId(RequestMethod method, String database, String schema, String datasource, String table);
 
 
 		/**获取主键名
@@ -5231,15 +5230,15 @@ public static interface IdCallback {
 		String getUserIdKey(String database, String schema, String datasource, String table);
 	}
 
-	public static interface Callback extends IdCallback {
+	public static interface Callback<T extends Object> extends IdCallback<T> {
 		/**获取 SQLConfig 的实例
 		 * @param method
 		 * @param database
 		 * @param schema
 		 * @param table
 		 * @return
 		 */
-		SQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table);
+		SQLConfig getSQLConfig(RequestMethod method, String database, String schema, String datasource, String table);
 
 		/**combine 里的 key 在 request 中 value 为 null 或不存在，即 request 中缺少用来作为 combine 条件的 key: value
 		 * @param combine
@@ -5249,12 +5248,23 @@ public static interface Callback extends IdCallback {
 		public void onMissingKey4Combine(String name, JSONObject request, String combine, String item, String key) throws Exception;
 	}
 
-	public static abstract class SimpleCallback implements Callback {
+	public static Long LAST_ID;
+	static {
+		LAST_ID = System.currentTimeMillis();
+	}
 
+	public static abstract class SimpleCallback<T extends Object> implements Callback<T> {
 
+		@SuppressWarnings("unchecked")
 		@Override
-		public Object newId(RequestMethod method, String database, String schema, String table) {
-			return System.currentTimeMillis();
+		public T newId(RequestMethod method, String database, String schema, String datasource, String table) {
+			Long id = System.currentTimeMillis();
+			if (id <= LAST_ID) {
+				id = LAST_ID + 1; // 解决高并发下 id 冲突导致新增记录失败
+			}
+			LAST_ID = id;
+			
+			return (T) id;
 		}
 
 		@Override