From e800cc349ff5b25731edcc1543e4db9ffcd3d469 Mon Sep 17 00:00:00 2001 From: AlexCai2019 Date: Thu, 5 Jun 2025 01:55:44 +0800 Subject: [PATCH] Use constant.equals() There are some equals() that are not constant.equals(variable), but variable.equals(constant) --- src/main/java/org/json/JSONArray.java | 10 ++++------ src/main/java/org/json/JSONML.java | 2 +- src/main/java/org/json/JSONObject.java | 16 +++++++--------- src/main/java/org/json/JSONPointer.java | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java index e2725b7..c2e5c9a 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/JSONArray.java @@ -334,13 +334,11 @@ public class JSONArray implements Iterable { */ public boolean getBoolean(int index) throws JSONException { Object object = this.get(index); - if (object.equals(Boolean.FALSE) - || (object instanceof String && ((String) object) - .equalsIgnoreCase("false"))) { + if (Boolean.FALSE.equals(object) + || (object instanceof String && "false".equalsIgnoreCase((String) object))) { return false; - } else if (object.equals(Boolean.TRUE) - || (object instanceof String && ((String) object) - .equalsIgnoreCase("true"))) { + } else if (Boolean.TRUE.equals(object) + || (object instanceof String && "true".equalsIgnoreCase((String) object))) { return true; } throw wrongValueFormatException(index, "boolean", object, null); diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java index 7b53e4d..6e98c82 100644 --- a/src/main/java/org/json/JSONML.java +++ b/src/main/java/org/json/JSONML.java @@ -111,7 +111,7 @@ public class JSONML { } } else if (c == '[') { token = x.nextToken(); - if (token.equals("CDATA") && x.next() == '[') { + if ("CDATA".equals(token) && x.next() == '[') { if (ja != null) { ja.put(x.nextCDATA()); } diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java index 6b3b87e..8209546 100644 --- a/src/main/java/org/json/JSONObject.java +++ b/src/main/java/org/json/JSONObject.java @@ -679,13 +679,11 @@ public class JSONObject { */ public boolean getBoolean(String key) throws JSONException { Object object = this.get(key); - if (object.equals(Boolean.FALSE) - || (object instanceof String && ((String) object) - .equalsIgnoreCase("false"))) { + if (Boolean.FALSE.equals(object) + || (object instanceof String && "false".equalsIgnoreCase((String) object))) { return false; - } else if (object.equals(Boolean.TRUE) - || (object instanceof String && ((String) object) - .equalsIgnoreCase("true"))) { + } else if (Boolean.TRUE.equals(object) + || (object instanceof String && "true".equalsIgnoreCase((String) object))) { return true; } throw wrongValueFormatException(key, "Boolean", object, null); @@ -1911,7 +1909,7 @@ public class JSONObject { } //If the superclass is Object, no annotations will be found any more - if (c.getSuperclass().equals(Object.class)) + if (Object.class.equals(c.getSuperclass())) return null; try { @@ -1969,7 +1967,7 @@ public class JSONObject { } //If the superclass is Object, no annotations will be found any more - if (c.getSuperclass().equals(Object.class)) + if (Object.class.equals(c.getSuperclass())) return -1; try { @@ -3022,7 +3020,7 @@ public class JSONObject { * @return number without leading zeros */ private static String removeLeadingZerosOfNumber(String value){ - if (value.equals("-")){return value;} + if ("-".equals(value)){return value;} boolean negativeFirstChar = (value.charAt(0) == '-'); int counter = negativeFirstChar ? 1:0; while (counter < value.length()){ diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java index 859e1e6..9004048 100644 --- a/src/main/java/org/json/JSONPointer.java +++ b/src/main/java/org/json/JSONPointer.java @@ -127,7 +127,7 @@ public class JSONPointer { if (pointer == null) { throw new NullPointerException("pointer cannot be null"); } - if (pointer.isEmpty() || pointer.equals("#")) { + if (pointer.isEmpty() || "#".equals(pointer)) { this.refTokens = Collections.emptyList(); return; }