SQLConfig 和 SQLExecutor 也指定主键泛型

Author: TommyLemon

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

@@ -62,6 +62,17 @@ public AbstractFunctionParser(RequestMethod method, String tag, int version, @No
 		setRequest(request);
 	}
 
+	private Parser<?> parser;
+	@Override
+	public Parser<?> getParser() {
+		return parser;
+	}
+	@Override
+	public AbstractFunctionParser setParser(Parser<?> parser) {
+		this.parser = parser;
+		return this;
+	}
+
 	@Override
 	public RequestMethod getMethod() {
 		return method;

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

@@ -344,6 +344,7 @@ public AbstractParser<T> setNeedVerifyContent(boolean needVerifyContent) {
 	public SQLExecutor getSQLExecutor() {
 		if (sqlExecutor == null) {
 			sqlExecutor = createSQLExecutor();
+			sqlExecutor.setParser(this);
 		}
 		return sqlExecutor;
 	}

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

@@ -79,7 +79,7 @@
 /**config sql for JSON Request
  * @author Lemon
  */
-public abstract class AbstractSQLConfig implements SQLConfig {
+public abstract class AbstractSQLConfig<T extends Object> implements SQLConfig<T> {
 	private static final String TAG = "AbstractSQLConfig";
 
 	/**

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

@@ -46,11 +46,22 @@
 /**executor for query(read) or update(write) MySQL database
  * @author Lemon
  */
-public abstract class AbstractSQLExecutor implements SQLExecutor {
+public abstract class AbstractSQLExecutor<T extends Object> implements SQLExecutor<T> {
 	private static final String TAG = "AbstractSQLExecutor";
 
 	public static String KEY_RAW_LIST = "@RAW@LIST";  // 避免和字段命名冲突，不用 $RAW@LIST$ 是因为 $ 会在 fastjson 内部转义，浪费性能
 
+	private Parser<T> parser;
+	@Override
+	public Parser<T> getParser() {
+		return parser;
+	}
+	@Override
+	public AbstractSQLExecutor setParser(Parser<T> parser) {
+		this.parser = parser;
+		return this;
+	}
+
 	private int generatedSQLCount = 0;
 	private int cachedSQLCount = 0;
 	private int executedSQLCount = 0;
@@ -1195,7 +1206,7 @@ public void setTransactionIsolation(int transactionIsolation) {
 	@Override
 	public void begin(int transactionIsolation) throws SQLException {
 		Log.d("\n\n" + TAG, "<<<<<<<<<<<<<< TRANSACTION begin transactionIsolation = " + transactionIsolation + " >>>>>>>>>>>>>>>>>>>>>>> \n\n");
-		//不做判断，如果掩盖了问题，调用层都不知道为啥事务没有提交成功
+		// 不做判断，如果掩盖了问题，调用层都不知道为啥事务没有提交成功
 		//		if (connection == null || connection.isClosed()) {
 		//			return;
 		//		}

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

@@ -19,6 +19,10 @@ public interface FunctionParser {
 	Object invoke(@NotNull String function, @NotNull JSONObject currentObject) throws Exception;
 	Object invoke(@NotNull String function, @NotNull JSONObject currentObject, boolean containRaw) throws Exception;
 
+	Parser<?> getParser();
+
+	AbstractFunctionParser setParser(Parser<?> parser);
+
 	RequestMethod getMethod();
 	FunctionParser setMethod(RequestMethod method);
 

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

@@ -15,7 +15,7 @@
 /**SQL配置
  * @author Lemon
  */
-public interface SQLConfig {
+public interface SQLConfig<T extends Object> {
 
 	String DATABASE_MYSQL = "MYSQL"; // https://www.mysql.com
 	String DATABASE_POSTGRESQL = "POSTGRESQL"; // https://www.postgresql.org
@@ -48,9 +48,9 @@ public interface SQLConfig {
 	int TYPE_ITEM = 1;
 	int TYPE_ITEM_CHILD_0 = 2;
 
-	Parser<?> getParser();
+	Parser<T> getParser();
 
-	AbstractSQLConfig setParser(Parser<?> parser);
+	AbstractSQLConfig setParser(Parser<T> parser);
 
 	ObjectParser getObjectParser();
 
@@ -345,9 +345,9 @@ default int[] getDBVersionNums() {
 
 
 	List<Object> getWithAsExprPreparedValueList();
-	void setWithAsExprPreparedValueList(List<Object> withAsExprePreparedValueList);
+	SQLConfig setWithAsExprPreparedValueList(List<Object> withAsExprePreparedValueList);
 
 	boolean isFakeDelete();
-	
-	void onFakeDelete(Map<String, Object> map);
+
+	Map<String, Object> onFakeDelete(Map<String, Object> map);
 }

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

@@ -20,7 +20,9 @@
 /**executor for query(read) or update(write) MySQL database
  * @author Lemon
  */
-public interface SQLExecutor {
+public interface SQLExecutor<T extends Object> {
+	Parser<T> getParser();
+	SQLExecutor setParser(Parser<T> parser);
 
 	/**保存缓存
 	 * @param sql