Server:优化getMaxQueryDepth的判断

TommyLemon · TommyLemon · commit 2d01a5a2cf6c · 2019-04-26T00:39:39.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -636,16 +636,17 @@ public JSONObject onObjectParse(final JSONObject request
 			return null;
 		}
 
+		int type = arrayConfig == null ? 0 : arrayConfig.getType();
+
+		String[] arr = StringUtil.split(parentPath, "/");
 		if (arrayConfig == null || arrayConfig.getPosition() == 0) {
+			queryDepth = arr == null ? 0 : arr.length;
 			int maxQueryDepth = getMaxQueryDepth();
 			if (queryDepth > maxQueryDepth) {
 				throw new IllegalArgumentException(parentPath + "/" + name + ":{} 的深度(或者说层级) 为 " + queryDepth + " 已超限，必须在 0-" + maxQueryDepth + " 内 !");
 			}
-			queryDepth ++;
 		}
 
-		int type = arrayConfig == null ? 0 : arrayConfig.getType();
-
 		ObjectParser op = createObjectParser(request, parentPath, name, arrayConfig, isSubquery).parse();
 
 

Original file line number	Diff line number	Diff line change
`@@ -636,16 +636,17 @@ public JSONObject onObjectParse(final JSONObject request`
`636`	`636`	`return null;`
`637`	`637`	`}`
`638`	`638`
	`639`	`+ int type = arrayConfig == null ? 0 : arrayConfig.getType();`
	`640`	`+`
	`641`	`+ String[] arr = StringUtil.split(parentPath, "/");`
`639`	`642`	`if (arrayConfig == null \|\| arrayConfig.getPosition() == 0) {`
	`643`	`+ queryDepth = arr == null ? 0 : arr.length;`
`640`	`644`	`int maxQueryDepth = getMaxQueryDepth();`
`641`	`645`	`if (queryDepth > maxQueryDepth) {`
`642`	`646`	`throw new IllegalArgumentException(parentPath + "/" + name + ":{} 的深度(或者说层级) 为 " + queryDepth + " 已超限，必须在 0-" + maxQueryDepth + " 内 !");`
`643`	`647`	`}`
`644`		`- queryDepth ++;`
`645`	`648`	`}`
`646`	`649`
`647`		`- int type = arrayConfig == null ? 0 : arrayConfig.getType();`
`648`		`-`
`649`	`650`	`ObjectParser op = createObjectParser(request, parentPath, name, arrayConfig, isSubquery).parse();`
`650`	`651`
`651`	`652`