Merge pull request Tencent#225 from gdjs2/master

TommyLemon · web-flow · commit c40b48c78b63 · 2021-04-25T20:09:16.000+08:00
Format the code &amp; Replace the Long(String) by Long.valueOf(String)
diff --git a/APIJSONORM/src/main/java/apijson/JSONResponse.java b/APIJSONORM/src/main/java/apijson/JSONResponse.java
@@ -505,16 +505,12 @@ public static String formatColon(@NotNull String key) {
 	public static String formatHyphen(@NotNull String key, boolean firstCase) {
 		String name = "";
 
-        StringTokenizer parts = new StringTokenizer(key, "-");
-        name += parts.nextToken();
-        while(parts.hasMoreTokens())
-        {
-            String part = parts.nextToken();
-            name += firstCase ? StringUtil.firstCase(part, true) : part;
-        }
-
-        return name;
+		StringTokenizer parts = new StringTokenizer(key, "-");
+		name += parts.nextToken();
+		while(parts.hasMoreTokens()) {
+			String part = parts.nextToken();
+			name += firstCase ? StringUtil.firstCase(part, true) : part;
+		}
+		return name;
 	}
-
-
 }
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -277,7 +277,7 @@ public boolean verifyAccess(SQLConfig config) throws Exception {
 					if (id instanceof Number == false) {//不能准确地判断Long，可能是Integer
 						throw new UnsupportedDataTypeException(table + ".id类型错误，id类型必须是Long！");
 					}
-					if (list.contains(new Long("" + id)) == false) {//Integer等转为Long才能正确判断。强转崩溃
+					if (list.contains(Long.valueOf("" + id)) == false) {//Integer等转为Long才能正确判断。强转崩溃
 						throw new IllegalAccessException(visitorIdkey + " = " + id + " 的 " + table
 								+ " 不允许 " + role.name() + " 用户的 " + method.name() + " 请求！");
 					}

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ public boolean verifyAccess(SQLConfig config) throws Exception {`
`277`	`277`	`if (id instanceof Number == false) {//不能准确地判断Long，可能是Integer`
`278`	`278`	`throw new UnsupportedDataTypeException(table + ".id类型错误，id类型必须是Long！");`
`279`	`279`	`}`
`280`		`- if (list.contains(new Long("" + id)) == false) {//Integer等转为Long才能正确判断。强转崩溃`
	`280`	`+ if (list.contains(Long.valueOf("" + id)) == false) {//Integer等转为Long才能正确判断。强转崩溃`
`281`	`281`	`throw new IllegalAccessException(visitorIdkey + " = " + id + " 的 " + table`
`282`	`282`	`+ " 不允许 " + role.name() + " 用户的 " + method.name() + " 请求！");`
`283`	`283`	`}`