全能 CRUD: "@gets": { "User":"" // 空字符串转为与 key 同名值 User }，"@put": { "Moment":{} // 自动加 "tag":"Moment" }，@post:"Comment[]" 自动转为 "@post":{ "Comment[]":"Comment:[]" }

TommyLemon · TommyLemon · commit 790f8c5c1acc · 2023-10-22T22:14:48.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -2190,9 +2190,10 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 				throw new IllegalArgumentException("对象名重复,请添加别名区分 ! 重复对象名为: " + key);
 			}
 
+			boolean isPost = apijson.orm.JSONRequest.KEY_POST.equals(key);
 			// @post、@get 等 RequestMethod
 			try {
-				RequestMethod keyMethod = apijson.orm.JSONRequest.KEY_METHOD_ENUM_MAP.get(key);
+				RequestMethod keyMethod = isPost ? RequestMethod.POST : JSONRequest.KEY_METHOD_ENUM_MAP.get(key);
 				if (keyMethod != null) {
 					// 如果不匹配,异常不处理即可
 					removeTmpKeys.add(key);
@@ -2209,7 +2210,9 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 									if (obj.containsKey(tbl)) {
 										throw new ConflictException(key + ": value 中 " + tbl + " 已经存在，不能重复！");
 									}
-									obj.put(tbl, new JSONObject(true));
+
+									obj.put(tbl, isPost && JSONRequest.isTableArray(tbl)
+											? tbl.substring(0, tbl.length() - 2) + ":[]" : "");
 								}
 							}
 						}
@@ -2234,15 +2237,16 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 						JSONObject objAttrJson = objVal instanceof JSONObject ? obj.getJSONObject(objKey) : null;
 						if (objAttrJson == null) {
 							if (objVal instanceof String) {
-								objAttrMap.put(JSONRequest.KEY_TAG, objVal);
+								objAttrMap.put(JSONRequest.KEY_TAG, "".equals(objVal) ? objKey : objVal);
 							}
 							else {
 								throw new IllegalArgumentException(key + ": { " + objKey + ": value 中 value 类型错误，只能是 String 或 JSONObject {} ！");
 							}
 						}
 						else {
-							Set<Entry<String, Object>> objSet = objAttrJson == null ? new HashSet<>() : objAttrJson.entrySet();
+							Set<Entry<String, Object>> objSet = objAttrJson.entrySet();
 
+							boolean hasTag = false;
 							for (Entry<String, Object> entry : objSet) {
 								String objAttrKey = entry == null ? null : entry.getKey();
 								if (objAttrKey == null) {
@@ -2255,13 +2259,21 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 									case apijson.JSONObject.KEY_DATABASE:
 									case JSONRequest.KEY_VERSION:
 									case apijson.JSONObject.KEY_ROLE:
+										objAttrMap.put(objAttrKey, entry.getValue());
+										break;
 									case JSONRequest.KEY_TAG:
+										hasTag = true;
 										objAttrMap.put(objAttrKey, entry.getValue());
 										break;
 									default:
 										break;
 								}
 							}
+
+							if (hasTag == false) {
+								objAttrMap.put(JSONRequest.KEY_TAG, isPost && JSONRequest.isTableArray(objKey)
+										? objKey.substring(0, objKey.length() - 2) + ":[]" : objKey);
+							}
 						}
 					}
 					continue;
@@ -2376,7 +2388,7 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
-				throw new Exception(e);
+				throw new Exception(e); // 包装一层只是为了打印日志？看起来没必要
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -2190,9 +2190,10 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,`
`2190`	`2190`	`throw new IllegalArgumentException("对象名重复,请添加别名区分 ! 重复对象名为: " + key);`
`2191`	`2191`	`}`
`2192`	`2192`
	`2193`	`+ boolean isPost = apijson.orm.JSONRequest.KEY_POST.equals(key);`
`2193`	`2194`	`// @post、@get 等 RequestMethod`
`2194`	`2195`	`try {`
`2195`		`- RequestMethod keyMethod = apijson.orm.JSONRequest.KEY_METHOD_ENUM_MAP.get(key);`
	`2196`	`+ RequestMethod keyMethod = isPost ? RequestMethod.POST : JSONRequest.KEY_METHOD_ENUM_MAP.get(key);`
