Merge pull request #190 from github-ganyu/master

Optimize some code
Tencent · Jan 12, 2021 · 18a60a9 · 18a60a9
2 parents 90f4088 + 1530864
commit 18a60a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.74</version>
+			<version>1.2.75</version>
 		</dependency>
 	</dependencies>
 

diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -709,12 +709,8 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
 
 			if (result != null) {  // 加快下次查询，查到值的话组合情况其实是有限的，不属于恶意请求
 				if (versionedMap == null) {
-					versionedMap = new TreeMap<>(new Comparator<Integer>() {
-
-						@Override
-						public int compare(Integer o1, Integer o2) {
-							return o2 == null ? -1 : o2.compareTo(o1);  // 降序
-						}
+					versionedMap = new TreeMap<>((o1, o2) -> {
+						return o2 == null ? -1 : o2.compareTo(o1);  // 降序
 					});
 				}
 

diff --git a/APIJSONORM/src/main/java/apijson/orm/Logic.java b/APIJSONORM/src/main/java/apijson/orm/Logic.java
@@ -108,12 +108,16 @@ public static int getType(char logicChar) {
 	public static int getType(String logicChar) {
 		int type = -1;
 		if (logicChar != null && logicChar.length() == 1) {
-			if ("|".equals(logicChar)) {
-				type = 0;
-			} else if ("&".equals(logicChar)) {
-				type = 1;
-			} else if ("!".equals(logicChar)) {
-				type = 2;
+			switch (logicChar) {
+				case "|":
+					type = 0;
+					break;
+				case "&":
+					type = 1;
+					break;
+				case "!":
+					type = 2;
+					break;
 			}
 		}
 		return type;