From ce13ebd5fee07c35b3e32db63e2f3542c84f2b56 Mon Sep 17 00:00:00 2001 From: rikkarth Date: Tue, 23 Apr 2024 20:42:11 +0100 Subject: [PATCH] chore(#887): clean up parsedUnquotedText implementation --- src/main/java/org/json/JSONTokener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java index b4c5d1b..2ddbee4 100644 --- a/src/main/java/org/json/JSONTokener.java +++ b/src/main/java/org/json/JSONTokener.java @@ -521,17 +521,17 @@ public class JSONTokener { throw this.syntaxError("Missing value"); } - if (strictMode) { - Object stringToVal = JSONObject.stringToValue(string); + Object stringToValue = JSONObject.stringToValue(string); - if (stringToVal instanceof Number || stringToVal instanceof Boolean) { - return stringToVal; - } + return strictMode ? getValidNumberOrBooleanFromObject(stringToValue) : stringToValue; + } - throw new JSONException(String.format("Value is not surrounded by quotes: %s", string)); + private Object getValidNumberOrBooleanFromObject(Object value) { + if (value instanceof Number || value instanceof Boolean) { + return value; } - return JSONObject.stringToValue(string); + throw new JSONException(String.format("Value is not surrounded by quotes: %s", value)); } /**