`2196`	`2197`	`if (keyMethod != null) {`
`2197`	`2198`	`// 如果不匹配,异常不处理即可`
`2198`	`2199`	`removeTmpKeys.add(key);`
`@@ -2209,7 +2210,9 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,`
`2209`	`2210`	`if (obj.containsKey(tbl)) {`
`2210`	`2211`	`throw new ConflictException(key + ": value 中 " + tbl + " 已经存在，不能重复！");`
`2211`	`2212`	`}`
`2212`		`- obj.put(tbl, new JSONObject(true));`
	`2213`	`+`
	`2214`	`+ obj.put(tbl, isPost && JSONRequest.isTableArray(tbl)`
	`2215`	`+ ? tbl.substring(0, tbl.length() - 2) + ":[]" : "");`
`2213`	`2216`	`}`
`2214`	`2217`	`}`
`2215`	`2218`	`}`
`@@ -2234,15 +2237,16 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,`
`2234`	`2237`	`JSONObject objAttrJson = objVal instanceof JSONObject ? obj.getJSONObject(objKey) : null;`
`2235`	`2238`	`if (objAttrJson == null) {`
`2236`	`2239`	`if (objVal instanceof String) {`
`2237`		`- objAttrMap.put(JSONRequest.KEY_TAG, objVal);`
	`2240`	`+ objAttrMap.put(JSONRequest.KEY_TAG, "".equals(objVal) ? objKey : objVal);`
`2238`	`2241`	`}`
`2239`	`2242`	`else {`
`2240`	`2243`	`throw new IllegalArgumentException(key + ": { " + objKey + ": value 中 value 类型错误，只能是 String 或 JSONObject {} ！");`
`2241`	`2244`	`}`
`2242`	`2245`	`}`
`2243`	`2246`	`else {`
`2244`		`- Set<Entry<String, Object>> objSet = objAttrJson == null ? new HashSet<>() : objAttrJson.entrySet();`
	`2247`	`+ Set<Entry<String, Object>> objSet = objAttrJson.entrySet();`
`2245`	`2248`
	`2249`	`+ boolean hasTag = false;`
`2246`	`2250`	`for (Entry<String, Object> entry : objSet) {`
`2247`	`2251`	`String objAttrKey = entry == null ? null : entry.getKey();`
`2248`	`2252`	`if (objAttrKey == null) {`
`@@ -2255,13 +2259,21 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,`
`2255`	`2259`	`case apijson.JSONObject.KEY_DATABASE:`
`2256`	`2260`	`case JSONRequest.KEY_VERSION:`
`2257`	`2261`	`case apijson.JSONObject.KEY_ROLE:`
	`2262`	`+ objAttrMap.put(objAttrKey, entry.getValue());`
	`2263`	`+ break;`
`2258`	`2264`	`case JSONRequest.KEY_TAG:`
	`2265`	`+ hasTag = true;`
`2259`	`2266`	`objAttrMap.put(objAttrKey, entry.getValue());`
`2260`	`2267`	`break;`
`2261`	`2268`	`default:`
`2262`	`2269`	`break;`
`2263`	`2270`	`}`
`2264`	`2271`	`}`
	`2272`	`+`
	`2273`	`+ if (hasTag == false) {`
	`2274`	`+ objAttrMap.put(JSONRequest.KEY_TAG, isPost && JSONRequest.isTableArray(objKey)`
	`2275`	`+ ? objKey.substring(0, objKey.length() - 2) + ":[]" : objKey);`
	`2276`	`+ }`
`2265`	`2277`	`}`
`2266`	`2278`	`}`
`2267`	`2279`	`continue;`
`@@ -2376,7 +2388,7 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,`
`2376`	`2388`	`}`
`2377`	`2389`	`} catch (Exception e) {`
`2378`	`2390`	`e.printStackTrace();`
`2379`		`- throw new Exception(e);`
	`2391`	`+ throw new Exception(e); // 包装一层只是为了打印日志？看起来没必要`
`2380`	`2392`	`}`
`2381`	`2393`	`}`
`2382`	`2394`