From aac376f305d5b215cd3b6faa75d7dfb61cfab918 Mon Sep 17 00:00:00 2001 From: AlexCai2019 Date: Mon, 23 Jun 2025 01:23:15 +0800 Subject: [PATCH 1/2] Remove a redundant condition and an empty string Remove "NULL.equals(object)" on line 2756 of JSONObject.java since line 2752 has already tested it. Remove the empty string on line 249 of JSONPointer.java. --- src/main/java/org/json/JSONObject.java | 3 +-- src/main/java/org/json/JSONPointer.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java index c31fcec..976117f 100644 --- a/src/main/java/org/json/JSONObject.java +++ b/src/main/java/org/json/JSONObject.java @@ -2752,8 +2752,7 @@ public class JSONObject { if (NULL.equals(object)) { return NULL; } - if (object instanceof JSONObject || object instanceof JSONArray - || NULL.equals(object) || object instanceof JSONString + if (object instanceof JSONObject || object instanceof JSONArray || object instanceof JSONString || object instanceof Byte || object instanceof Character || object instanceof Short || object instanceof Integer || object instanceof Long || object instanceof Boolean diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java index 9004048..34066c1 100644 --- a/src/main/java/org/json/JSONPointer.java +++ b/src/main/java/org/json/JSONPointer.java @@ -246,7 +246,7 @@ public class JSONPointer { */ @Override public String toString() { - StringBuilder rval = new StringBuilder(""); + StringBuilder rval = new StringBuilder(); for (String token: this.refTokens) { rval.append('/').append(escape(token)); } From c882783d58785143125fe1ab49dc8431f87bebcf Mon Sep 17 00:00:00 2001 From: Alex Cai <89138532+AlexCai2019@users.noreply.github.com> Date: Fri, 27 Jun 2025 01:44:27 +0800 Subject: [PATCH 2/2] Format line 2755 in JSONObject.java --- src/main/java/org/json/JSONObject.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java index 976117f..a156de3 100644 --- a/src/main/java/org/json/JSONObject.java +++ b/src/main/java/org/json/JSONObject.java @@ -2752,13 +2752,14 @@ public class JSONObject { if (NULL.equals(object)) { return NULL; } - if (object instanceof JSONObject || object instanceof JSONArray || object instanceof JSONString + if (object instanceof JSONObject || object instanceof JSONArray + || object instanceof JSONString || object instanceof String || object instanceof Byte || object instanceof Character || object instanceof Short || object instanceof Integer || object instanceof Long || object instanceof Boolean || object instanceof Float || object instanceof Double - || object instanceof String || object instanceof BigInteger - || object instanceof BigDecimal || object instanceof Enum) { + || object instanceof BigInteger || object instanceof BigDecimal + || object instanceof Enum) { return object; }