From 783577be19cfb596ac90a28b7fb28fac4df400d5 Mon Sep 17 00:00:00 2001 From: Sean Leary Date: Tue, 14 May 2024 20:48:33 -0500 Subject: [PATCH 001/106] update-jsonpath: update jsonpath from 2.4.0 to 2.9.0 --- build.gradle | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 30a85785b..b92366eb1 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ repositories { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation 'com.jayway.jsonpath:json-path:2.4.0' + testImplementation 'com.jayway.jsonpath:json-path:2.9.0' testImplementation 'org.mockito:mockito-core:4.2.0' } diff --git a/pom.xml b/pom.xml index 7b102433b..bc1a7c4b1 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.jayway.jsonpath json-path - 2.4.0 + 2.9.0 test From 0d71dcf71319c9bc230f268e3e50314bb7bb9e5e Mon Sep 17 00:00:00 2001 From: Lucas Nascimento <4311885+hexetia@users.noreply.github.com> Date: Sat, 5 Oct 2024 11:39:26 -0300 Subject: [PATCH 002/106] test(#901): call JsonArray.putAll with a casted list as object --- src/test/java/org/json/junit/JSONArrayTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java index 485d43e7b..7a58d516e 100644 --- a/src/test/java/org/json/junit/JSONArrayTest.java +++ b/src/test/java/org/json/junit/JSONArrayTest.java @@ -259,6 +259,11 @@ public void verifyPutAll() { jsonArray.length(), len); + // collection as object + @SuppressWarnings("RedundantCast") + Object myListAsObject = (Object) myList; + jsonArray.putAll(myListAsObject); + for (int i = 0; i < myList.size(); i++) { assertEquals("collection elements should be equal", myList.get(i), From 14e9cdc485f6c80bee6ca1551458bfed1a20348a Mon Sep 17 00:00:00 2001 From: Lucas Nascimento <4311885+hexetia@users.noreply.github.com> Date: Sat, 5 Oct 2024 11:43:00 -0300 Subject: [PATCH 003/106] fix(#901): add the jsonparserConfiguration param to avoid a stackoverflow error --- src/main/java/org/json/JSONArray.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java index 382359858..406bcd242 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/JSONArray.java @@ -2001,7 +2001,7 @@ private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserCo // JSONArray this.myArrayList.addAll(((JSONArray)array).myArrayList); } else if (array instanceof Collection) { - this.addAll((Collection)array, wrap, recursionDepth); + this.addAll((Collection)array, wrap, recursionDepth, jsonParserConfiguration); } else if (array instanceof Iterable) { this.addAll((Iterable)array, wrap); } else { From ab1b9a345988b9d01b20654ead2d0c2b7e4240cf Mon Sep 17 00:00:00 2001 From: Sean Leary Date: Sun, 3 Nov 2024 09:49:23 -0600 Subject: [PATCH 004/106] Revert "Merge pull request #888 from rikkarth/fix/887" This reverts commit 14f71274f79ac50afb316845539f4195facc33ee, reversing changes made to 054786e300d0fc38f0cf7fc0f2db4d9b39cb6443. --- src/main/java/org/json/JSONArray.java | 117 ++++------- src/main/java/org/json/JSONTokener.java | 194 ++++++++---------- src/test/java/org/json/junit/CDLTest.java | 18 +- .../java/org/json/junit/JSONArrayTest.java | 17 +- src/test/java/org/json/junit/JSONMLTest.java | 34 +-- .../org/json/junit/JSONObjectNumberTest.java | 28 +-- .../java/org/json/junit/JSONObjectTest.java | 42 ++-- .../junit/JSONParserConfigurationTest.java | 105 +--------- .../org/json/junit/XMLConfigurationTest.java | 7 +- src/test/java/org/json/junit/XMLTest.java | 10 +- ...rayExpectedTestCaseForToJsonArrayTest.json | 91 -------- .../resources/XmlTestCaseTestToJsonArray.xml | 27 --- 12 files changed, 188 insertions(+), 502 deletions(-) delete mode 100644 src/test/resources/JSONArrayExpectedTestCaseForToJsonArrayTest.json delete mode 100644 src/test/resources/XmlTestCaseTestToJsonArray.xml diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java index 382359858..ded271e17 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/JSONArray.java @@ -96,83 +96,53 @@ public JSONArray(JSONTokener x) throws JSONException { */ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException { this(); - char nextChar = x.nextClean(); - - // check first character, if not '[' throw JSONException - if (nextChar != '[') { + if (x.nextClean() != '[') { throw x.syntaxError("A JSONArray text must start with '['"); } - parseTokener(x, jsonParserConfiguration); // runs recursively - - } - - private void parseTokener(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) { - boolean strictMode = jsonParserConfiguration.isStrictMode(); - - char cursor = x.nextClean(); - - switch (cursor) { - case 0: - throwErrorIfEoF(x); - break; - case ',': - cursor = x.nextClean(); - - throwErrorIfEoF(x); - - if(strictMode && cursor == ']'){ - throw x.syntaxError(getInvalidCharErrorMsg(cursor)); - } - - if (cursor == ']') { - break; - } - - x.back(); - - parseTokener(x, jsonParserConfiguration); - break; - case ']': - if (strictMode) { - cursor = x.nextClean(); - boolean isEoF = x.end(); - - if (isEoF) { - break; - } - - if (x.getArrayLevel() == 0) { - throw x.syntaxError(getInvalidCharErrorMsg(cursor)); - } - + char nextChar = x.nextClean(); + if (nextChar == 0) { + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + } + if (nextChar != ']') { + x.back(); + for (;;) { + if (x.nextClean() == ',') { + x.back(); + this.myArrayList.add(JSONObject.NULL); + } else { x.back(); + this.myArrayList.add(x.nextValue(jsonParserConfiguration)); } - break; - default: - x.back(); - boolean currentCharIsQuote = x.getPrevious() == '"'; - boolean quoteIsNotNextToValidChar = x.getPreviousChar() != ',' && x.getPreviousChar() != '['; - - if (strictMode && currentCharIsQuote && quoteIsNotNextToValidChar) { - throw x.syntaxError(getInvalidCharErrorMsg(cursor)); + switch (x.nextClean()) { + case 0: + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + case ',': + nextChar = x.nextClean(); + if (nextChar == 0) { + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + } + if (nextChar == ']') { + return; + } + x.back(); + break; + case ']': + if (jsonParserConfiguration.isStrictMode()) { + nextChar = x.nextClean(); + if (nextChar != 0) { + throw x.syntaxError("invalid character found after end of array: " + nextChar); + } + } + + return; + default: + throw x.syntaxError("Expected a ',' or ']'"); } - - this.myArrayList.add(x.nextValue(jsonParserConfiguration)); - parseTokener(x, jsonParserConfiguration); - } - } - - /** - * Throws JSONException if JSONTokener has reached end of file, usually when array is unclosed. No ']' found, - * instead EoF. - * - * @param x the JSONTokener being evaluated. - * @throws JSONException if JSONTokener has reached end of file. - */ - private void throwErrorIfEoF(JSONTokener x) { - if (x.end()) { - throw x.syntaxError(String.format("Expected a ',' or ']' but instead found '%s'", x.getPrevious())); + } } } @@ -1962,7 +1932,6 @@ private void addAll(Object array, boolean wrap) throws JSONException { private void addAll(Object array, boolean wrap, int recursionDepth) { addAll(array, wrap, recursionDepth, new JSONParserConfiguration()); } - /** * Add an array's elements to the JSONArray. *` @@ -2009,6 +1978,7 @@ private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserCo "JSONArray initial value should be a string or collection or array."); } } + /** * Create a new JSONException in a common format for incorrect conversions. * @param idx index of the item @@ -2037,7 +2007,4 @@ private static JSONException wrongValueFormatException( , cause); } - private static String getInvalidCharErrorMsg(char cursor) { - return String.format("invalid character '%s' found after end of array", cursor); - } } diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java index 63effc5f7..46937e10a 100644 --- a/src/main/java/org/json/JSONTokener.java +++ b/src/main/java/org/json/JSONTokener.java @@ -2,8 +2,6 @@ import java.io.*; import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; /* Public Domain. @@ -33,8 +31,6 @@ public class JSONTokener { private boolean usePrevious; /** the number of characters read in the previous line. */ private long characterPreviousLine; - private final List smallCharMemory; - private int arrayLevel = 0; /** @@ -53,7 +49,6 @@ public JSONTokener(Reader reader) { this.character = 1; this.characterPreviousLine = 0; this.line = 1; - this.smallCharMemory = new ArrayList(2); } @@ -191,46 +186,6 @@ public char next() throws JSONException { return this.previous; } - private void insertCharacterInCharMemory(Character c) { - boolean foundSameCharRef = checkForEqualCharRefInMicroCharMemory(c); - if(foundSameCharRef){ - return; - } - - if(smallCharMemory.size() < 2){ - smallCharMemory.add(c); - return; - } - - smallCharMemory.set(0, smallCharMemory.get(1)); - smallCharMemory.remove(1); - smallCharMemory.add(c); - } - - private boolean checkForEqualCharRefInMicroCharMemory(Character c) { - boolean isNotEmpty = !smallCharMemory.isEmpty(); - if (isNotEmpty) { - Character lastChar = smallCharMemory.get(smallCharMemory.size() - 1); - return c.compareTo(lastChar) == 0; - } - - // list is empty so there's no equal characters - return false; - } - - /** - * Retrieves the previous char from memory. - * - * @return previous char stored in memory. - */ - public char getPreviousChar() { - return smallCharMemory.get(0); - } - - public int getArrayLevel(){ - return this.arrayLevel; - } - /** * Get the last character read from the input or '\0' if nothing has been read yet. * @return the last character read from the input. @@ -308,6 +263,7 @@ public String next(int n) throws JSONException { return new String(chars); } + /** * Get the next char in the string, skipping whitespace. * @throws JSONException Thrown if there is an error reading the source string. @@ -317,7 +273,6 @@ public char nextClean() throws JSONException { for (;;) { char c = this.next(); if (c == 0 || c > ' ') { - insertCharacterInCharMemory(c); return c; } } @@ -325,66 +280,77 @@ public char nextClean() throws JSONException { /** - * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format - * does not allow strings in single quotes, but an implementation is allowed to accept them. - * + * Return the characters up to the next close quote character. + * Backslash processing is done. The formal JSON format does not + * allow strings in single quotes, but an implementation is allowed to + * accept them. + * If strictMode is true, this implementation will not accept unbalanced quotes (e.g will not accept "test'). * @param quote The quoting character, either * " (double quote) or * ' (single quote). + * @param strictMode If true, this implementation will not accept unbalanced quotes (e.g will not accept "test'). * @return A String. * @throws JSONException Unterminated string or unbalanced quotes if strictMode == true. */ - public String nextString(char quote) throws JSONException { + public String nextString(char quote, boolean strictMode) throws JSONException { char c; StringBuilder sb = new StringBuilder(); for (;;) { c = this.next(); switch (c) { - case 0: - case '\n': - case '\r': - throw this.syntaxError("Unterminated string. " + + case 0: + case '\n': + case '\r': + throw this.syntaxError("Unterminated string. " + "Character with int code " + (int) c + " is not allowed within a quoted string."); - case '\\': - c = this.next(); - switch (c) { - case 'b': - sb.append('\b'); - break; - case 't': - sb.append('\t'); - break; - case 'n': - sb.append('\n'); - break; - case 'f': - sb.append('\f'); - break; - case 'r': - sb.append('\r'); - break; - case 'u': - String next = this.next(4); - try { - sb.append((char) Integer.parseInt(next, 16)); - } catch (NumberFormatException e) { - throw this.syntaxError("Illegal escape. " + - "\\u must be followed by a 4 digit hexadecimal number. \\" + next - + " is not valid.", - e); - } - break; - case '"': - case '\'': - case '\\': - case '/': - sb.append(c); - break; - default: - throw this.syntaxError("Illegal escape. Escape sequence \\" + c + " is not valid."); + case '\\': + c = this.next(); + switch (c) { + case 'b': + sb.append('\b'); + break; + case 't': + sb.append('\t'); + break; + case 'n': + sb.append('\n'); + break; + case 'f': + sb.append('\f'); + break; + case 'r': + sb.append('\r'); + break; + case 'u': + String next = this.next(4); + try { + sb.append((char)Integer.parseInt(next, 16)); + } catch (NumberFormatException e) { + throw this.syntaxError("Illegal escape. " + + "\\u must be followed by a 4 digit hexadecimal number. \\" + next + " is not valid.", e); } break; + case '"': + case '\'': + case '\\': + case '/': + sb.append(c); + break; default: + throw this.syntaxError("Illegal escape. Escape sequence \\" + c + " is not valid."); + } + break; + default: + if (strictMode && c == '\"' && quote != c) { + throw this.syntaxError(String.format( + "Field contains unbalanced quotes. Starts with %s but ends with double quote.", quote)); + } + + if (strictMode && c == '\'' && quote != c) { + throw this.syntaxError(String.format( + "Field contains unbalanced quotes. Starts with %s but ends with single quote.", quote)); + } + if (c == quote) { return sb.toString(); } @@ -393,6 +359,7 @@ public String nextString(char quote) throws JSONException { } } + /** * Get the text up but not including the specified character or the * end of line, whichever comes first. @@ -474,8 +441,7 @@ public Object nextValue(JSONParserConfiguration jsonParserConfiguration) throws case '[': this.back(); try { - this.arrayLevel++; - return new JSONArray(this, jsonParserConfiguration); + return new JSONArray(this); } catch (StackOverflowError e) { throw new JSONException("JSON Array or Object depth too large to process.", e); } @@ -516,24 +482,15 @@ private JSONArray getJsonArray() { } } - /** - * Get the next simple value from the JSON input. Simple values include strings (wrapped in single or double - * quotes), numbers, booleans, and null. This method is called when the next character is not '{' or '['. - * - * @param c The starting character. - * @param jsonParserConfiguration The configuration object containing parsing options. - * @return The parsed simple value. - * @throws JSONException If there is a syntax error or the value does not adhere to the configuration rules. - */ Object nextSimpleValue(char c, JSONParserConfiguration jsonParserConfiguration) { boolean strictMode = jsonParserConfiguration.isStrictMode(); - if (strictMode && c == '\'') { + if(strictMode && c == '\''){ throw this.syntaxError("Single quote wrap not allowed in strict mode"); } if (c == '"' || c == '\'') { - return this.nextString(c); + return this.nextString(c, strictMode); } return parsedUnquotedText(c, strictMode); @@ -560,21 +517,34 @@ private Object parsedUnquotedText(char c, boolean strictMode) { String string = sb.toString().trim(); + if (strictMode) { + boolean isBooleanOrNumeric = checkIfValueIsBooleanOrNumeric(string); + + if (isBooleanOrNumeric) { + return string; + } + + throw new JSONException(String.format("Value is not surrounded by quotes: %s", string)); + } + if (string.isEmpty()) { throw this.syntaxError("Missing value"); } - - Object stringToValue = JSONObject.stringToValue(string); - - return strictMode ? getValidNumberBooleanOrNullFromObject(stringToValue) : stringToValue; + return JSONObject.stringToValue(string); } - private Object getValidNumberBooleanOrNullFromObject(Object value) { - if (value instanceof Number || value instanceof Boolean || value.equals(JSONObject.NULL)) { - return value; + private boolean checkIfValueIsBooleanOrNumeric(Object valueToValidate) { + String stringToValidate = valueToValidate.toString(); + if (stringToValidate.equals("true") || stringToValidate.equals("false")) { + return true; } - throw this.syntaxError(String.format("Value '%s' is not surrounded by quotes", value)); + try { + Double.parseDouble(stringToValidate); + return true; + } catch (NumberFormatException e) { + return false; + } } /** diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java index 511218ed3..cc3da2983 100644 --- a/src/test/java/org/json/junit/CDLTest.java +++ b/src/test/java/org/json/junit/CDLTest.java @@ -29,7 +29,8 @@ public class CDLTest { "1, 2, 3, 4\t, 5, 6, 7\n" + "true, false, true, true, false, false, false\n" + "0.23, 57.42, 5e27, -234.879, 2.34e5, 0.0, 9e-3\n" + - "\"va\tl1\", \"v\bal2\", \"val3\", \"val\f4\", \"val5\", \"va'l6\", val7\n"; + "\"va\tl1\", \"v\bal2\", \"val3\", \"val\f4\", \"val5\", va'l6, val7\n"; + /** * CDL.toJSONArray() adds all values as strings, with no filtering or @@ -37,12 +38,11 @@ public class CDLTest { * values all must be quoted in the cases where the JSONObject parsing * might normally convert the value into a non-string. */ - private static final String EXPECTED_LINES = - "[{\"Col 1\":\"val1\", \"Col 2\":\"val2\", \"Col 3\":\"val3\", \"Col 4\":\"val4\", \"Col 5\":\"val5\", \"Col 6\":\"val6\", \"Col 7\":\"val7\"}, " + - "{\"Col 1\":\"1\", \"Col 2\":\"2\", \"Col 3\":\"3\", \"Col 4\":\"4\", \"Col 5\":\"5\", \"Col 6\":\"6\", \"Col 7\":\"7\"}, " + - "{\"Col 1\":\"true\", \"Col 2\":\"false\", \"Col 3\":\"true\", \"Col 4\":\"true\", \"Col 5\":\"false\", \"Col 6\":\"false\", \"Col 7\":\"false\"}, " + - "{\"Col 1\":\"0.23\", \"Col 2\":\"57.42\", \"Col 3\":\"5e27\", \"Col 4\":\"-234.879\", \"Col 5\":\"2.34e5\", \"Col 6\":\"0.0\", \"Col 7\":\"9e-3\"}, " + - "{\"Col 1\":\"va\tl1\", \"Col 2\":\"v\bal2\", \"Col 3\":\"val3\", \"Col 4\":\"val\f4\", \"Col 5\":\"val5\", \"Col 6\":\"va'l6\", \"Col 7\":\"val7\"}]"; + private static final String EXPECTED_LINES = "[{Col 1:val1, Col 2:val2, Col 3:val3, Col 4:val4, Col 5:val5, Col 6:val6, Col 7:val7}, " + + "{Col 1:\"1\", Col 2:\"2\", Col 3:\"3\", Col 4:\"4\", Col 5:\"5\", Col 6:\"6\", Col 7:\"7\"}, " + + "{Col 1:\"true\", Col 2:\"false\", Col 3:\"true\", Col 4:\"true\", Col 5:\"false\", Col 6:\"false\", Col 7:\"false\"}, " + + "{Col 1:\"0.23\", Col 2:\"57.42\", Col 3:\"5e27\", Col 4:\"-234.879\", Col 5:\"2.34e5\", Col 6:\"0.0\", Col 7:\"9e-3\"}, " + + "{Col 1:\"va\tl1\", Col 2:\"v\bal2\", Col 3:val3, Col 4:\"val\f4\", Col 5:val5, Col 6:va'l6, Col 7:val7}]"; /** * Attempts to create a JSONArray from a null string. @@ -283,11 +283,11 @@ public void textToJSONArrayPipeDelimited() { */ @Test public void jsonArrayToJSONArray() { - String nameArrayStr = "[\"Col1\", \"Col2\"]"; + String nameArrayStr = "[Col1, Col2]"; String values = "V1, V2"; JSONArray nameJSONArray = new JSONArray(nameArrayStr); JSONArray jsonArray = CDL.toJSONArray(nameJSONArray, values); - JSONArray expectedJsonArray = new JSONArray("[{\"Col1\":\"V1\",\"Col2\":\"V2\"}]"); + JSONArray expectedJsonArray = new JSONArray("[{Col1:V1,Col2:V2}]"); Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray); } diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java index 485d43e7b..fcaa8cea0 100644 --- a/src/test/java/org/json/junit/JSONArrayTest.java +++ b/src/test/java/org/json/junit/JSONArrayTest.java @@ -142,7 +142,7 @@ public void unclosedArray() { assertNull("Should throw an exception", new JSONArray("[")); } catch (JSONException e) { assertEquals("Expected an exception message", - "Expected a ',' or ']' but instead found '[' at 1 [character 2 line 1]", + "Expected a ',' or ']' at 1 [character 2 line 1]", e.getMessage()); } } @@ -157,7 +157,7 @@ public void unclosedArray2() { assertNull("Should throw an exception", new JSONArray("[\"test\"")); } catch (JSONException e) { assertEquals("Expected an exception message", - "Expected a ',' or ']' but instead found '\"' at 7 [character 8 line 1]", + "Expected a ',' or ']' at 7 [character 8 line 1]", e.getMessage()); } } @@ -172,7 +172,7 @@ public void unclosedArray3() { assertNull("Should throw an exception", new JSONArray("[\"test\",")); } catch (JSONException e) { assertEquals("Expected an exception message", - "Expected a ',' or ']' but instead found ',' at 8 [character 9 line 1]", + "Expected a ',' or ']' at 8 [character 9 line 1]", e.getMessage()); } } @@ -469,8 +469,7 @@ public void failedGetArrayValues() { * to the spec. However, after being parsed, toString() should emit strictly * conforming JSON text. */ - // TODO: This test will only run in non-strictMode. TBD later. - @Ignore + @Test public void unquotedText() { String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]"; JSONArray jsonArray = new JSONArray(str); @@ -686,8 +685,8 @@ public void put() { String jsonArrayStr = "["+ - "\"hello\","+ - "\"world\""+ + "hello,"+ + "world"+ "]"; // 2 jsonArray.put(new JSONArray(jsonArrayStr)); @@ -764,8 +763,8 @@ public void putIndex() { String jsonArrayStr = "["+ - "\"hello\","+ - "\"world\""+ + "hello,"+ + "world"+ "]"; // 2 jsonArray.put(2, new JSONArray(jsonArrayStr)); diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java index d3568401b..154af645f 100644 --- a/src/test/java/org/json/junit/JSONMLTest.java +++ b/src/test/java/org/json/junit/JSONMLTest.java @@ -6,11 +6,6 @@ import static org.junit.Assert.*; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.json.*; import org.junit.Test; @@ -653,10 +648,14 @@ public void toJSONObjectToJSONArray() { // create a JSON array from the original string and make sure it // looks as expected JSONArray jsonArray = JSONML.toJSONArray(xmlStr); + JSONArray expectedJsonArray = new JSONArray(expectedJSONArrayStr); + Util.compareActualVsExpectedJsonArrays(jsonArray,expectedJsonArray); // restore the XML, then make another JSONArray and make sure it // looks as expected String jsonArrayXmlToStr = JSONML.toString(jsonArray); + JSONArray finalJsonArray = JSONML.toJSONArray(jsonArrayXmlToStr); + Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray); // lastly, confirm the restored JSONObject XML and JSONArray XML look // reasonably similar @@ -665,31 +664,6 @@ public void toJSONObjectToJSONArray() { Util.compareActualVsExpectedJsonObjects(jsonObjectFromObject, jsonObjectFromArray); } - @Test - public void givenXmlStr_testToJSONArray_shouldEqualExpectedArray() throws IOException { - try (Stream jsonLines = Files.lines( - Paths.get("src/test/resources/JSONArrayExpectedTestCaseForToJsonArrayTest.json")); - Stream xmlLines = Files.lines(Paths.get("src/test/resources/XmlTestCaseTestToJsonArray.xml"))) { - - String xmlStr = xmlLines.collect(Collectors.joining()); - String expectedJSONArrayStr = jsonLines.collect(Collectors.joining()); - - JSONArray jsonArray = JSONML.toJSONArray(xmlStr); - JSONArray expectedJsonArray = new JSONArray(expectedJSONArrayStr); - - assertEquals(expectedJsonArray.toString(), jsonArray.toString()); - //TODO Util.compareActualVsExpectedJsonArrays can be replaced with above assertEquals(expectedJsonArray.toString(), jsonArray.toString()) - Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray); - - String jsonArrayXmlToStr = JSONML.toString(jsonArray); - - JSONArray finalJsonArray = JSONML.toJSONArray(jsonArrayXmlToStr); - - //TODO Util.compareActualVsExpectedJsonArrays can be replaced with assertEquals(expectedJsonArray.toString(), finalJsonArray.toString()) - Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray); - } - } - /** * Convert an XML document which contains embedded comments into * a JSONArray. Use JSONML.toString() to turn it into a string, then diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java index 739de838f..43173a288 100644 --- a/src/test/java/org/json/junit/JSONObjectNumberTest.java +++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java @@ -23,22 +23,22 @@ public class JSONObjectNumberTest { @Parameters(name = "{index}: {0}") public static Collection data() { return Arrays.asList(new Object[][]{ - {"{\"value\":50}", 1}, - {"{\"value\":50.0}", 1}, - {"{\"value\":5e1}", 1}, - {"{\"value\":5E1}", 1}, - {"{\"value\":5e1}", 1}, - {"{\"value\":\"50\"}", 1}, - {"{\"value\":-50}", -1}, - {"{\"value\":-50.0}", -1}, - {"{\"value\":-5e1}", -1}, - {"{\"value\":-5E1}", -1}, - {"{\"value\":-5e1}", -1}, - {"{\"value\":\"-50\"}", -1} + {"{value:50}", 1}, + {"{value:50.0}", 1}, + {"{value:5e1}", 1}, + {"{value:5E1}", 1}, + {"{value:5e1}", 1}, + {"{value:'50'}", 1}, + {"{value:-50}", -1}, + {"{value:-50.0}", -1}, + {"{value:-5e1}", -1}, + {"{value:-5E1}", -1}, + {"{value:-5e1}", -1}, + {"{value:'-50'}", -1} // JSON does not support octal or hex numbers; // see https://stackoverflow.com/a/52671839/6323312 - // "{\"value\":062}", // octal 50 - // "{\"value\":0x32}" // hex 50 + // "{value:062}", // octal 50 + // "{value:0x32}" // hex 50 }); } diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java index d32a2db68..fbad31324 100644 --- a/src/test/java/org/json/junit/JSONObjectTest.java +++ b/src/test/java/org/json/junit/JSONObjectTest.java @@ -216,8 +216,7 @@ public void jsonObjectByNullBean() { * to the spec. However, after being parsed, toString() should emit strictly * conforming JSON text. */ - // TODO: This test will only run in non-strictMode. TBD later. - @Ignore + @Test public void unquotedText() { String str = "{key1:value1, key2:42, 1.2 : 3.4, -7e5 : something!}"; JSONObject jsonObject = new JSONObject(str); @@ -1068,8 +1067,7 @@ public void jsonValidNumberValuesNeitherLongNorIEEE754Compatible() { /** * This test documents how JSON-Java handles invalid numeric input. */ - // TODO: to be restored after strictMode parsing is fixed - @Ignore + @Test public void jsonInvalidNumberValues() { // Number-notations supported by Java and invalid as JSON String str = @@ -2262,7 +2260,7 @@ public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){ * Explore how JSONObject handles parsing errors. */ @SuppressWarnings({"boxing", "unused"}) - @Ignore + @Test public void jsonObjectParsingErrors() { try { // does not start with '{' @@ -2324,7 +2322,7 @@ public void jsonObjectParsingErrors() { assertNull("Expected an exception",new JSONObject(str)); } catch (JSONException e) { assertEquals("Expecting an exception message", - "Value 'foo' is not surrounded by quotes at 4 [character 5] line 1]", + "Expected a ':' after a key at 5 [character 6 line 1]", e.getMessage()); } try { @@ -3817,33 +3815,27 @@ public void clarifyCurrentBehavior() { // Behavior documented in #826 JSONObject parsing 0-led numeric strings as ints // After reverting the code, personId is stored as a string, and the behavior is as expected - String personId = "\"0123\""; - JSONObject j1 = new JSONObject("{\"personId\": " + personId + "}"); + String personId = "0123"; + JSONObject j1 = new JSONObject("{personId: " + personId + "}"); assertEquals(j1.getString("personId"), "0123"); // Also #826. Here is input with missing quotes. Because of the leading zero, it should not be parsed as a number. // This example was mentioned in the same ticket // After reverting the code, personId is stored as a string, and the behavior is as expected - - // TODO: the next two tests fail due to an ambiguity in parsing the value. - // non-StrictMode - it is a valid non-numeric value - // strictMode - Since it is non-numeric, quotes are required. - // This test should be extracted to its own unit test. The result should depend on the strictMode setting. - // For now it s commented out -// JSONObject j2 = new JSONObject("{\"personId\":0123}"); -// assertEquals(j2.getString("personId"), "0123"); + JSONObject j2 = new JSONObject("{\"personId\":0123}"); + assertEquals(j2.getString("personId"), "0123"); // Behavior uncovered while working on the code // All of the values are stored as strings except for hex4, which is stored as a number. This is probably incorrect -// JSONObject j3 = new JSONObject("{ " + -// "\"hex1\": \"010e4\", \"hex2\": \"00f0\", \"hex3\": \"0011\", " + -// "\"hex4\": 00e0, \"hex5\": 00f0, \"hex6\": 0011 }"); -// assertEquals(j3.getString("hex1"), "010e4"); -// assertEquals(j3.getString("hex2"), "00f0"); -// assertEquals(j3.getString("hex3"), "0011"); -// assertEquals(j3.getLong("hex4"), 0, .1); -// assertEquals(j3.getString("hex5"), "00f0"); -// assertEquals(j3.getString("hex6"), "0011"); + JSONObject j3 = new JSONObject("{ " + + "\"hex1\": \"010e4\", \"hex2\": \"00f0\", \"hex3\": \"0011\", " + + "\"hex4\": 00e0, \"hex5\": 00f0, \"hex6\": 0011 }"); + assertEquals(j3.getString("hex1"), "010e4"); + assertEquals(j3.getString("hex2"), "00f0"); + assertEquals(j3.getString("hex3"), "0011"); + assertEquals(j3.getLong("hex4"), 0, .1); + assertEquals(j3.getString("hex5"), "00f0"); + assertEquals(j3.getString("hex6"), "0011"); } /** diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java index 427aad4df..a1838a4ee 100644 --- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java +++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java @@ -46,85 +46,6 @@ public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException( () -> new JSONArray(testCase, jsonParserConfiguration))); } - @Test - public void givenEmptyArray_testStrictModeTrue_shouldNotThrowJsonException() { - JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration() - .withStrictMode(true); - - String testCase = "[]"; - - JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration); - - assertEquals(testCase, jsonArray.toString()); - } - - @Test - public void givenValidDoubleArray_testStrictModeTrue_shouldNotThrowJsonException() { - JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration() - .withStrictMode(true); - - String testCase = "[[\"c\"], [10.2], [true, false, true]]"; - - JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration); - JSONArray arrayShouldContainStringAt0 = jsonArray.getJSONArray(0); - JSONArray arrayShouldContainNumberAt0 = jsonArray.getJSONArray(1); - JSONArray arrayShouldContainBooleanAt0 = jsonArray.getJSONArray(2); - - assertTrue(arrayShouldContainStringAt0.get(0) instanceof String); - assertTrue(arrayShouldContainNumberAt0.get(0) instanceof Number); - assertTrue(arrayShouldContainBooleanAt0.get(0) instanceof Boolean); - } - - @Test - public void givenValidEmptyArrayInsideArray_testStrictModeTrue_shouldNotThrowJsonException(){ - JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration() - .withStrictMode(true); - - String testCase = "[[]]"; - - JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration); - - assertEquals(testCase, jsonArray.toString()); - } - - @Test - public void givenValidEmptyArrayInsideArray_testStrictModeFalse_shouldNotThrowJsonException(){ - JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration() - .withStrictMode(false); - - String testCase = "[[]]"; - - JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration); - - assertEquals(testCase, jsonArray.toString()); - } - - @Test - public void givenInvalidString_testStrictModeTrue_shouldThrowJsonException() { - JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration() - .withStrictMode(true); - - String testCase = "[badString]"; - - JSONException je = assertThrows(JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration)); - - assertEquals("Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]", je.getMessage()); - } - - @Test - public void allowNullInStrictMode() { - String expected = "[null]"; - JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true)); - assertEquals(expected, jsonArray.toString()); - } - - @Test - public void shouldHandleNumericArray() { - String expected = "[10]"; - JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true)); - assertEquals(expected, jsonArray.toString()); - } - @Test public void givenCompliantJSONArrayFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException { try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonArray.json"))) { @@ -157,7 +78,7 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacte JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration)); - assertEquals("invalid character ';' found after end of array at 6 [character 7 line 1]", je.getMessage()); + assertEquals("invalid character found after end of array: ; at 6 [character 7 line 1]", je.getMessage()); } @Test @@ -170,7 +91,7 @@ public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldTh JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration)); - assertEquals("invalid character ';' found after end of array at 10 [character 11 line 1]", je.getMessage()); + assertEquals("invalid character found after end of array: ; at 10 [character 11 line 1]", je.getMessage()); } @Test @@ -183,7 +104,7 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroun JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration)); - assertEquals("Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]", je.getMessage()); + assertEquals("Value is not surrounded by quotes: implied", je.getMessage()); } @Test @@ -216,7 +137,7 @@ public void givenNonCompliantQuotes_testStrictModeTrue_shouldThrowJsonExceptionW () -> new JSONArray(testCaseFour, jsonParserConfiguration)); assertEquals( - "Value 'test' is not surrounded by quotes at 13 [character 14 line 1]", + "Field contains unbalanced quotes. Starts with \" but ends with single quote. at 6 [character 7 line 1]", jeOne.getMessage()); assertEquals( "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]", @@ -242,7 +163,7 @@ public void givenUnbalancedQuotes_testStrictModeFalse_shouldThrowJsonException() JSONException jeTwo = assertThrows(JSONException.class, () -> new JSONArray(testCaseTwo, jsonParserConfiguration)); - assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeOne.getMessage()); + assertEquals("Expected a ',' or ']' at 10 [character 11 line 1]", jeOne.getMessage()); assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage()); } @@ -256,7 +177,7 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurrounde JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration)); - assertEquals("Value 'test' is not surrounded by quotes at 6 [character 7 line 1]", je.getMessage()); + assertEquals(String.format("Value is not surrounded by quotes: %s", "test"), je.getMessage()); } @Test @@ -287,20 +208,6 @@ public void verifyMaxDepthThenDuplicateKey() { */ private List getNonCompliantJSONList() { return Arrays.asList( - "[1],", - "[1,]", - "[[1]\"sa\",[2]]a", - "[1],\"dsa\": \"test\"", - "[[a]]", - "[]asdf", - "[]]", - "[]}", - "[][", - "[]{", - "[],", - "[]:", - "[],[", - "[],{", "[1,2];[3,4]", "[test]", "[{'testSingleQuote': 'testSingleQuote'}]", diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java index 92a109ad9..e9714afe7 100755 --- a/src/test/java/org/json/junit/XMLConfigurationTest.java +++ b/src/test/java/org/json/junit/XMLConfigurationTest.java @@ -268,14 +268,11 @@ public void shouldHandleSimpleXML() { " \n"+ ""; - // TODO: This test failed in strictMode due to -23x.45 not being surrounded by quotes - // It should probably be split into two tests, one of which does not run in strictMode. - // TBD. String expectedStr = "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+ - "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+ + "\"name\":\"Joe Tester\",\"NothingHere\":\"\",TrueValue:true,\n"+ "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+ - "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+ + "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":-23x.45,\n"+ "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+ "},\"xsi:noNamespaceSchemaLocation\":"+ "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+ diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java index be478643c..3b26b22e2 100644 --- a/src/test/java/org/json/junit/XMLTest.java +++ b/src/test/java/org/json/junit/XMLTest.java @@ -265,13 +265,11 @@ public void shouldHandleSimpleXML() { " \n"+ ""; - // TODO: fails in strict mode because -23x.45 was not surrounded by quotes. - // Should be split into a strictMode test, and a similar non-strictMode test String expectedStr = "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+ - "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+ + "\"name\":\"Joe Tester\",\"NothingHere\":\"\",TrueValue:true,\n"+ "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+ - "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+ + "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":-23x.45,\n"+ "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+ "},\"xsi:noNamespaceSchemaLocation\":"+ "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+ @@ -1182,7 +1180,7 @@ public void testIndentComplicatedJsonObject(){ @Test public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){ - String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}"; + String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}"; JSONObject jsonObject = new JSONObject(jsonString); String expectedXmlString = "two"; String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(true)); @@ -1193,7 +1191,7 @@ public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){ @Test public void shouldNotCreateExplicitEndTagWithEmptyValueWhenNotConfigured(){ - String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}"; + String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}"; JSONObject jsonObject = new JSONObject(jsonString); String expectedXmlString = "two"; String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(false)); diff --git a/src/test/resources/JSONArrayExpectedTestCaseForToJsonArrayTest.json b/src/test/resources/JSONArrayExpectedTestCaseForToJsonArrayTest.json deleted file mode 100644 index 6ce0864a2..000000000 --- a/src/test/resources/JSONArrayExpectedTestCaseForToJsonArrayTest.json +++ /dev/null @@ -1,91 +0,0 @@ -[ - "addresses", - { - "xsi:noNamespaceSchemaLocation": "test.xsd", - "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance" - }, - [ - "address", - { - "addrType": "my address" - }, - [ - "name", - { - "nameType": "my name" - }, - "Joe Tester" - ], - [ - "street", - "Baker street 5" - ], - [ - "NothingHere", - { - "except": "an attribute" - } - ], - [ - "TrueValue", - true - ], - [ - "FalseValue", - false - ], - [ - "NullValue", - null - ], - [ - "PositiveValue", - 42 - ], - [ - "NegativeValue", - -23 - ], - [ - "DoubleValue", - -23.45 - ], - [ - "Nan", - "-23x.45" - ], - [ - "ArrayOfNum", - [ - "value", - 1 - ], - [ - "value", - 2 - ], - [ - "value", - [ - "subValue", - { - "svAttr": "svValue" - }, - "abc" - ] - ], - [ - "value", - 3 - ], - [ - "value", - 4.1 - ], - [ - "value", - 5.2 - ] - ] - ] -] diff --git a/src/test/resources/XmlTestCaseTestToJsonArray.xml b/src/test/resources/XmlTestCaseTestToJsonArray.xml deleted file mode 100644 index dfcf9d90c..000000000 --- a/src/test/resources/XmlTestCaseTestToJsonArray.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - -
- Joe Tester - - - true - false - null - 42 - -23 - -23.45 - -23x.45 - - 1 - 2 - - abc - - 3 - 4.1 - 5.2 - -
- \ No newline at end of file From 61dc2644d823060ccc38a235bd2505acf81b4a7a Mon Sep 17 00:00:00 2001 From: Sean Leary Date: Sun, 3 Nov 2024 09:49:50 -0600 Subject: [PATCH 005/106] Revert "Merge pull request #886 from Simulant87/884-strictmode-javadoc" This reverts commit 8983ca6da195bd8b7eb9e6655e97a2490d4afa2e, reversing changes made to d02ac0f2a35f8c8ba56230bc4b67275010d4d617. --- src/main/java/org/json/JSONTokener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java index 46937e10a..078e01620 100644 --- a/src/main/java/org/json/JSONTokener.java +++ b/src/main/java/org/json/JSONTokener.java @@ -284,11 +284,10 @@ public char nextClean() throws JSONException { * Backslash processing is done. The formal JSON format does not * allow strings in single quotes, but an implementation is allowed to * accept them. - * If strictMode is true, this implementation will not accept unbalanced quotes (e.g will not accept "test'). + * If strictMode is true, this implementation will not accept unbalanced quotes (e.g will not accept "test') * @param quote The quoting character, either * " (double quote) or * ' (single quote). - * @param strictMode If true, this implementation will not accept unbalanced quotes (e.g will not accept "test'). * @return A String. * @throws JSONException Unterminated string or unbalanced quotes if strictMode == true. */ From 215ec9bb9c97ff84ba3913860a725a9b61463189 Mon Sep 17 00:00:00 2001 From: Sean Leary Date: Sun, 3 Nov 2024 09:50:08 -0600 Subject: [PATCH 006/106] Revert "Merge pull request #877 from rikkarth/feat/871-strictMode" This reverts commit d02ac0f2a35f8c8ba56230bc4b67275010d4d617, reversing changes made to cfd47615d0b9a2392945d198d7fd820bbbc17437. --- src/main/java/org/json/JSONArray.java | 139 +++----- src/main/java/org/json/JSONObject.java | 16 +- .../org/json/JSONParserConfiguration.java | 46 --- src/main/java/org/json/JSONTokener.java | 171 +++------- .../junit/JSONParserConfigurationTest.java | 184 +--------- src/test/resources/compliantJsonArray.json | 317 ------------------ 6 files changed, 109 insertions(+), 764 deletions(-) delete mode 100644 src/test/resources/compliantJsonArray.json diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java index ded271e17..df0b2994b 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/JSONArray.java @@ -75,31 +75,19 @@ public JSONArray() { } /** - * Constructs a JSONArray from a JSONTokener. - *

- * This constructor reads the JSONTokener to parse a JSON array. It uses the default JSONParserConfiguration. + * Construct a JSONArray from a JSONTokener. * - * @param x A JSONTokener - * @throws JSONException If there is a syntax error. + * @param x + * A JSONTokener + * @throws JSONException + * If there is a syntax error. */ public JSONArray(JSONTokener x) throws JSONException { - this(x, new JSONParserConfiguration()); - } - - /** - * Constructs a JSONArray from a JSONTokener and a JSONParserConfiguration. - * JSONParserConfiguration contains strictMode turned off (false) by default. - * - * @param x A JSONTokener instance from which the JSONArray is constructed. - * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser. - * @throws JSONException If a syntax error occurs during the construction of the JSONArray. - */ - public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException { this(); if (x.nextClean() != '[') { throw x.syntaxError("A JSONArray text must start with '['"); } - + char nextChar = x.nextClean(); if (nextChar == 0) { // array is unclosed. No ']' found, instead EOF @@ -113,34 +101,27 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) this.myArrayList.add(JSONObject.NULL); } else { x.back(); - this.myArrayList.add(x.nextValue(jsonParserConfiguration)); + this.myArrayList.add(x.nextValue()); } switch (x.nextClean()) { - case 0: + case 0: + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + case ',': + nextChar = x.nextClean(); + if (nextChar == 0) { // array is unclosed. No ']' found, instead EOF throw x.syntaxError("Expected a ',' or ']'"); - case ',': - nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar == ']') { - return; - } - x.back(); - break; - case ']': - if (jsonParserConfiguration.isStrictMode()) { - nextChar = x.nextClean(); - if (nextChar != 0) { - throw x.syntaxError("invalid character found after end of array: " + nextChar); - } - } - + } + if (nextChar == ']') { return; - default: - throw x.syntaxError("Expected a ',' or ']'"); + } + x.back(); + break; + case ']': + return; + default: + throw x.syntaxError("Expected a ',' or ']'"); } } } @@ -157,19 +138,7 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) * If there is a syntax error. */ public JSONArray(String source) throws JSONException { - this(new JSONTokener(source), new JSONParserConfiguration()); - } - - /** - * Constructs a JSONArray from a source JSON text and a JSONParserConfiguration. - * - * @param source A string that begins with [ (left bracket) and - * ends with ]  (right bracket). - * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser. - * @throws JSONException If there is a syntax error. - */ - public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException { - this(new JSONTokener(source), jsonParserConfiguration); + this(new JSONTokener(source)); } /** @@ -398,7 +367,7 @@ public Number getNumber(int index) throws JSONException { /** * Get the enum value associated with an index. - * + * * @param * Enum Type * @param clazz @@ -586,7 +555,7 @@ public String join(String separator) throws JSONException { if (len == 0) { return ""; } - + StringBuilder sb = new StringBuilder( JSONObject.valueToString(this.myArrayList.get(0))); @@ -900,7 +869,7 @@ public Integer optIntegerObject(int index, Integer defaultValue) { /** * Get the enum value associated with a key. - * + * * @param * Enum Type * @param clazz @@ -915,7 +884,7 @@ public > E optEnum(Class clazz, int index) { /** * Get the enum value associated with a key. - * + * * @param * Enum Type * @param clazz @@ -948,8 +917,8 @@ public > E optEnum(Class clazz, int index, E defaultValue) } /** - * Get the optional BigInteger value associated with an index. The - * defaultValue is returned if there is no value for the index, or if the + * Get the optional BigInteger value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the * value is not a number and cannot be converted to a number. * * @param index @@ -964,8 +933,8 @@ public BigInteger optBigInteger(int index, BigInteger defaultValue) { } /** - * Get the optional BigDecimal value associated with an index. The - * defaultValue is returned if there is no value for the index, or if the + * Get the optional BigDecimal value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the * value is not a number and cannot be converted to a number. If the value * is float or double, the {@link BigDecimal#BigDecimal(double)} * constructor will be used. See notes on the constructor for conversion @@ -1134,7 +1103,7 @@ public Number optNumber(int index, Number defaultValue) { if (val instanceof Number){ return (Number) val; } - + if (val instanceof String) { try { return JSONObject.stringToNumber((String) val); @@ -1211,7 +1180,7 @@ public JSONArray put(Collection value) { public JSONArray put(double value) throws JSONException { return this.put(Double.valueOf(value)); } - + /** * Append a float value. This increases the array's length by one. * @@ -1466,19 +1435,19 @@ public JSONArray put(int index, Object value) throws JSONException { * * @param collection * A Collection. - * @return this. + * @return this. */ public JSONArray putAll(Collection collection) { this.addAll(collection, false); return this; } - + /** * Put an Iterable's elements in to the JSONArray. * * @param iter * An Iterable. - * @return this. + * @return this. */ public JSONArray putAll(Iterable iter) { this.addAll(iter, false); @@ -1490,7 +1459,7 @@ public JSONArray putAll(Iterable iter) { * * @param array * A JSONArray. - * @return this. + * @return this. */ public JSONArray putAll(JSONArray array) { // directly copy the elements from the source array to this one @@ -1505,7 +1474,7 @@ public JSONArray putAll(JSONArray array) { * @param array * Array. If the parameter passed is null, or not an array or Iterable, an * exception will be thrown. - * @return this. + * @return this. * * @throws JSONException * If not an array, JSONArray, Iterable or if an value is non-finite number. @@ -1516,9 +1485,9 @@ public JSONArray putAll(Object array) throws JSONException { this.addAll(array, false); return this; } - + /** - * Creates a JSONPointer using an initialization string and tries to + * Creates a JSONPointer using an initialization string and tries to * match it to an item within this JSONArray. For example, given a * JSONArray initialized with this document: * 

@@ -1526,7 +1495,7 @@ public JSONArray putAll(Object array) throws JSONException {
      *     {"b":"c"}
      * ]
      *
- * and this JSONPointer string: + * and this JSONPointer string: * 
      * "/0/b"
      *
@@ -1539,9 +1508,9 @@ public JSONArray putAll(Object array) throws JSONException { public Object query(String jsonPointer) { return query(new JSONPointer(jsonPointer)); } - + /** - * Uses a user initialized JSONPointer and tries to + * Uses a user initialized JSONPointer and tries to * match it to an item within this JSONArray. For example, given a * JSONArray initialized with this document: * 
@@ -1549,7 +1518,7 @@ public Object query(String jsonPointer) {
      *     {"b":"c"}
      * ]
      *
- * and this JSONPointer: + * and this JSONPointer: * 
      * "/0/b"
      *
@@ -1562,11 +1531,11 @@ public Object query(String jsonPointer) { public Object query(JSONPointer jsonPointer) { return jsonPointer.queryFrom(this); } - + /** * Queries and returns a value from this object using {@code jsonPointer}, or * returns null if the query fails due to a missing key. - * + * * @param jsonPointer the string representation of the JSON pointer * @return the queried value or {@code null} * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax @@ -1574,11 +1543,11 @@ public Object query(JSONPointer jsonPointer) { public Object optQuery(String jsonPointer) { return optQuery(new JSONPointer(jsonPointer)); } - + /** * Queries and returns a value from this object using {@code jsonPointer}, or * returns null if the query fails due to a missing key. - * + * * @param jsonPointer The JSON pointer * @return the queried value or {@code null} * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax @@ -1698,11 +1667,11 @@ public String toString() { /** * Make a pretty-printed JSON text of this JSONArray. - * + * *

If 

 {@code indentFactor > 0}
and the {@link JSONArray} has only * one element, then the array will be output on a single line: * 
{@code [1]}
- * + * *

If an array has 2 or more elements, then it will be output across * multiple lines: 

{@code
      * [
@@ -1714,7 +1683,7 @@ public String toString() {
      * 

      * Warning: This method assumes that the data structure is acyclical.
      * 
-     *
+     * 
      * @param indentFactor
      *            The number of spaces to add to each level of indentation.
      * @return a printable, displayable, transmittable representation of the
@@ -1748,11 +1717,11 @@ public Writer write(Writer writer) throws JSONException {
 
     /**
      * Write the contents of the JSONArray as JSON text to a writer.
-     *
+     * 
      * 
If 
{@code indentFactor > 0}
 and the {@link JSONArray} has only
      * one element, then the array will be output on a single line:
      * 
{@code [1]}

-     *
+     * 
      * 
If an array has 2 or more elements, then it will be output across
      * multiple lines: 
{@code
      * [
@@ -1978,7 +1947,7 @@ private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserCo
                     "JSONArray initial value should be a string or collection or array.");
         }
     }
-
+    
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param idx index of the item
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 642e96703..26a68c6dc 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -220,12 +220,12 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
         for (;;) {
             c = x.nextClean();
             switch (c) {
-                case 0:
-                    throw x.syntaxError("A JSONObject text must end with '}'");
-                case '}':
-                    return;
-                default:
-                    key = x.nextSimpleValue(c, jsonParserConfiguration).toString();
+            case 0:
+                throw x.syntaxError("A JSONObject text must end with '}'");
+            case '}':
+                return;
+            default:
+                key = x.nextSimpleValue(c).toString();
             }
 
             // The key is followed by ':'.
@@ -244,7 +244,7 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
                     throw x.syntaxError("Duplicate key \"" + key + "\"");
                 }
 
-                Object value = x.nextValue(jsonParserConfiguration);
+                Object value = x.nextValue();
                 // Only add value if non-null
                 if (value != null) {
                     this.put(key, value);
@@ -1247,7 +1247,7 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
     static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue) {
         return objectToBigDecimal(val, defaultValue, true);
     }
-
+    
     /**
      * @param val value to convert
      * @param defaultValue default value to return is the conversion doesn't work or is null.
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index ad0d7fb72..190daeb88 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -4,25 +4,11 @@
  * Configuration object for the JSON parser. The configuration is immutable.
  */
 public class JSONParserConfiguration extends ParserConfiguration {
-
-    /** Original Configuration of the JSON Parser. */
-    public static final JSONParserConfiguration ORIGINAL = new JSONParserConfiguration();
-
-    /** Original configuration of the JSON Parser except that values are kept as strings. */
-    public static final JSONParserConfiguration KEEP_STRINGS = new JSONParserConfiguration().withKeepStrings(true);
-
     /**
      * Used to indicate whether to overwrite duplicate key or not.
      */
     private boolean overwriteDuplicateKey;
 
-    /**
-     * This flag, when set to true, instructs the parser to throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
-     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
-     */
-    private boolean strictMode;
-
     /**
      * Configuration with the default values.
      */
@@ -72,24 +58,6 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
         return clone;
     }
 
-
-    /**
-     * Sets the strict mode configuration for the JSON parser.
-     * 

-     * When strict mode is enabled, the parser will throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
-     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
-     *
-     * @param mode a boolean value indicating whether strict mode should be enabled or not
-     * @return a new JSONParserConfiguration instance with the updated strict mode setting
-     */
-    public JSONParserConfiguration withStrictMode(final boolean mode) {
-        JSONParserConfiguration clone = this.clone();
-        clone.strictMode = mode;
-
-        return clone;
-    }
-
     /**
      * The parser's behavior when meeting duplicate keys, controls whether the parser should
      * overwrite duplicate keys or not.
@@ -99,18 +67,4 @@ public JSONParserConfiguration withStrictMode(final boolean mode) {
     public boolean isOverwriteDuplicateKey() {
         return this.overwriteDuplicateKey;
     }
-
-
-    /**
-     * Retrieves the current strict mode setting of the JSON parser.
-     * 

-     * Strict mode, when enabled, instructs the parser to throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This ensures strict adherence to the JSON syntax, as
-     * any characters after the final closing bracket of a JSON array are considered invalid.
-     *
-     * @return the current strict mode setting. True if strict mode is enabled, false otherwise.
-     */
-    public boolean isStrictMode() {
-        return this.strictMode;
-    }
 }
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 078e01620..b8808bb4f 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -284,14 +284,13 @@ public char nextClean() throws JSONException {
      * Backslash processing is done. The formal JSON format does not
      * allow strings in single quotes, but an implementation is allowed to
      * accept them.
-     * If strictMode is true, this implementation will not accept unbalanced quotes (e.g will not accept "test')
      * @param quote The quoting character, either
      *      " (double quote) or
      *      ' (single quote).
-     * @return A String.
-     * @throws JSONException Unterminated string or unbalanced quotes if strictMode == true.
+     * @return      A String.
+     * @throws JSONException Unterminated string.
      */
-    public String nextString(char quote, boolean strictMode) throws JSONException {
+    public String nextString(char quote) throws JSONException {
         char c;
         StringBuilder sb = new StringBuilder();
         for (;;) {
@@ -339,21 +338,11 @@ public String nextString(char quote, boolean strictMode) throws JSONException {
                     throw this.syntaxError("Illegal escape. Escape sequence  \\" + c + " is not valid.");
                 }
                 break;
-                default:
-                    if (strictMode && c == '\"' && quote != c) {
-                        throw this.syntaxError(String.format(
-                            "Field contains unbalanced quotes. Starts with %s but ends with double quote.", quote));
-                    }
-
-                    if (strictMode && c == '\'' && quote != c) {
-                        throw this.syntaxError(String.format(
-                            "Field contains unbalanced quotes. Starts with %s but ends with single quote.", quote));
-                    }
-
-                    if (c == quote) {
-                        return sb.toString();
-                    }
-                    sb.append(c);
+            default:
+                if (c == quote) {
+                    return sb.toString();
+                }
+                sb.append(c);
             }
         }
     }
@@ -408,103 +397,51 @@ public String nextTo(String delimiters) throws JSONException {
 
 
     /**
-     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
-     * JSONObject.NULL object.
-     *
-     * @return An object.
+     * Get the next value. The value can be a Boolean, Double, Integer,
+     * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
      * @throws JSONException If syntax error.
-     */
-    public Object nextValue() throws JSONException {
-        return nextValue(new JSONParserConfiguration());
-    }
-
-    /**
-     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
-     * JSONObject.NULL object. The strictMode parameter controls the behavior of the method when parsing the value.
      *
-     * @param jsonParserConfiguration which carries options such as strictMode, these methods will
-     *                                strictly adhere to the JSON syntax, throwing a JSONException for any deviations.
      * @return An object.
-     * @throws JSONException If syntax error.
      */
-    public Object nextValue(JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+    public Object nextValue() throws JSONException {
         char c = this.nextClean();
         switch (c) {
-            case '{':
-                this.back();
-                try {
-                    return new JSONObject(this, jsonParserConfiguration);
-                } catch (StackOverflowError e) {
-                    throw new JSONException("JSON Array or Object depth too large to process.", e);
-                }
-            case '[':
-                this.back();
-                try {
-                    return new JSONArray(this);
-                } catch (StackOverflowError e) {
-                    throw new JSONException("JSON Array or Object depth too large to process.", e);
-                }
-            default:
-                return nextSimpleValue(c, jsonParserConfiguration);
-        }
-    }
-
-    /**
-     * This method is used to get a JSONObject from the JSONTokener. The strictMode parameter controls the behavior of
-     * the method when parsing the JSONObject.
-     *
-     * @param jsonParserConfiguration which carries options such as strictMode, these methods will
-     *                                strictly adhere to the JSON syntax, throwing a JSONException for any deviations.
-     *                                deviations.
-     * @return A JSONObject which is the next value in the JSONTokener.
-     * @throws JSONException If the JSONObject or JSONArray depth is too large to process.
-     */
-    private JSONObject getJsonObject(JSONParserConfiguration jsonParserConfiguration) {
-        try {
-            return new JSONObject(this, jsonParserConfiguration);
-        } catch (StackOverflowError e) {
-            throw new JSONException("JSON Array or Object depth too large to process.", e);
-        }
-    }
-
-    /**
-     * This method is used to get a JSONArray from the JSONTokener.
-     *
-     * @return A JSONArray which is the next value in the JSONTokener.
-     * @throws JSONException If the JSONArray depth is too large to process.
-     */
-    private JSONArray getJsonArray() {
-        try {
-            return new JSONArray(this);
-        } catch (StackOverflowError e) {
-            throw new JSONException("JSON Array or Object depth too large to process.", e);
+        case '{':
+            this.back();
+            try {
+                return new JSONObject(this);
+            } catch (StackOverflowError e) {
+                throw new JSONException("JSON Array or Object depth too large to process.", e);
+            }
+        case '[':
+            this.back();
+            try {
+                return new JSONArray(this);
+            } catch (StackOverflowError e) {
+                throw new JSONException("JSON Array or Object depth too large to process.", e);
+            }
         }
+        return nextSimpleValue(c);
     }
 
-    Object nextSimpleValue(char c, JSONParserConfiguration jsonParserConfiguration) {
-        boolean strictMode = jsonParserConfiguration.isStrictMode();
-
-        if(strictMode && c == '\''){
-            throw this.syntaxError("Single quote wrap not allowed in strict mode");
-        }
+    Object nextSimpleValue(char c) {
+        String string;
 
-        if (c == '"' || c == '\'') {
-            return this.nextString(c, strictMode);
+        switch (c) {
+        case '"':
+        case '\'':
+            return this.nextString(c);
         }
 
-        return parsedUnquotedText(c, strictMode);
-    }
+        /*
+         * Handle unquoted text. This could be the values true, false, or
+         * null, or it can be a number. An implementation (such as this one)
+         * is allowed to also accept non-standard forms.
+         *
+         * Accumulate characters until we reach the end of the text or a
+         * formatting character.
+         */
 
-    /**
-     * Parses unquoted text from the JSON input. This could be the values true, false, or null, or it can be a number.
-     * Non-standard forms are also accepted. Characters are accumulated until the end of the text or a formatting
-     * character is reached.
-     *
-     * @param c The starting character.
-     * @return The parsed object.
-     * @throws JSONException If the parsed string is empty.
-     */
-    private Object parsedUnquotedText(char c, boolean strictMode) {
         StringBuilder sb = new StringBuilder();
         while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
             sb.append(c);
@@ -514,37 +451,13 @@ private Object parsedUnquotedText(char c, boolean strictMode) {
             this.back();
         }
 
-        String string = sb.toString().trim();
-
-        if (strictMode) {
-            boolean isBooleanOrNumeric = checkIfValueIsBooleanOrNumeric(string);
-
-            if (isBooleanOrNumeric) {
-                return string;
-            }
-
-            throw new JSONException(String.format("Value is not surrounded by quotes: %s", string));
-        }
-
-        if (string.isEmpty()) {
+        string = sb.toString().trim();
+        if ("".equals(string)) {
             throw this.syntaxError("Missing value");
         }
         return JSONObject.stringToValue(string);
     }
 
-    private boolean checkIfValueIsBooleanOrNumeric(Object valueToValidate) {
-        String stringToValidate = valueToValidate.toString();
-        if (stringToValidate.equals("true") || stringToValidate.equals("false")) {
-            return true;
-        }
-
-        try {
-            Double.parseDouble(stringToValidate);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
 
     /**
      * Skip characters until the next character is the requested character.
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index a1838a4ee..509b98879 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -1,24 +1,14 @@
 package org.json.junit;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONParserConfiguration;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 public class JSONParserConfigurationTest {
-
     private static final String TEST_SOURCE = "{\"key\": \"value1\", \"key\": \"value2\"}";
 
     @Test(expected = JSONException.class)
@@ -29,162 +19,16 @@ public void testThrowException() {
     @Test
     public void testOverwrite() {
         JSONObject jsonObject = new JSONObject(TEST_SOURCE,
-            new JSONParserConfiguration().withOverwriteDuplicateKey(true));
+                new JSONParserConfiguration().withOverwriteDuplicateKey(true));
 
         assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));
     }
 
-    @Test
-    public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        List strictModeInputTestCases = getNonCompliantJSONList();
-
-        strictModeInputTestCases.forEach(
-            testCase -> assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class,
-                () -> new JSONArray(testCase, jsonParserConfiguration)));
-    }
-
-    @Test
-    public void givenCompliantJSONArrayFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
-        try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonArray.json"))) {
-            String compliantJsonArrayAsString = lines.collect(Collectors.joining());
-            JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
-
-            new JSONArray(compliantJsonArrayAsString, jsonParserConfiguration);
-        }
-
-    }
-
-    @Test
-    public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(false);
-
-        List strictModeInputTestCases = getNonCompliantJSONList();
-
-        strictModeInputTestCases.forEach(testCase -> new JSONArray(testCase, jsonParserConfiguration));
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        String testCase = "[1,2];[3,4]";
-
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-            JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
-        assertEquals("invalid character found after end of array: ; at 6 [character 7 line 1]", je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        String testCase = "[\"1\",\"2\"];[3,4]";
-
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-            JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
-        assertEquals("invalid character found after end of array: ; at 10 [character 11 line 1]", je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        String testCase = "[{\"test\": implied}]";
-
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-            JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
-        assertEquals("Value is not surrounded by quotes: implied", je.getMessage());
-    }
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeFalse_shouldNotThrowAnyException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(false);
-
-        String testCase = "[{\"test\": implied}]";
-
-        new JSONArray(testCase, jsonParserConfiguration);
-    }
-
-    @Test
-    public void givenNonCompliantQuotes_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        String testCaseOne = "[\"abc', \"test\"]";
-        String testCaseTwo = "['abc\", \"test\"]";
-        String testCaseThree = "['abc']";
-        String testCaseFour = "[{'testField': \"testValue\"}]";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
-        JSONException jeThree = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseThree, jsonParserConfiguration));
-        JSONException jeFour = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseFour, jsonParserConfiguration));
-
-        assertEquals(
-            "Field contains unbalanced quotes. Starts with \" but ends with single quote. at 6 [character 7 line 1]",
-            jeOne.getMessage());
-        assertEquals(
-            "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
-            jeTwo.getMessage());
-        assertEquals(
-            "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
-            jeThree.getMessage());
-        assertEquals(
-            "Single quote wrap not allowed in strict mode at 3 [character 4 line 1]",
-            jeFour.getMessage());
-    }
-
-    @Test
-    public void givenUnbalancedQuotes_testStrictModeFalse_shouldThrowJsonException() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(false);
-
-        String testCaseOne = "[\"abc', \"test\"]";
-        String testCaseTwo = "['abc\", \"test\"]";
-
-        JSONException jeOne = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseOne, jsonParserConfiguration));
-        JSONException jeTwo = assertThrows(JSONException.class,
-            () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
-
-        assertEquals("Expected a ',' or ']' at 10 [character 11 line 1]", jeOne.getMessage());
-        assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
-    }
-
-
-    @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withStrictMode(true);
-
-        String testCase = "[{test: implied}]";
-        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
-            JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
-        assertEquals(String.format("Value is not surrounded by quotes: %s", "test"), je.getMessage());
-    }
-
     @Test
     public void verifyDuplicateKeyThenMaxDepth() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withOverwriteDuplicateKey(true)
-            .withMaxNestingDepth(42);
+                .withOverwriteDuplicateKey(true)
+                .withMaxNestingDepth(42);
 
         assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
         assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
@@ -193,28 +37,10 @@ public void verifyDuplicateKeyThenMaxDepth() {
     @Test
     public void verifyMaxDepthThenDuplicateKey() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-            .withMaxNestingDepth(42)
-            .withOverwriteDuplicateKey(true);
+                .withMaxNestingDepth(42)
+                .withOverwriteDuplicateKey(true);
 
         assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
         assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
     }
-
-    /**
-     * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
-     * this class.
-     *
-     * @return List with JSON strings.
-     */
-    private List getNonCompliantJSONList() {
-        return Arrays.asList(
-            "[1,2];[3,4]",
-            "[test]",
-            "[{'testSingleQuote': 'testSingleQuote'}]",
-            "[1, 2,3]:[4,5]",
-            "[{test: implied}]",
-            "[{\"test\": implied}]",
-            "[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]",
-            "[{test: \"implied\"}]");
-    }
 }
diff --git a/src/test/resources/compliantJsonArray.json b/src/test/resources/compliantJsonArray.json
deleted file mode 100644
index c37369027..000000000
--- a/src/test/resources/compliantJsonArray.json
+++ /dev/null
@@ -1,317 +0,0 @@
-[
-  {
-    "_id": "6606c27d2ab4a0102d49420a",
-    "index": 0,
-    "guid": "441331fb-84d1-4873-a649-3814621a0370",
-    "isActive": true,
-    "balance": "$2,691.63",
-    "picture": "http://example.abc/32x32",
-    "age": 26,
-    "eyeColor": "blue",
-    "name": "abc",
-    "gender": "female",
-    "company": "example",
-    "email": "abc@def.com",
-    "phone": "+1 (123) 456-7890",
-    "address": "123 Main St",
-    "about": "Laborum magna tempor officia irure cillum nulla incididunt Lorem dolor veniam elit cupidatat amet. Veniam veniam exercitation nulla consectetur officia esse ex sunt nulla nisi ea cillum nisi reprehenderit. Qui aliquip reprehenderit aliqua aliquip aliquip anim sit magna nostrud dolore veniam velit elit aliquip.\r\n",
-    "registered": "2016-07-22T03:18:11 -01:00",
-    "latitude": -21.544934,
-    "longitude": 72.765495,
-    "tags": [
-      "consectetur",
-      "minim",
-      "sunt",
-      "in",
-      "ut",
-      "velit",
-      "anim"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "abc def"
-      },
-      {
-        "id": 1,
-        "name": "ghi jkl"
-      },
-      {
-        "id": 2,
-        "name": "mno pqr"
-      }
-    ],
-    "greeting": "Hello, abc! You have 10 unread messages.",
-    "favoriteFruit": "banana"
-  },
-  {
-    "_id": "6606c27d0a45df5121fb765f",
-    "index": 1,
-    "guid": "fd774715-de85-44b9-b498-c214d8f68d9f",
-    "isActive": true,
-    "balance": "$2,713.96",
-    "picture": "http://placehold.it/32x32",
-    "age": 27,
-    "eyeColor": "green",
-    "name": "def",
-    "gender": "female",
-    "company": "sample",
-    "email": "def@abc.com",
-    "phone": "+1 (123) 456-78910",
-    "address": "1234 Main St",
-    "about": "Ea id cupidatat eiusmod culpa. Nulla consequat esse elit enim et pariatur eiusmod ipsum. Consequat eu non reprehenderit in.\r\n",
-    "registered": "2015-04-06T07:54:22 -01:00",
-    "latitude": 83.512347,
-    "longitude": -9.368739,
-    "tags": [
-      "excepteur",
-      "non",
-      "nostrud",
-      "laboris",
-      "laboris",
-      "qui",
-      "aute"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "sample example"
-      },
-      {
-        "id": 1,
-        "name": "test name"
-      },
-      {
-        "id": 2,
-        "name": "aaa aaaa"
-      }
-    ],
-    "greeting": "Hello, test! You have 7 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27dfb3a0e4e7e7183d3",
-    "index": 2,
-    "guid": "688b0c36-98e0-4ee7-86b8-863638d79b5f",
-    "isActive": false,
-    "balance": "$3,514.35",
-    "picture": "http://placehold.it/32x32",
-    "age": 32,
-    "eyeColor": "green",
-    "name": "test",
-    "gender": "female",
-    "company": "test",
-    "email": "test@test.com",
-    "phone": "+1 (123) 456-7890",
-    "address": "123 Main St",
-    "about": "Mollit officia adipisicing ex nisi non Lorem sunt quis est. Irure exercitation duis ipsum qui ullamco eu ea commodo occaecat minim proident. Incididunt nostrud ex cupidatat eiusmod mollit anim irure culpa. Labore voluptate voluptate labore nisi sit eu. Dolor sit proident velit dolor deserunt labore sit ipsum incididunt eiusmod reprehenderit voluptate. Duis anim velit officia laboris consequat officia dolor sint dolor nisi ex.\r\n",
-    "registered": "2021-11-02T12:50:05 -00:00",
-    "latitude": -82.969939,
-    "longitude": 86.415645,
-    "tags": [
-      "aliquip",
-      "et",
-      "est",
-      "nulla",
-      "nulla",
-      "tempor",
-      "adipisicing"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, test! You have 1 unread messages.",
-    "favoriteFruit": "strawberry"
-  },
-  {
-    "_id": "6606c27d204bc2327fc9ba23",
-    "index": 3,
-    "guid": "be970cba-306e-4cbd-be08-c265a43a61fa",
-    "isActive": true,
-    "balance": "$3,691.63",
-    "picture": "http://placehold.it/32x32",
-    "age": 35,
-    "eyeColor": "brown",
-    "name": "another test",
-    "gender": "male",
-    "company": "TEST",
-    "email": "anothertest@anothertest.com",
-    "phone": "+1 (321) 987-6543",
-    "address": "123 Example Main St",
-    "about": "Do proident consectetur minim quis. In adipisicing culpa Lorem fugiat cillum exercitation velit velit. Non voluptate laboris deserunt veniam et sint consectetur irure aliqua quis eiusmod consectetur elit id. Ex sint do anim Lorem excepteur eu nulla.\r\n",
-    "registered": "2020-06-25T04:55:25 -01:00",
-    "latitude": 63.614955,
-    "longitude": -109.299405,
-    "tags": [
-      "irure",
-      "esse",
-      "non",
-      "mollit",
-      "laborum",
-      "adipisicing",
-      "ad"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, another test! You have 5 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27df63eb5f390cb9989",
-    "index": 4,
-    "guid": "2c3e5115-758d-468e-99c5-c9afa26e1f9f",
-    "isActive": true,
-    "balance": "$1,047.20",
-    "picture": "http://test.it/32x32",
-    "age": 30,
-    "eyeColor": "green",
-    "name": "Test Name",
-    "gender": "female",
-    "company": "test",
-    "email": "testname@testname.com",
-    "phone": "+1 (999) 999-9999",
-    "address": "999 Test Main St",
-    "about": "Voluptate exercitation tempor consectetur velit magna ea occaecat cupidatat consectetur anim aute. Aliquip est aute ipsum laboris non irure qui consectetur tempor quis do ea Lorem. Cupidatat exercitation ad culpa aliqua amet commodo mollit reprehenderit exercitation adipisicing amet et laborum pariatur.\r\n",
-    "registered": "2023-01-19T02:43:18 -00:00",
-    "latitude": 14.15208,
-    "longitude": 170.411535,
-    "tags": [
-      "dolor",
-      "qui",
-      "cupidatat",
-      "aliqua",
-      "laboris",
-      "reprehenderit",
-      "sint"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, test! You have 6 unread messages.",
-    "favoriteFruit": "apple"
-  },
-  {
-    "_id": "6606c27d01d19fa29853d59c",
-    "index": 5,
-    "guid": "816cda74-5d4b-498f-9724-20f340d5f5bf",
-    "isActive": false,
-    "balance": "$2,628.74",
-    "picture": "http://testing.it/32x32",
-    "age": 28,
-    "eyeColor": "green",
-    "name": "Testing",
-    "gender": "female",
-    "company": "test",
-    "email": "testing@testing.com",
-    "phone": "+1 (888) 888-8888",
-    "address": "123 Main St",
-    "about": "Cupidatat non ut nulla qui excepteur in minim non et nulla fugiat. Dolor quis laborum occaecat veniam dolor ullamco deserunt amet veniam dolor quis proident tempor laboris. In cillum duis ut quis. Aliqua cupidatat magna proident velit tempor veniam et consequat laborum ex dolore qui. Incididunt deserunt magna minim Lorem consectetur.\r\n",
-    "registered": "2017-10-14T11:14:08 -01:00",
-    "latitude": -5.345728,
-    "longitude": -9.706491,
-    "tags": [
-      "officia",
-      "velit",
-      "laboris",
-      "qui",
-      "cupidatat",
-      "cupidatat",
-      "ad"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "test"
-      },
-      {
-        "id": 1,
-        "name": "sample"
-      },
-      {
-        "id": 2,
-        "name": "example"
-      }
-    ],
-    "greeting": "Hello, testing! You have 2 unread messages.",
-    "favoriteFruit": "strawberry"
-  },
-  {
-    "_id": "6606c27d803003cede1d6deb",
-    "index": 6,
-    "guid": "4ee550bc-0920-4104-b3ce-ebf9db6a803f",
-    "isActive": true,
-    "balance": "$1,709.31",
-    "picture": "http://sample.it/32x32",
-    "age": 31,
-    "eyeColor": "blue",
-    "name": "Sample Name",
-    "gender": "female",
-    "company": "Sample",
-    "email": "sample@sample.com",
-    "phone": "+1 (777) 777-7777",
-    "address": "123 Main St",
-    "about": "Lorem ex proident ipsum ullamco velit sit nisi eiusmod cillum. Id tempor irure culpa nisi sit non qui veniam non ut. Aliquip reprehenderit excepteur mollit quis excepteur ex sit. Quis do eu veniam do ullamco occaecat eu cupidatat nisi laborum tempor minim fugiat pariatur. Ex in nulla ex velit.\r\n",
-    "registered": "2019-04-08T03:54:36 -01:00",
-    "latitude": -70.660321,
-    "longitude": 71.547525,
-    "tags": [
-      "consequat",
-      "veniam",
-      "pariatur",
-      "aliqua",
-      "cillum",
-      "eu",
-      "officia"
-    ],
-    "friends": [
-      {
-        "id": 0,
-        "name": "Test"
-      },
-      {
-        "id": 1,
-        "name": "Sample"
-      },
-      {
-        "id": 2,
-        "name": "Example"
-      }
-    ],
-    "greeting": "Hello, Sample! You have 6 unread messages.",
-    "favoriteFruit": "apple"
-  }
-]
\ No newline at end of file

From 1f308db7c48048e15c9953ebd6499c84dc135f3b Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sat, 14 Dec 2024 10:01:27 -0600
Subject: [PATCH 007/106] restore-jsonparserconfiguration: Restore methods to
 be used for strict mode

---
 src/main/java/org/json/JSONArray.java         | 61 +++++++++++++------
 .../org/json/JSONParserConfiguration.java     | 36 +++++++++++
 2 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 87bd99bc6..fe56b50e9 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -83,11 +83,22 @@ public JSONArray() {
      *             If there is a syntax error.
      */
     public JSONArray(JSONTokener x) throws JSONException {
+        this(x, new JSONParserConfiguration());
+    }
+
+    /**
+     * Constructs a JSONArray from a JSONTokener and a JSONParserConfiguration.
+     *
+     * @param x                       A JSONTokener instance from which the JSONArray is constructed.
+     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
+     * @throws JSONException If a syntax error occurs during the construction of the JSONArray.
+     */
+    public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
         if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
-        
+
         char nextChar = x.nextClean();
         if (nextChar == 0) {
             // array is unclosed. No ']' found, instead EOF
@@ -104,27 +115,28 @@ public JSONArray(JSONTokener x) throws JSONException {
                     this.myArrayList.add(x.nextValue());
                 }
                 switch (x.nextClean()) {
-                case 0:
-                    // array is unclosed. No ']' found, instead EOF
-                    throw x.syntaxError("Expected a ',' or ']'");
-                case ',':
-                    nextChar = x.nextClean();
-                    if (nextChar == 0) {
+                    case 0:
                         // array is unclosed. No ']' found, instead EOF
                         throw x.syntaxError("Expected a ',' or ']'");
-                    }
-                    if (nextChar == ']') {
+                    case ',':
+                        nextChar = x.nextClean();
+                        if (nextChar == 0) {
+                            // array is unclosed. No ']' found, instead EOF
+                            throw x.syntaxError("Expected a ',' or ']'");
+                        }
+                        if (nextChar == ']') {
+                            return;
+                        }
+                        x.back();
+                        break;
+                    case ']':
                         return;
-                    }
-                    x.back();
-                    break;
-                case ']':
-                    return;
-                default:
-                    throw x.syntaxError("Expected a ',' or ']'");
+                    default:
+                        throw x.syntaxError("Expected a ',' or ']'");
                 }
             }
         }
+
     }
 
     /**
@@ -138,7 +150,22 @@ public JSONArray(JSONTokener x) throws JSONException {
      *             If there is a syntax error.
      */
     public JSONArray(String source) throws JSONException {
-        this(new JSONTokener(source));
+        this(source, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONArray from a source JSON text.
+     *
+     * @param source
+     *            A string that begins with [ (left
+     *            bracket) and ends with ]
+     *             (right bracket).
+     * @param jsonParserConfiguration the parser config object
+     * @throws JSONException
+     *             If there is a syntax error.
+     */
+    public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        this(new JSONTokener(source), jsonParserConfiguration);
     }
 
     /**
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 190daeb88..46996cbd3 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -17,6 +17,12 @@ public JSONParserConfiguration() {
         this.overwriteDuplicateKey = false;
     }
 
+    /**
+     * This flag, when set to true, instructs the parser to enforce strict mode when parsing JSON text.
+     * Garbage chars at the end of the doc, unquoted string, and single-quoted strings are all disallowed.
+     */
+    private boolean strictMode;
+
     @Override
     protected JSONParserConfiguration clone() {
         JSONParserConfiguration clone = new JSONParserConfiguration();
@@ -58,6 +64,23 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
         return clone;
     }
 
+    /**
+     * Sets the strict mode configuration for the JSON parser.
+     * 

+     * When strict mode is enabled, the parser will throw a JSONException if it encounters an invalid character
+     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
+     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
+     *
+     * @param mode a boolean value indicating whether strict mode should be enabled or not
+     * @return a new JSONParserConfiguration instance with the updated strict mode setting
+     */
+    public JSONParserConfiguration withStrictMode(final boolean mode) {
+        JSONParserConfiguration clone = this.clone();
+        clone.strictMode = mode;
+
+        return clone;
+    }
+
     /**
      * The parser's behavior when meeting duplicate keys, controls whether the parser should
      * overwrite duplicate keys or not.
@@ -67,4 +90,17 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
     public boolean isOverwriteDuplicateKey() {
         return this.overwriteDuplicateKey;
     }
+
+    /**
+     * Retrieves the current strict mode setting of the JSON parser.
+     * 

+     * Strict mode, when enabled, instructs the parser to throw a JSONException if it encounters an invalid character
+     * immediately following the final ']' character in the input. This ensures strict adherence to the JSON syntax, as
+     * any characters after the final closing bracket of a JSON array are considered invalid.
+     *
+     * @return the current strict mode setting. True if strict mode is enabled, false otherwise.
+     */
+    public boolean isStrictMode() {
+        return this.strictMode;
+    }
 }

From 80b2672f77d78598186982394479ac68497c0f56 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sat, 14 Dec 2024 10:07:26 -0600
Subject: [PATCH 008/106] restore-jsonparserconfiguration: clean up some
 whitespace

---
 src/main/java/org/json/JSONArray.java | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index fe56b50e9..5b3cb2bdc 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -115,24 +115,24 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                     this.myArrayList.add(x.nextValue());
                 }
                 switch (x.nextClean()) {
-                    case 0:
+                case 0:
+                    // array is unclosed. No ']' found, instead EOF
+                    throw x.syntaxError("Expected a ',' or ']'");
+                case ',':
+                    nextChar = x.nextClean();
+                    if (nextChar == 0) {
                         // array is unclosed. No ']' found, instead EOF
                         throw x.syntaxError("Expected a ',' or ']'");
-                    case ',':
-                        nextChar = x.nextClean();
-                        if (nextChar == 0) {
-                            // array is unclosed. No ']' found, instead EOF
-                            throw x.syntaxError("Expected a ',' or ']'");
-                        }
-                        if (nextChar == ']') {
-                            return;
-                        }
-                        x.back();
-                        break;
-                    case ']':
+                    }
+                    if (nextChar == ']') {
                         return;
-                    default:
-                        throw x.syntaxError("Expected a ',' or ']'");
+                    }
+                    x.back();
+                    break;
+                case ']':
+                    return;
+                default:
+                    throw x.syntaxError("Expected a ',' or ']'");
                 }
             }
         }

From 1f0729cadbae625344ed49cf71425d15a62e3aad Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sat, 14 Dec 2024 14:40:40 -0600
Subject: [PATCH 009/106] restore-jsonparserconfiguration: strict mode initial
 attempt. Still missing all JSONObject test cases and strict mode sanity
 check. Might be able to simplify implementation a bit more

---
 src/main/java/org/json/JSONArray.java         |  31 +-
 src/main/java/org/json/JSONObject.java        |  17 +
 src/main/java/org/json/JSONTokener.java       |  33 +-
 .../junit/JSONParserConfigurationTest.java    | 287 +++++++++++++++-
 src/test/resources/compliantJsonArray.json    | 317 ++++++++++++++++++
 5 files changed, 679 insertions(+), 6 deletions(-)
 create mode 100644 src/test/resources/compliantJsonArray.json

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 5b3cb2bdc..759acd7a4 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -67,6 +67,10 @@ public class JSONArray implements Iterable {
      */
     private final ArrayList myArrayList;
 
+    private JSONTokener jsonTokener;
+
+    private JSONParserConfiguration jsonParserConfiguration;
+
     /**
      * Construct an empty JSONArray.
      */
@@ -95,6 +99,15 @@ public JSONArray(JSONTokener x) throws JSONException {
      */
     public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
+
+        if (this.jsonParserConfiguration == null) {
+            this.jsonParserConfiguration = jsonParserConfiguration;
+        }
+        if (this.jsonTokener == null) {
+            this.jsonTokener = x;
+            this.jsonTokener.setJsonParserConfiguration(this.jsonParserConfiguration);
+        }
+
         if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
@@ -125,6 +138,9 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                         throw x.syntaxError("Expected a ',' or ']'");
                     }
                     if (nextChar == ']') {
+                        if (jsonParserConfiguration.isStrictMode()) {
+                            throw x.syntaxError("Expected another array element");
+                        }
                         return;
                     }
                     x.back();
@@ -136,7 +152,6 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                 }
             }
         }
-
     }
 
     /**
@@ -151,6 +166,13 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
      */
     public JSONArray(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
+        if (this.jsonParserConfiguration.isStrictMode()) {
+                char c = jsonTokener.nextClean();
+                if (c != 0) {
+                    throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
+
+            }
+        }
     }
 
     /**
@@ -166,6 +188,13 @@ public JSONArray(String source) throws JSONException {
      */
     public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this(new JSONTokener(source), jsonParserConfiguration);
+        if (this.jsonParserConfiguration.isStrictMode()) {
+            char c = jsonTokener.nextClean();
+            if (c != 0) {
+                throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
+
+            }
+        }
     }
 
     /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 26a68c6dc..47d263a2c 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -152,6 +152,10 @@ public Class getMapType() {
      */
     public static final Object NULL = new Null();
 
+    private JSONTokener jsonTokener;
+
+    private JSONParserConfiguration jsonParserConfiguration;
+
     /**
      * Construct an empty JSONObject.
      */
@@ -211,6 +215,15 @@ public JSONObject(JSONTokener x) throws JSONException {
      */
     public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
+
+        if (this.jsonParserConfiguration == null) {
+            this.jsonParserConfiguration = jsonParserConfiguration;
+        }
+        if (this.jsonTokener == null) {
+            this.jsonTokener = x;
+            this.jsonTokener.setJsonParserConfiguration(this.jsonParserConfiguration);
+        }
+
         char c;
         String key;
 
@@ -433,6 +446,10 @@ public JSONObject(Object object, String ... names) {
      */
     public JSONObject(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
+        if (this.jsonParserConfiguration.isStrictMode() &&
+                this.jsonTokener.nextClean() != 0) {
+            throw new JSONException("Unparsed characters found at end of input text");
+        }
     }
 
     /**
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index b8808bb4f..2fcc24a50 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -32,6 +32,7 @@ public class JSONTokener {
     /** the number of characters read in the previous line. */
     private long characterPreviousLine;
 
+    private JSONParserConfiguration jsonParserConfiguration;
 
     /**
      * Construct a JSONTokener from a Reader. The caller must close the Reader.
@@ -70,6 +71,21 @@ public JSONTokener(String s) {
         this(new StringReader(s));
     }
 
+    /**
+     * Getter
+     * @return jsonParserConfiguration
+     */
+    public JSONParserConfiguration getJsonParserConfiguration() {
+        return jsonParserConfiguration;
+    }
+
+    /**
+     * Setter
+     * @param jsonParserConfiguration new value for jsonParserConfiguration
+     */
+    public void setJsonParserConfiguration(JSONParserConfiguration jsonParserConfiguration) {
+        this.jsonParserConfiguration = jsonParserConfiguration;
+    }
 
     /**
      * Back up one character. This provides a sort of lookahead capability,
@@ -409,14 +425,14 @@ public Object nextValue() throws JSONException {
         case '{':
             this.back();
             try {
-                return new JSONObject(this);
+                return new JSONObject(this, jsonParserConfiguration);
             } catch (StackOverflowError e) {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
         case '[':
             this.back();
             try {
-                return new JSONArray(this);
+                return new JSONArray(this, jsonParserConfiguration);
             } catch (StackOverflowError e) {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
@@ -427,6 +443,11 @@ public Object nextValue() throws JSONException {
     Object nextSimpleValue(char c) {
         String string;
 
+        if (jsonParserConfiguration != null &&
+                jsonParserConfiguration.isStrictMode() &&
+                c == '\'') {
+            throw this.syntaxError("Single quote wrap not allowed in strict mode");
+        }
         switch (c) {
         case '"':
         case '\'':
@@ -455,7 +476,13 @@ Object nextSimpleValue(char c) {
         if ("".equals(string)) {
             throw this.syntaxError("Missing value");
         }
-        return JSONObject.stringToValue(string);
+        Object obj = JSONObject.stringToValue(string);
+        if (jsonParserConfiguration != null &&
+                jsonParserConfiguration.isStrictMode() &&
+                obj instanceof String) {
+            throw this.syntaxError(String.format("Value '%s' is not surrounded by quotes", obj));
+        }
+        return obj;
     }
 
 
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 509b98879..dbe436a4f 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -1,12 +1,21 @@
 package org.json.junit;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONParserConfiguration;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.*;
 
 public class JSONParserConfigurationTest {
     private static final String TEST_SOURCE = "{\"key\": \"value1\", \"key\": \"value2\"}";
@@ -43,4 +52,278 @@ public void verifyMaxDepthThenDuplicateKey() {
         assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
         assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
     }
+
+    @Test
+    public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        List strictModeInputTestCases = getNonCompliantJSONList();
+
+        // this is a lot easier to debug when things stop working
+        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
+            String testCase = strictModeInputTestCases.get(i);
+            try {
+                JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+                String s = jsonArray.toString();
+                System.out.println("Expected an exception, but got: " + s + " Noncompliant Array index: " + i);
+            } catch (Exception e) {
+                // its all good
+            }
+        }
+    }
+
+    @Test
+    public void givenEmptyArray_testStrictModeTrue_shouldNotThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[]";
+
+        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+
+        assertEquals(testCase, jsonArray.toString());
+    }
+
+    @Test
+    public void givenValidDoubleArray_testStrictModeTrue_shouldNotThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[[\"c\"], [10.2], [true, false, true]]";
+
+        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+        JSONArray arrayShouldContainStringAt0 = jsonArray.getJSONArray(0);
+        JSONArray arrayShouldContainNumberAt0 = jsonArray.getJSONArray(1);
+        JSONArray arrayShouldContainBooleanAt0 = jsonArray.getJSONArray(2);
+
+        assertTrue(arrayShouldContainStringAt0.get(0) instanceof String);
+        assertTrue(arrayShouldContainNumberAt0.get(0) instanceof Number);
+        assertTrue(arrayShouldContainBooleanAt0.get(0) instanceof Boolean);
+    }
+
+    @Test
+    public void givenValidEmptyArrayInsideArray_testStrictModeTrue_shouldNotThrowJsonException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[[]]";
+
+        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+
+        assertEquals(testCase, jsonArray.toString());
+    }
+
+    @Test
+    public void givenValidEmptyArrayInsideArray_testStrictModeFalse_shouldNotThrowJsonException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        String testCase = "[[]]";
+
+        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+
+        assertEquals(testCase, jsonArray.toString());
+    }
+
+    @Test
+    public void givenInvalidString_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[badString]";
+
+        JSONException je = assertThrows(JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
+
+        assertEquals("Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]", je.getMessage());
+    }
+
+    @Test
+    public void allowNullInStrictMode() {
+        String expected = "[null]";
+        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
+        assertEquals(expected, jsonArray.toString());
+    }
+
+    @Test
+    public void shouldHandleNumericArray() {
+        String expected = "[10]";
+        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
+        assertEquals(expected, jsonArray.toString());
+    }
+
+    @Test
+    public void givenCompliantJSONArrayFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
+        try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonArray.json"))) {
+            String compliantJsonArrayAsString = lines.collect(Collectors.joining());
+            JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                    .withStrictMode(true);
+
+            new JSONArray(compliantJsonArrayAsString, jsonParserConfiguration);
+        }
+
+    }
+
+    @Test
+    public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        List strictModeInputTestCases = getNonCompliantJSONList();
+
+        // this is a lot easier to debug when things stop working
+        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
+            String testCase = strictModeInputTestCases.get(i);
+            try {
+                JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+            } catch (Exception e) {
+                System.out.println("Unexpected exception: " + e.getMessage() + " Noncompliant Array index: " + i);
+            }
+        }
+        strictModeInputTestCases.forEach(testCase -> new JSONArray(testCase, jsonParserConfiguration));
+    }
+
+    @Test
+    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[1,2];[3,4]";
+
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
+
+        assertEquals("invalid character ';' found after end of array at 6 [character 7 line 1]", je.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[\"1\",\"2\"];[3,4]";
+
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
+
+        assertEquals("invalid character ';' found after end of array at 10 [character 11 line 1]", je.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[{\"test\": implied}]";
+
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
+
+        assertEquals("Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]", je.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputArray_testStrictModeFalse_shouldNotThrowAnyException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        String testCase = "[{\"test\": implied}]";
+
+        new JSONArray(testCase, jsonParserConfiguration);
+    }
+
+    @Test
+    public void givenNonCompliantQuotes_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCaseOne = "[\"abc', \"test\"]";
+        String testCaseTwo = "['abc\", \"test\"]";
+        String testCaseThree = "['abc']";
+        String testCaseFour = "[{'testField': \"testValue\"}]";
+
+        JSONException jeOne = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseOne, jsonParserConfiguration));
+        JSONException jeTwo = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
+        JSONException jeThree = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseThree, jsonParserConfiguration));
+        JSONException jeFour = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseFour, jsonParserConfiguration));
+
+        assertEquals(
+                "Expected a ',' or ']' at 10 [character 11 line 1]",
+                jeOne.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                jeTwo.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                jeThree.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 3 [character 4 line 1]",
+                jeFour.getMessage());
+    }
+
+    @Test
+    public void givenUnbalancedQuotes_testStrictModeFalse_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        String testCaseOne = "[\"abc', \"test\"]";
+        String testCaseTwo = "['abc\", \"test\"]";
+
+        JSONException jeOne = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseOne, jsonParserConfiguration));
+        JSONException jeTwo = assertThrows(JSONException.class,
+                () -> new JSONArray(testCaseTwo, jsonParserConfiguration));
+
+        assertEquals("Expected a ',' or ']' at 10 [character 11 line 1]", jeOne.getMessage());
+        assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
+    }
+
+
+    @Test
+    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "[{test: implied}]";
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
+
+        assertEquals("Value 'test' is not surrounded by quotes at 6 [character 7 line 1]", je.getMessage());
+    }
+
+    /**
+     * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
+     * this class.
+     *
+     * @return List with JSON strings.
+     */
+    private List getNonCompliantJSONList() {
+        return Arrays.asList(
+                "[1],",
+                "[1,]",
+                "[[1],\"sa\",[2]]a",
+                "[1],\"dsa\": \"test\"",
+                "[[a]]",
+                "[]asdf",
+                "[]]",
+                "[]}",
+                "[][",
+                "[]{",
+                "[],",
+                "[]:",
+                "[],[",
+                "[],{",
+                "[1,2];[3,4]",
+                "[test]",
+                "[{'testSingleQuote': 'testSingleQuote'}]",
+                "[1, 2,3]:[4,5]",
+                "[{test: implied}]",
+                "[{\"test\": implied}]",
+                "[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]",
+                "[{test: \"implied\"}]");
+    }
 }
diff --git a/src/test/resources/compliantJsonArray.json b/src/test/resources/compliantJsonArray.json
new file mode 100644
index 000000000..d68c99588
--- /dev/null
+++ b/src/test/resources/compliantJsonArray.json
@@ -0,0 +1,317 @@
+[
+  {
+    "_id": "6606c27d2ab4a0102d49420a",
+    "index": 0,
+    "guid": "441331fb-84d1-4873-a649-3814621a0370",
+    "isActive": true,
+    "balance": "$2,691.63",
+    "picture": "http://example.abc/32x32",
+    "age": 26,
+    "eyeColor": "blue",
+    "name": "abc",
+    "gender": "female",
+    "company": "example",
+    "email": "abc@def.com",
+    "phone": "+1 (123) 456-7890",
+    "address": "123 Main St",
+    "about": "Laborum magna tempor officia irure cillum nulla incididunt Lorem dolor veniam elit cupidatat amet. Veniam veniam exercitation nulla consectetur officia esse ex sunt nulla nisi ea cillum nisi reprehenderit. Qui aliquip reprehenderit aliqua aliquip aliquip anim sit magna nostrud dolore veniam velit elit aliquip.\r\n",
+    "registered": "2016-07-22T03:18:11 -01:00",
+    "latitude": -21.544934,
+    "longitude": 72.765495,
+    "tags": [
+      "consectetur",
+      "minim",
+      "sunt",
+      "in",
+      "ut",
+      "velit",
+      "anim"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "abc def"
+      },
+      {
+        "id": 1,
+        "name": "ghi jkl"
+      },
+      {
+        "id": 2,
+        "name": "mno pqr"
+      }
+    ],
+    "greeting": "Hello, abc! You have 10 unread messages.",
+    "favoriteFruit": "banana"
+  },
+  {
+    "_id": "6606c27d0a45df5121fb765f",
+    "index": 1,
+    "guid": "fd774715-de85-44b9-b498-c214d8f68d9f",
+    "isActive": true,
+    "balance": "$2,713.96",
+    "picture": "http://placehold.it/32x32",
+    "age": 27,
+    "eyeColor": "green",
+    "name": "def",
+    "gender": "female",
+    "company": "sample",
+    "email": "def@abc.com",
+    "phone": "+1 (123) 456-78910",
+    "address": "1234 Main St",
+    "about": "Ea id cupidatat eiusmod culpa. Nulla consequat esse elit enim et pariatur eiusmod ipsum. Consequat eu non reprehenderit in.\r\n",
+    "registered": "2015-04-06T07:54:22 -01:00",
+    "latitude": 83.512347,
+    "longitude": -9.368739,
+    "tags": [
+      "excepteur",
+      "non",
+      "nostrud",
+      "laboris",
+      "laboris",
+      "qui",
+      "aute"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "sample example"
+      },
+      {
+        "id": 1,
+        "name": "test name"
+      },
+      {
+        "id": 2,
+        "name": "aaa aaaa"
+      }
+    ],
+    "greeting": "Hello, test! You have 7 unread messages.",
+    "favoriteFruit": "apple"
+  },
+  {
+    "_id": "6606c27dfb3a0e4e7e7183d3",
+    "index": 2,
+    "guid": "688b0c36-98e0-4ee7-86b8-863638d79b5f",
+    "isActive": false,
+    "balance": "$3,514.35",
+    "picture": "http://placehold.it/32x32",
+    "age": 32,
+    "eyeColor": "green",
+    "name": "test",
+    "gender": "female",
+    "company": "test",
+    "email": "test@test.com",
+    "phone": "+1 (123) 456-7890",
+    "address": "123 Main St",
+    "about": "Mollit officia adipisicing ex nisi non Lorem sunt quis est. Irure exercitation duis ipsum qui ullamco eu ea commodo occaecat minim proident. Incididunt nostrud ex cupidatat eiusmod mollit anim irure culpa. Labore voluptate voluptate labore nisi sit eu. Dolor sit proident velit dolor deserunt labore sit ipsum incididunt eiusmod reprehenderit voluptate. Duis anim velit officia laboris consequat officia dolor sint dolor nisi ex.\r\n",
+    "registered": "2021-11-02T12:50:05 -00:00",
+    "latitude": -82.969939,
+    "longitude": 86.415645,
+    "tags": [
+      "aliquip",
+      "et",
+      "est",
+      "nulla",
+      "nulla",
+      "tempor",
+      "adipisicing"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "test"
+      },
+      {
+        "id": 1,
+        "name": "sample"
+      },
+      {
+        "id": 2,
+        "name": "example"
+      }
+    ],
+    "greeting": "Hello, test! You have 1 unread messages.",
+    "favoriteFruit": "strawberry"
+  },
+  {
+    "_id": "6606c27d204bc2327fc9ba23",
+    "index": 3,
+    "guid": "be970cba-306e-4cbd-be08-c265a43a61fa",
+    "isActive": true,
+    "balance": "$3,691.63",
+    "picture": "http://placehold.it/32x32",
+    "age": 35,
+    "eyeColor": "brown",
+    "name": "another test",
+    "gender": "male",
+    "company": "TEST",
+    "email": "anothertest@anothertest.com",
+    "phone": "+1 (321) 987-6543",
+    "address": "123 Example Main St",
+    "about": "Do proident consectetur minim quis. In adipisicing culpa Lorem fugiat cillum exercitation velit velit. Non voluptate laboris deserunt veniam et sint consectetur irure aliqua quis eiusmod consectetur elit id. Ex sint do anim Lorem excepteur eu nulla.\r\n",
+    "registered": "2020-06-25T04:55:25 -01:00",
+    "latitude": 63.614955,
+    "longitude": -109.299405,
+    "tags": [
+      "irure",
+      "esse",
+      "non",
+      "mollit",
+      "laborum",
+      "adipisicing",
+      "ad"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "test"
+      },
+      {
+        "id": 1,
+        "name": "sample"
+      },
+      {
+        "id": 2,
+        "name": "example"
+      }
+    ],
+    "greeting": "Hello, another test! You have 5 unread messages.",
+    "favoriteFruit": "apple"
+  },
+  {
+    "_id": "6606c27df63eb5f390cb9989",
+    "index": 4,
+    "guid": "2c3e5115-758d-468e-99c5-c9afa26e1f9f",
+    "isActive": true,
+    "balance": "$1,047.20",
+    "picture": "http://test.it/32x32",
+    "age": 30,
+    "eyeColor": "green",
+    "name": "Test Name",
+    "gender": "female",
+    "company": "test",
+    "email": "testname@testname.com",
+    "phone": "+1 (999) 999-9999",
+    "address": "999 Test Main St",
+    "about": "Voluptate exercitation tempor consectetur velit magna ea occaecat cupidatat consectetur anim aute. Aliquip est aute ipsum laboris non irure qui consectetur tempor quis do ea Lorem. Cupidatat exercitation ad culpa aliqua amet commodo mollit reprehenderit exercitation adipisicing amet et laborum pariatur.\r\n",
+    "registered": "2023-01-19T02:43:18 -00:00",
+    "latitude": 14.15208,
+    "longitude": 170.411535,
+    "tags": [
+      "dolor",
+      "qui",
+      "cupidatat",
+      "aliqua",
+      "laboris",
+      "reprehenderit",
+      "sint"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "test"
+      },
+      {
+        "id": 1,
+        "name": "sample"
+      },
+      {
+        "id": 2,
+        "name": "example"
+      }
+    ],
+    "greeting": "Hello, test! You have 6 unread messages.",
+    "favoriteFruit": "apple"
+  },
+  {
+    "_id": "6606c27d01d19fa29853d59c",
+    "index": 5,
+    "guid": "816cda74-5d4b-498f-9724-20f340d5f5bf",
+    "isActive": false,
+    "balance": "$2,628.74",
+    "picture": "http://testing.it/32x32",
+    "age": 28,
+    "eyeColor": "green",
+    "name": "Testing",
+    "gender": "female",
+    "company": "test",
+    "email": "testing@testing.com",
+    "phone": "+1 (888) 888-8888",
+    "address": "123 Main St",
+    "about": "Cupidatat non ut nulla qui excepteur in minim non et nulla fugiat. Dolor quis laborum occaecat veniam dolor ullamco deserunt amet veniam dolor quis proident tempor laboris. In cillum duis ut quis. Aliqua cupidatat magna proident velit tempor veniam et consequat laborum ex dolore qui. Incididunt deserunt magna minim Lorem consectetur.\r\n",
+    "registered": "2017-10-14T11:14:08 -01:00",
+    "latitude": -5.345728,
+    "longitude": -9.706491,
+    "tags": [
+      "officia",
+      "velit",
+      "laboris",
+      "qui",
+      "cupidatat",
+      "cupidatat",
+      "ad"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "test"
+      },
+      {
+        "id": 1,
+        "name": "sample"
+      },
+      {
+        "id": 2,
+        "name": "example"
+      }
+    ],
+    "greeting": "Hello, testing! You have 2 unread messages.",
+    "favoriteFruit": "strawberry"
+  },
+  {
+    "_id": "6606c27d803003cede1d6deb",
+    "index": 6,
+    "guid": "4ee550bc-0920-4104-b3ce-ebf9db6a803f",
+    "isActive": true,
+    "balance": "$1,709.31",
+    "picture": "http://sample.it/32x32",
+    "age": 31,
+    "eyeColor": "blue",
+    "name": "Sample Name",
+    "gender": "female",
+    "company": "Sample",
+    "email": "sample@sample.com",
+    "phone": "+1 (777) 777-7777",
+    "address": "123 Main St",
+    "about": "Lorem ex proident ipsum ullamco velit sit nisi eiusmod cillum. Id tempor irure culpa nisi sit non qui veniam non ut. Aliquip reprehenderit excepteur mollit quis excepteur ex sit. Quis do eu veniam do ullamco occaecat eu cupidatat nisi laborum tempor minim fugiat pariatur. Ex in nulla ex velit.\r\n",
+    "registered": "2019-04-08T03:54:36 -01:00",
+    "latitude": -70.660321,
+    "longitude": 71.547525,
+    "tags": [
+      "consequat",
+      "veniam",
+      "pariatur",
+      "aliqua",
+      "cillum",
+      "eu",
+      "officia"
+    ],
+    "friends": [
+      {
+        "id": 0,
+        "name": "Test"
+      },
+      {
+        "id": 1,
+        "name": "Sample"
+      },
+      {
+        "id": 2,
+        "name": "Example"
+      }
+    ],
+    "greeting": "Hello, Sample! You have 6 unread messages.",
+    "favoriteFruit": "apple"
+  }
+]

From 09536cd6c838e647d5357042a7de84a925050531 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sun, 15 Dec 2024 10:38:54 -0600
Subject: [PATCH 010/106] restore-jsonparserconfiguration: add jsonobject
 strict tests. Detect semicolon instead of colon separator in object

---
 src/main/java/org/json/JSONObject.java        |   13 +
 .../junit/JSONParserConfigurationTest.java    |  297 +-
 src/test/resources/compliantJsonObject.json   | 3703 +++++++++++++++++
 3 files changed, 3975 insertions(+), 38 deletions(-)
 create mode 100644 src/test/resources/compliantJsonObject.json

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 47d263a2c..f49bab3c9 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -268,8 +268,14 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
 
             switch (x.nextClean()) {
             case ';':
+                if (jsonParserConfiguration.isStrictMode()) {
+                    throw x.syntaxError("Invalid character ';' found in object in strict mode");
+                }
             case ',':
                 if (x.nextClean() == '}') {
+                    if (jsonParserConfiguration.isStrictMode()) {
+                        throw x.syntaxError("Expected another object element");
+                    }
                     return;
                 }
                 if (x.end()) {
@@ -468,6 +474,13 @@ public JSONObject(String source) throws JSONException {
      */
     public JSONObject(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this(new JSONTokener(source), jsonParserConfiguration);
+        if (this.jsonParserConfiguration.isStrictMode()) {
+            char c = jsonTokener.nextClean();
+            if (c != 0) {
+                throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
+
+            }
+        }
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index dbe436a4f..84c391163 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -4,7 +4,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONParserConfiguration;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -54,19 +53,18 @@ public void verifyMaxDepthThenDuplicateKey() {
     }
 
     @Test
-    public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException() {
+    public void givenInvalidInput_testStrictModeTrue_shouldThrowJsonException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
-
-        List strictModeInputTestCases = getNonCompliantJSONList();
-
+        List strictModeInputTestCases = getNonCompliantJSONArrayList();
         // this is a lot easier to debug when things stop working
         for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
             String testCase = strictModeInputTestCases.get(i);
             try {
                 JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
                 String s = jsonArray.toString();
-                System.out.println("Expected an exception, but got: " + s + " Noncompliant Array index: " + i);
+                String msg = "Expected an exception, but got: " + s + " Noncompliant Array index: " + i;
+                fail(msg);
             } catch (Exception e) {
                 // its all good
             }
@@ -74,19 +72,44 @@ public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException(
     }
 
     @Test
-    public void givenEmptyArray_testStrictModeTrue_shouldNotThrowJsonException() {
+    public void givenInvalidInputObjects_testStrictModeTrue_shouldThrowJsonException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
+        List strictModeInputTestCases = getNonCompliantJSONObjectList();
+        // this is a lot easier to debug when things stop working
+        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
+            String testCase = strictModeInputTestCases.get(i);
+            try {
+                JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+                String s = jsonObject.toString();
+                String msg = "Expected an exception, but got: " + s + " Noncompliant Array index: " + i;
+                fail(msg);
+            } catch (Exception e) {
+                // its all good
+            }
+        }
+    }
 
+    @Test
+    public void givenEmptyArray_testStrictModeTrue_shouldNotThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
         String testCase = "[]";
-
         JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-
         assertEquals(testCase, jsonArray.toString());
     }
 
     @Test
-    public void givenValidDoubleArray_testStrictModeTrue_shouldNotThrowJsonException() {
+    public void givenEmptyObject_testStrictModeTrue_shouldNotThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        String testCase = "{}";
+        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+        assertEquals(testCase, jsonObject.toString());
+    }
+
+    @Test
+    public void givenValidNestedArray_testStrictModeTrue_shouldNotThrowJsonException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
 
@@ -103,48 +126,90 @@ public void givenValidDoubleArray_testStrictModeTrue_shouldNotThrowJsonException
     }
 
     @Test
-    public void givenValidEmptyArrayInsideArray_testStrictModeTrue_shouldNotThrowJsonException(){
+    public void givenValidNestedObject_testStrictModeTrue_shouldNotThrowJsonException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
 
-        String testCase = "[[]]";
+        String testCase = "{\"a0\":[\"c\"], \"a1\":[10.2], \"a2\":[true, false, true]}";
 
-        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
+        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+        JSONArray arrayShouldContainStringAt0 = jsonObject.getJSONArray("a0");
+        JSONArray arrayShouldContainNumberAt0 = jsonObject.getJSONArray("a1");
+        JSONArray arrayShouldContainBooleanAt0 = jsonObject.getJSONArray("a2");
 
+        assertTrue(arrayShouldContainStringAt0.get(0) instanceof String);
+        assertTrue(arrayShouldContainNumberAt0.get(0) instanceof Number);
+        assertTrue(arrayShouldContainBooleanAt0.get(0) instanceof Boolean);
+    }
+
+    @Test
+    public void givenValidEmptyArrayInsideArray_testStrictModeTrue_shouldNotThrowJsonException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        String testCase = "[[]]";
+        JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
         assertEquals(testCase, jsonArray.toString());
     }
 
+    @Test
+    public void givenValidEmptyArrayInsideObject_testStrictModeTrue_shouldNotThrowJsonException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        String testCase = "{\"a0\":[]}";
+        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+        assertEquals(testCase, jsonObject.toString());
+    }
+
     @Test
     public void givenValidEmptyArrayInsideArray_testStrictModeFalse_shouldNotThrowJsonException(){
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(false);
-
         String testCase = "[[]]";
-
         JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
-
         assertEquals(testCase, jsonArray.toString());
     }
 
     @Test
-    public void givenInvalidString_testStrictModeTrue_shouldThrowJsonException() {
+    public void givenValidEmptyArrayInsideObject_testStrictModeFalse_shouldNotThrowJsonException(){
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withStrictMode(true);
+                .withStrictMode(false);
+        String testCase = "{\"a0\":[]}";
+        JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+        assertEquals(testCase, jsonObject.toString());
+    }
 
+    @Test
+    public void givenInvalidStringArray_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
         String testCase = "[badString]";
-
         JSONException je = assertThrows(JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
         assertEquals("Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]", je.getMessage());
     }
 
     @Test
-    public void allowNullInStrictMode() {
+    public void givenInvalidStringObject_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        String testCase = "{\"a0\":badString}";
+        JSONException je = assertThrows(JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
+        assertEquals("Value 'badString' is not surrounded by quotes at 15 [character 16 line 1]", je.getMessage());
+    }
+
+    @Test
+    public void allowNullArrayInStrictMode() {
         String expected = "[null]";
         JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
         assertEquals(expected, jsonArray.toString());
     }
 
+    @Test
+    public void allowNullObjectInStrictMode() {
+        String expected = "{\"a0\":null}";
+        JSONObject jsonObject = new JSONObject(expected, new JSONParserConfiguration().withStrictMode(true));
+        assertEquals(expected, jsonObject.toString());
+    }
+
     @Test
     public void shouldHandleNumericArray() {
         String expected = "[10]";
@@ -152,16 +217,31 @@ public void shouldHandleNumericArray() {
         assertEquals(expected, jsonArray.toString());
     }
 
+    @Test
+    public void shouldHandleNumericObject() {
+        String expected = "{\"a0\":10}";
+        JSONObject jsonObject = new JSONObject(expected, new JSONParserConfiguration().withStrictMode(true));
+        assertEquals(expected, jsonObject.toString());
+    }
     @Test
     public void givenCompliantJSONArrayFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
         try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonArray.json"))) {
             String compliantJsonArrayAsString = lines.collect(Collectors.joining());
             JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                     .withStrictMode(true);
-
             new JSONArray(compliantJsonArrayAsString, jsonParserConfiguration);
         }
+    }
+
+    @Test
+    public void givenCompliantJSONObjectFile_testStrictModeTrue_shouldNotThrowAnyException() throws IOException {
+        try (Stream lines = Files.lines(Paths.get("src/test/resources/compliantJsonObject.json"))) {
+            String compliantJsonObjectAsString = lines.collect(Collectors.joining());
+            JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                    .withStrictMode(true);
 
+            new JSONObject(compliantJsonObjectAsString, jsonParserConfiguration);
+        }
     }
 
     @Test
@@ -169,7 +249,7 @@ public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyExcepti
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(false);
 
-        List strictModeInputTestCases = getNonCompliantJSONList();
+        List strictModeInputTestCases = getNonCompliantJSONArrayList();
 
         // this is a lot easier to debug when things stop working
         for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
@@ -178,62 +258,108 @@ public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyExcepti
                 JSONArray jsonArray = new JSONArray(testCase, jsonParserConfiguration);
             } catch (Exception e) {
                 System.out.println("Unexpected exception: " + e.getMessage() + " Noncompliant Array index: " + i);
+                fail(String.format("Noncompliant array index: %d", i));
+            }
+        }
+    }
+
+    @Test
+    public void givenInvalidInputObjects_testStrictModeFalse_shouldNotThrowAnyException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        List strictModeInputTestCases = getNonCompliantJSONObjectList();
+
+        // this is a lot easier to debug when things stop working
+        for (int i = 0; i < strictModeInputTestCases.size(); ++i) {
+            String testCase = strictModeInputTestCases.get(i);
+            try {
+                JSONObject jsonObject = new JSONObject(testCase, jsonParserConfiguration);
+            } catch (Exception e) {
+                System.out.println("Unexpected exception: " + e.getMessage() + " Noncompliant Array index: " + i);
+                fail(String.format("Noncompliant array index: %d", i));
             }
         }
-        strictModeInputTestCases.forEach(testCase -> new JSONArray(testCase, jsonParserConfiguration));
     }
 
     @Test
     public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
-
         String testCase = "[1,2];[3,4]";
-
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
         assertEquals("invalid character ';' found after end of array at 6 [character 7 line 1]", je.getMessage());
     }
 
     @Test
-    public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
+    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
+        String testCase = "{\"a0\":[1,2];\"a1\":[3,4]}";
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
+        assertEquals("Invalid character ';' found in object in strict mode at 12 [character 13 line 1]", je.getMessage());
+    }
 
+    @Test
+    public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
         String testCase = "[\"1\",\"2\"];[3,4]";
-
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
         assertEquals("invalid character ';' found after end of array at 10 [character 11 line 1]", je.getMessage());
     }
 
     @Test
-    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
+    public void givenInvalidInputObjectWithNumericStrings_testStrictModeTrue_shouldThrowInvalidCharacterErrorMessage() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
+        String testCase = "{\"a0\":[\"1\",\"2\"];\"a1\":[3,4]}";
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
+        assertEquals("Invalid character ';' found in object in strict mode at 16 [character 17 line 1]", je.getMessage());
+    }
 
+    @Test
+    public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
         String testCase = "[{\"test\": implied}]";
-
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-
         assertEquals("Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]", je.getMessage());
     }
 
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowValueNotSurroundedByQuotesErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        String testCase = "{\"a0\":{\"test\": implied}]}";
+        JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
+                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
+        assertEquals("Value 'implied' is not surrounded by quotes at 22 [character 23 line 1]", je.getMessage());
+    }
+
     @Test
     public void givenInvalidInputArray_testStrictModeFalse_shouldNotThrowAnyException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(false);
-
         String testCase = "[{\"test\": implied}]";
-
         new JSONArray(testCase, jsonParserConfiguration);
     }
 
     @Test
-    public void givenNonCompliantQuotes_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
+    public void givenInvalidInputObject_testStrictModeFalse_shouldNotThrowAnyException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+        String testCase = "{\"a0\":{\"test\": implied}}";
+        new JSONObject(testCase, jsonParserConfiguration);
+    }
+
+    @Test
+    public void givenNonCompliantQuotesArray_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(true);
 
@@ -266,7 +392,40 @@ public void givenNonCompliantQuotes_testStrictModeTrue_shouldThrowJsonExceptionW
     }
 
     @Test
-    public void givenUnbalancedQuotes_testStrictModeFalse_shouldThrowJsonException() {
+    public void givenNonCompliantQuotesObject_testStrictModeTrue_shouldThrowJsonExceptionWithConcreteErrorDescription() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCaseOne = "{\"abc': \"test\"}";
+        String testCaseTwo = "{'abc\": \"test\"}";
+        String testCaseThree = "{\"a\":'abc'}";
+        String testCaseFour = "{'testField': \"testValue\"}";
+
+        JSONException jeOne = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseOne, jsonParserConfiguration));
+        JSONException jeTwo = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseTwo, jsonParserConfiguration));
+        JSONException jeThree = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseThree, jsonParserConfiguration));
+        JSONException jeFour = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseFour, jsonParserConfiguration));
+
+        assertEquals(
+                "Expected a ':' after a key at 10 [character 11 line 1]",
+                jeOne.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                jeTwo.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 6 [character 7 line 1]",
+                jeThree.getMessage());
+        assertEquals(
+                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                jeFour.getMessage());
+    }
+
+    @Test
+    public void givenUnbalancedQuotesArray_testStrictModeFalse_shouldThrowJsonException() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
                 .withStrictMode(false);
 
@@ -282,6 +441,22 @@ public void givenUnbalancedQuotes_testStrictModeFalse_shouldThrowJsonException()
         assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
     }
 
+    @Test
+    public void givenUnbalancedQuotesObject_testStrictModeFalse_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        String testCaseOne = "{\"abc': \"test\"}";
+        String testCaseTwo = "{'abc\": \"test\"}";
+
+        JSONException jeOne = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseOne, jsonParserConfiguration));
+        JSONException jeTwo = assertThrows(JSONException.class,
+                () -> new JSONObject(testCaseTwo, jsonParserConfiguration));
+
+        assertEquals("Expected a ':' after a key at 10 [character 11 line 1]", jeOne.getMessage());
+        assertEquals("Unterminated string. Character with int code 0 is not allowed within a quoted string. at 15 [character 16 line 1]", jeTwo.getMessage());
+    }
 
     @Test
     public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
@@ -295,13 +470,25 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurrounde
         assertEquals("Value 'test' is not surrounded by quotes at 6 [character 7 line 1]", je.getMessage());
     }
 
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_shouldThrowKeyNotSurroundedByQuotesErrorMessage() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "{test: implied}";
+        JSONException je = assertThrows("expected non-compliant json but got instead: " + testCase,
+                JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
+
+        assertEquals("Value 'test' is not surrounded by quotes at 5 [character 6 line 1]", je.getMessage());
+    }
+
     /**
      * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
      * this class.
      *
      * @return List with JSON strings.
      */
-    private List getNonCompliantJSONList() {
+    private List getNonCompliantJSONArrayList() {
         return Arrays.asList(
                 "[1],",
                 "[1,]",
@@ -326,4 +513,38 @@ private List getNonCompliantJSONList() {
                 "[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]",
                 "[{test: \"implied\"}]");
     }
+
+    /**
+     * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
+     * this class.
+     *
+     * @return List with JSON strings.
+     */
+    private List getNonCompliantJSONObjectList() {
+        return Arrays.asList(
+                "{\"a\":1},",
+                "{\"a\":1,}",
+                "{\"a0\":[1],\"a1\":\"sa\",\"a2\":[2]}a",
+                "{\"a\":1},\"dsa\": \"test\"",
+                "{\"a\":[a]}",
+                "{}asdf",
+                "{}}",
+                "{}]",
+                "{}{",
+                "{}[",
+                "{},",
+                "{}:",
+                "{},{",
+                "{},[",
+                "{\"a0\":[1,2];\"a1\":[3,4]}",
+                "{\"a\":test}",
+                "{a:{'testSingleQuote': 'testSingleQuote'}}",
+                "{\"a0\":1, \"a1\":2,\"a2\":3}:{\"a3\":4,\"a4\":5}",
+                "{\"a\":{test: implied}}",
+                "{a:{\"test\": implied}}",
+                "{a:[{\"number\":\"7990154836330\",\"color\":'c'},{\"number\":8784148854580,\"color\":RosyBrown},{\"number\":\"5875770107113\",\"color\":\"DarkSeaGreen\"}]}",
+                "{a:{test: \"implied\"}}"
+        );
+    }
+
 }
diff --git a/src/test/resources/compliantJsonObject.json b/src/test/resources/compliantJsonObject.json
new file mode 100644
index 000000000..cb2918d37
--- /dev/null
+++ b/src/test/resources/compliantJsonObject.json
@@ -0,0 +1,3703 @@
+{
+  "a0": [
+    {
+      "id": 0,
+      "name": "Elijah",
+      "city": "Austin",
+      "age": 78,
+      "friends": [
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Watching Sports",
+            "Reading",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Traveling",
+            "Video Games"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "name": "Noah",
+      "city": "Boston",
+      "age": 97,
+      "friends": [
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Watching Sports",
+            "Skiing & Snowboarding",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Running",
+            "Music",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Woodworking",
+            "Calligraphy",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Walking",
+            "Church Activities"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Music",
+            "Church Activities"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Martial Arts",
+            "Painting",
+            "Jewelry Making"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "Evy",
+      "city": "San Diego",
+      "age": 48,
+      "friends": [
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Reading",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Genealogy",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Collecting",
+            "Writing",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Church Activities",
+            "Jewelry Making"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Calligraphy",
+            "Dancing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 3,
+      "name": "Oliver",
+      "city": "St. Louis",
+      "age": 39,
+      "friends": [
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Watching Sports",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Traveling",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Church Activities",
+            "Running"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Gardening",
+            "Board Games",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Martial Arts",
+            "Video Games",
+            "Reading"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 4,
+      "name": "Michael",
+      "city": "St. Louis",
+      "age": 95,
+      "friends": [
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Movie Watching",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Housework",
+            "Bicycling",
+            "Collecting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 5,
+      "name": "Michael",
+      "city": "Portland",
+      "age": 19,
+      "friends": [
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Painting",
+            "Television"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Walking",
+            "Watching Sports",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Podcasts",
+            "Jewelry Making"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Eating Out",
+            "Painting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 6,
+      "name": "Lucas",
+      "city": "Austin",
+      "age": 76,
+      "friends": [
+        {
+          "name": "John",
+          "hobbies": [
+            "Genealogy",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Socializing",
+            "Yoga"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 7,
+      "name": "Michelle",
+      "city": "San Antonio",
+      "age": 25,
+      "friends": [
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Music",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Socializing",
+            "Housework",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Collecting",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Painting",
+            "Church Activities"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Running",
+            "Painting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 8,
+      "name": "Emily",
+      "city": "Austin",
+      "age": 61,
+      "friends": [
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Bicycling",
+            "Skiing & Snowboarding",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Writing",
+            "Reading",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Eating Out",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Martial Arts",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Board Games",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 9,
+      "name": "Liam",
+      "city": "New Orleans",
+      "age": 33,
+      "friends": [
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Traveling",
+            "Bicycling",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Eating Out",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Jewelry Making",
+            "Yoga",
+            "Podcasts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 10,
+      "name": "Levi",
+      "city": "New Orleans",
+      "age": 59,
+      "friends": [
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Video Games",
+            "Fishing",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Woodworking",
+            "Music",
+            "Reading"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11,
+      "name": "Lucas",
+      "city": "Portland",
+      "age": 82,
+      "friends": [
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Jewelry Making",
+            "Yoga"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Fishing",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Gardening",
+            "Church Activities",
+            "Fishing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 12,
+      "name": "Kevin",
+      "city": "Charleston",
+      "age": 82,
+      "friends": [
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Fishing",
+            "Writing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 13,
+      "name": "Olivia",
+      "city": "San Antonio",
+      "age": 34,
+      "friends": [
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Yoga",
+            "Traveling",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Team Sports",
+            "Writing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 14,
+      "name": "Robert",
+      "city": "Los Angeles",
+      "age": 49,
+      "friends": [
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Yoga",
+            "Television"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Fishing",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Church Activities",
+            "Television"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Movie Watching",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Golf",
+            "Running",
+            "Cooking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 15,
+      "name": "Grace",
+      "city": "Chicago",
+      "age": 98,
+      "friends": [
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Traveling",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Golf",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Reading",
+            "Cooking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 16,
+      "name": "Michael",
+      "city": "New Orleans",
+      "age": 78,
+      "friends": [
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Running",
+            "Housework",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Writing",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Running",
+            "Church Activities"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Volunteer Work",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Socializing",
+            "Watching Sports",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Eating Out",
+            "Walking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 17,
+      "name": "Mateo",
+      "city": "Palm Springs",
+      "age": 19,
+      "friends": [
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Playing Cards",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Gardening",
+            "Board Games",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Board Games",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Golf",
+            "Playing Cards",
+            "Music"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 18,
+      "name": "Levi",
+      "city": "Chicago",
+      "age": 38,
+      "friends": [
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Tennis",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Writing",
+            "Reading",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Collecting",
+            "Video Games"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Shopping",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Dancing",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Podcasts",
+            "Woodworking",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 19,
+      "name": "Luke",
+      "city": "New York City",
+      "age": 49,
+      "friends": [
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Writing",
+            "Playing Cards",
+            "Housework"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Gardening",
+            "Running"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Golf",
+            "Music"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Board Games",
+            "Socializing",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Movie Watching",
+            "Writing",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Golf",
+            "Jewelry Making",
+            "Yoga"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 20,
+      "name": "Camila",
+      "city": "New Orleans",
+      "age": 69,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Video Games",
+            "Collecting",
+            "Painting"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Reading",
+            "Volunteer Work"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 21,
+      "name": "Amelia",
+      "city": "Charleston",
+      "age": 70,
+      "friends": [
+        {
+          "name": "John",
+          "hobbies": [
+            "Quilting",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Painting",
+            "Podcasts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 22,
+      "name": "Victoria",
+      "city": "Miami Beach",
+      "age": 50,
+      "friends": [
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Cooking",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Team Sports",
+            "Genealogy"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 23,
+      "name": "Kevin",
+      "city": "Miami Beach",
+      "age": 93,
+      "friends": [
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Bicycling",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Martial Arts",
+            "Genealogy",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Yoga"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 24,
+      "name": "Daniel",
+      "city": "Saint Augustine",
+      "age": 43,
+      "friends": [
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Calligraphy",
+            "Martial Arts",
+            "Music"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Walking",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Collecting",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Podcasts",
+            "Walking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 25,
+      "name": "Olivia",
+      "city": "Austin",
+      "age": 46,
+      "friends": [
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Podcasts",
+            "Housework"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Golf",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Eating Out",
+            "Music"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Eating Out",
+            "Genealogy",
+            "Reading"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 26,
+      "name": "Michael",
+      "city": "Palm Springs",
+      "age": 62,
+      "friends": [
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Socializing",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Playing Cards",
+            "Shopping",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Music",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Volunteer Work",
+            "Calligraphy",
+            "Jewelry Making"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 27,
+      "name": "Kevin",
+      "city": "San Antonio",
+      "age": 97,
+      "friends": [
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Television",
+            "Quilting",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Shopping",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 28,
+      "name": "Oliver",
+      "city": "Honolulu",
+      "age": 79,
+      "friends": [
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Housework",
+            "Jewelry Making"
+          ]
+        },
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Volunteer Work",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Traveling",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Shopping",
+            "Church Activities",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Reading",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Socializing",
+            "Collecting",
+            "Cooking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 29,
+      "name": "Levi",
+      "city": "Miami Beach",
+      "age": 46,
+      "friends": [
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Housework",
+            "Video Games",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Golf",
+            "Volunteer Work",
+            "Painting"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Writing",
+            "Martial Arts",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 30,
+      "name": "Michael",
+      "city": "Seattle",
+      "age": 18,
+      "friends": [
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Shopping",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Yoga",
+            "Genealogy",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Eating Out",
+            "Church Activities",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Board Games",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 31,
+      "name": "Isabella",
+      "city": "Savannah",
+      "age": 65,
+      "friends": [
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Church Activities",
+            "Housework",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Calligraphy",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Volunteer Work",
+            "Podcasts",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 32,
+      "name": "Chris",
+      "city": "Las Vegas",
+      "age": 31,
+      "friends": [
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Shopping",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Dancing",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Reading",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Traveling",
+            "Golf",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Video Games",
+            "Shopping",
+            "Walking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 33,
+      "name": "Kevin",
+      "city": "Portland",
+      "age": 51,
+      "friends": [
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Running",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Tennis",
+            "Genealogy"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 34,
+      "name": "Sophie",
+      "city": "New York City",
+      "age": 25,
+      "friends": [
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Video Games",
+            "Board Games",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Calligraphy",
+            "Video Games",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 35,
+      "name": "John",
+      "city": "Orlando",
+      "age": 67,
+      "friends": [
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Podcasts",
+            "Skiing & Snowboarding",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Tennis",
+            "Socializing",
+            "Music"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Walking",
+            "Church Activities",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Team Sports",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Dancing",
+            "Painting"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Tennis",
+            "Bicycling"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 36,
+      "name": "Emily",
+      "city": "New York City",
+      "age": 82,
+      "friends": [
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Church Activities",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Running",
+            "Calligraphy",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Dancing",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Genealogy",
+            "Calligraphy",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 37,
+      "name": "Amelia",
+      "city": "New Orleans",
+      "age": 28,
+      "friends": [
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Traveling",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Martial Arts",
+            "Cooking",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Bicycling",
+            "Walking",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Traveling",
+            "Volunteer Work",
+            "Collecting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 38,
+      "name": "Victoria",
+      "city": "Austin",
+      "age": 71,
+      "friends": [
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Yoga",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Eating Out",
+            "Writing",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Volunteer Work",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Volunteer Work",
+            "Board Games",
+            "Running"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 39,
+      "name": "Mia",
+      "city": "Honolulu",
+      "age": 63,
+      "friends": [
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Volunteer Work",
+            "Housework",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Woodworking",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Martial Arts",
+            "Skiing & Snowboarding",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Collecting",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Television",
+            "Socializing",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Martial Arts",
+            "Woodworking",
+            "Reading"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 40,
+      "name": "Daniel",
+      "city": "Las Vegas",
+      "age": 50,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Bicycling",
+            "Housework"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Woodworking",
+            "Collecting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 41,
+      "name": "Luke",
+      "city": "Nashville",
+      "age": 84,
+      "friends": [
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Fishing",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Church Activities",
+            "Martial Arts",
+            "Television"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Church Activities",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Calligraphy",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Movie Watching",
+            "Board Games"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 42,
+      "name": "Joe",
+      "city": "Orlando",
+      "age": 28,
+      "friends": [
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Board Games",
+            "Music"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Woodworking",
+            "Yoga",
+            "Music"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Team Sports",
+            "Bicycling"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 43,
+      "name": "Robert",
+      "city": "Boston",
+      "age": 89,
+      "friends": [
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Team Sports",
+            "Church Activities",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Housework",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Watching Sports",
+            "Golf",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Volunteer Work",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Yoga",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Running",
+            "Painting",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 44,
+      "name": "Mateo",
+      "city": "Palm Springs",
+      "age": 75,
+      "friends": [
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Socializing",
+            "Walking",
+            "Painting"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Bicycling",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Podcasts",
+            "Socializing",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Dancing",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Watching Sports",
+            "Yoga",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Housework",
+            "Genealogy"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 45,
+      "name": "Michelle",
+      "city": "Portland",
+      "age": 64,
+      "friends": [
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Watching Sports",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Martial Arts",
+            "Video Games",
+            "Fishing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 46,
+      "name": "Emma",
+      "city": "Portland",
+      "age": 47,
+      "friends": [
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Yoga",
+            "Music",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Traveling",
+            "Movie Watching",
+            "Gardening"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 47,
+      "name": "Elijah",
+      "city": "Chicago",
+      "age": 96,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Video Games",
+            "Watching Sports",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Housework",
+            "Tennis",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Genealogy",
+            "Housework"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 48,
+      "name": "Elijah",
+      "city": "Seattle",
+      "age": 30,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Socializing",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Martial Arts",
+            "Golf",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Gardening",
+            "Bicycling",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 49,
+      "name": "Sophie",
+      "city": "Palm Springs",
+      "age": 84,
+      "friends": [
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Podcasts",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Volunteer Work",
+            "Bicycling",
+            "Reading"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Television",
+            "Watching Sports",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Bicycling",
+            "Woodworking",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 50,
+      "name": "Sophie",
+      "city": "Chicago",
+      "age": 52,
+      "friends": [
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Collecting",
+            "Dancing",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Watching Sports",
+            "Dancing",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Board Games",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Calligraphy",
+            "Running"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Quilting",
+            "Golf",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Watching Sports",
+            "Jewelry Making"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 51,
+      "name": "Nora",
+      "city": "Lahaina",
+      "age": 79,
+      "friends": [
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Volunteer Work",
+            "Running",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Quilting",
+            "Fishing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 52,
+      "name": "Chris",
+      "city": "Miami Beach",
+      "age": 59,
+      "friends": [
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Video Games",
+            "Traveling",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Shopping",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Playing Cards",
+            "Housework"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Painting",
+            "Housework",
+            "Shopping"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 53,
+      "name": "Kevin",
+      "city": "Boston",
+      "age": 88,
+      "friends": [
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Traveling",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Woodworking",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Collecting",
+            "Running"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Dancing",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Fishing",
+            "Quilting",
+            "Team Sports"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 54,
+      "name": "Grace",
+      "city": "Miami Beach",
+      "age": 62,
+      "friends": [
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Church Activities",
+            "Music"
+          ]
+        },
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Genealogy",
+            "Watching Sports",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Team Sports",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Yoga",
+            "Music",
+            "Running"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 55,
+      "name": "Chloe",
+      "city": "Lahaina",
+      "age": 97,
+      "friends": [
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Genealogy",
+            "Team Sports",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Movie Watching",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 56,
+      "name": "Zoey",
+      "city": "Saint Augustine",
+      "age": 75,
+      "friends": [
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Bicycling",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Music",
+            "Cooking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 57,
+      "name": "Sophie",
+      "city": "Boston",
+      "age": 26,
+      "friends": [
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Writing",
+            "Yoga",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Board Games",
+            "Martial Arts",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Jewelry Making",
+            "Skiing & Snowboarding",
+            "Fishing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 58,
+      "name": "Emma",
+      "city": "Seattle",
+      "age": 40,
+      "friends": [
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Traveling",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Bicycling",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Board Games",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Yoga",
+            "Shopping"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 59,
+      "name": "Luke",
+      "city": "San Diego",
+      "age": 44,
+      "friends": [
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Calligraphy",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Podcasts",
+            "Movie Watching",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Bicycling",
+            "Golf",
+            "Walking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 60,
+      "name": "Chloe",
+      "city": "Austin",
+      "age": 23,
+      "friends": [
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Martial Arts",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Writing",
+            "Martial Arts",
+            "Jewelry Making"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Video Games",
+            "Bicycling",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Socializing",
+            "Collecting",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Team Sports",
+            "Woodworking",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Yoga",
+            "Music",
+            "Skiing & Snowboarding"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 61,
+      "name": "Nora",
+      "city": "Orlando",
+      "age": 83,
+      "friends": [
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Board Games",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Board Games",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Bicycling",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Church Activities",
+            "Golf",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Running",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Board Games",
+            "Volunteer Work"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 62,
+      "name": "Kevin",
+      "city": "Saint Augustine",
+      "age": 76,
+      "friends": [
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Playing Cards",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Movie Watching",
+            "Calligraphy",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Podcasts",
+            "Yoga",
+            "Quilting"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 63,
+      "name": "Amelia",
+      "city": "Honolulu",
+      "age": 84,
+      "friends": [
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Golf",
+            "Reading"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Genealogy",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Gardening",
+            "Music"
+          ]
+        },
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Board Games",
+            "Music"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Cooking",
+            "Eating Out",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Movie Watching",
+            "Church Activities",
+            "Shopping"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 64,
+      "name": "Joe",
+      "city": "San Francisco",
+      "age": 37,
+      "friends": [
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Running",
+            "Podcasts",
+            "Woodworking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 65,
+      "name": "Chloe",
+      "city": "Palm Springs",
+      "age": 60,
+      "friends": [
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Movie Watching",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Volunteer Work",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Church Activities",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Walking",
+            "Team Sports",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 66,
+      "name": "Leo",
+      "city": "New Orleans",
+      "age": 97,
+      "friends": [
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Martial Arts",
+            "Woodworking",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Fishing",
+            "Genealogy",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Traveling",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Church Activities",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Video Games",
+            "Housework"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 67,
+      "name": "Robert",
+      "city": "Austin",
+      "age": 19,
+      "friends": [
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Writing",
+            "Yoga"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Writing",
+            "Socializing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 68,
+      "name": "Robert",
+      "city": "Orlando",
+      "age": 65,
+      "friends": [
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Board Games",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Collecting",
+            "Housework",
+            "Skiing & Snowboarding"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 69,
+      "name": "Mateo",
+      "city": "New Orleans",
+      "age": 95,
+      "friends": [
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Painting",
+            "Eating Out",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Bicycling",
+            "Jewelry Making",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Cooking",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Reading",
+            "Collecting",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Housework",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Dancing",
+            "Yoga"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 70,
+      "name": "Jack",
+      "city": "Boston",
+      "age": 76,
+      "friends": [
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Martial Arts",
+            "Volunteer Work",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Traveling",
+            "Bicycling"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Podcasts",
+            "Jewelry Making",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Gardening",
+            "Shopping",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Writing",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 71,
+      "name": "Liam",
+      "city": "Savannah",
+      "age": 37,
+      "friends": [
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Painting",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Dancing",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Television",
+            "Running"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Fishing",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Church Activities",
+            "Calligraphy",
+            "Writing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 72,
+      "name": "Daniel",
+      "city": "Los Angeles",
+      "age": 63,
+      "friends": [
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Television",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Walking",
+            "Socializing",
+            "Writing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 73,
+      "name": "Olivia",
+      "city": "Boston",
+      "age": 89,
+      "friends": [
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Fishing",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Movie Watching",
+            "Board Games"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 74,
+      "name": "Amelia",
+      "city": "Orlando",
+      "age": 40,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Golf",
+            "Reading",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Writing",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Movie Watching",
+            "Music"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Jewelry Making",
+            "Bicycling"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 75,
+      "name": "Camila",
+      "city": "New Orleans",
+      "age": 65,
+      "friends": [
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Yoga",
+            "Reading",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Board Games",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Woodworking",
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Television",
+            "Calligraphy",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Fishing",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 76,
+      "name": "Jack",
+      "city": "Orlando",
+      "age": 42,
+      "friends": [
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Podcasts",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Running",
+            "Shopping",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Martial Arts",
+            "Golf",
+            "Quilting"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Eating Out",
+            "Bicycling",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Church Activities"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 77,
+      "name": "Leo",
+      "city": "Lahaina",
+      "age": 46,
+      "friends": [
+        {
+          "name": "Robert",
+          "hobbies": [
+            "Traveling",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Video Games",
+            "Music"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Video Games",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Painting",
+            "Television"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Dancing",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 78,
+      "name": "Kevin",
+      "city": "San Antonio",
+      "age": 19,
+      "friends": [
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Traveling",
+            "Television"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Fishing",
+            "Collecting",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Watching Sports",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 79,
+      "name": "Leo",
+      "city": "Sedona",
+      "age": 56,
+      "friends": [
+        {
+          "name": "Mateo",
+          "hobbies": [
+            "Board Games",
+            "Reading"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Reading",
+            "Fishing",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Gardening",
+            "Woodworking"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Video Games",
+            "Television",
+            "Eating Out"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 80,
+      "name": "Charlotte",
+      "city": "Orlando",
+      "age": 73,
+      "friends": [
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Golf",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Shopping",
+            "Yoga",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Yoga",
+            "Volunteer Work"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 81,
+      "name": "Robert",
+      "city": "Chicago",
+      "age": 52,
+      "friends": [
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Church Activities",
+            "Woodworking",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Board Games",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Housework",
+            "Music",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Shopping",
+            "Fishing",
+            "Walking"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Dancing",
+            "Yoga"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 82,
+      "name": "Kevin",
+      "city": "Palm Springs",
+      "age": 75,
+      "friends": [
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Running",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Socializing",
+            "Martial Arts",
+            "Running"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 83,
+      "name": "Evy",
+      "city": "Palm Springs",
+      "age": 51,
+      "friends": [
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Writing",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Yoga",
+            "Quilting",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Painting"
+          ]
+        },
+        {
+          "name": "Olivia",
+          "hobbies": [
+            "Martial Arts",
+            "Shopping",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Reading",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Socializing",
+            "Housework"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 84,
+      "name": "Daniel",
+      "city": "Saint Augustine",
+      "age": 57,
+      "friends": [
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Walking",
+            "Painting",
+            "Reading"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Team Sports",
+            "Board Games"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Jewelry Making",
+            "Eating Out",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Movie Watching",
+            "Video Games"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Watching Sports",
+            "Walking",
+            "Martial Arts"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 85,
+      "name": "Olivia",
+      "city": "Charleston",
+      "age": 63,
+      "friends": [
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Reading",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Mia",
+          "hobbies": [
+            "Running",
+            "Shopping"
+          ]
+        },
+        {
+          "name": "John",
+          "hobbies": [
+            "Writing",
+            "Walking",
+            "Tennis"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 86,
+      "name": "Amelia",
+      "city": "Seattle",
+      "age": 96,
+      "friends": [
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Dancing",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Bicycling",
+            "Dancing"
+          ]
+        },
+        {
+          "name": "Daniel",
+          "hobbies": [
+            "Writing",
+            "Shopping",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Board Games",
+            "Walking",
+            "Housework"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Genealogy",
+            "Dancing",
+            "Podcasts"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Movie Watching",
+            "Cooking",
+            "Housework"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 87,
+      "name": "Luke",
+      "city": "Seattle",
+      "age": 26,
+      "friends": [
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Traveling",
+            "Walking",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Writing",
+            "Housework",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Golf",
+            "Yoga"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Volunteer Work",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Yoga",
+            "Genealogy",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Levi",
+          "hobbies": [
+            "Tennis",
+            "Television"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 88,
+      "name": "Chris",
+      "city": "Nashville",
+      "age": 34,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Podcasts",
+            "Team Sports",
+            "Traveling"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Television",
+            "Woodworking",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Podcasts",
+            "Genealogy",
+            "Calligraphy"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Fishing",
+            "Church Activities",
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Camila",
+          "hobbies": [
+            "Television",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Michelle",
+          "hobbies": [
+            "Yoga",
+            "Running"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 89,
+      "name": "Michelle",
+      "city": "Honolulu",
+      "age": 85,
+      "friends": [
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Calligraphy",
+            "Gardening"
+          ]
+        },
+        {
+          "name": "Chloe",
+          "hobbies": [
+            "Shopping",
+            "Playing Cards",
+            "Tennis"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Watching Sports",
+            "Cooking",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Writing",
+            "Tennis",
+            "Playing Cards"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 90,
+      "name": "Lucas",
+      "city": "Los Angeles",
+      "age": 78,
+      "friends": [
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Woodworking",
+            "Painting",
+            "Television"
+          ]
+        },
+        {
+          "name": "Lucas",
+          "hobbies": [
+            "Bicycling",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Grace",
+          "hobbies": [
+            "Dancing",
+            "Running"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 91,
+      "name": "Sophie",
+      "city": "St. Louis",
+      "age": 86,
+      "friends": [
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Socializing",
+            "Music"
+          ]
+        },
+        {
+          "name": "Zoey",
+          "hobbies": [
+            "Running",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Elijah",
+          "hobbies": [
+            "Dancing"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 92,
+      "name": "Victoria",
+      "city": "Saint Augustine",
+      "age": 33,
+      "friends": [
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Socializing",
+            "Fishing"
+          ]
+        },
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Video Games",
+            "Watching Sports"
+          ]
+        },
+        {
+          "name": "Luke",
+          "hobbies": [
+            "Martial Arts"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Traveling",
+            "Quilting",
+            "Television"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Gardening",
+            "Cooking",
+            "Housework"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 93,
+      "name": "Michael",
+      "city": "New Orleans",
+      "age": 82,
+      "friends": [
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Bicycling",
+            "Board Games",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Liam",
+          "hobbies": [
+            "Painting",
+            "Writing",
+            "Bicycling"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 94,
+      "name": "Michael",
+      "city": "Seattle",
+      "age": 49,
+      "friends": [
+        {
+          "name": "John",
+          "hobbies": [
+            "Collecting",
+            "Playing Cards",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Sarah",
+          "hobbies": [
+            "Fishing",
+            "Walking",
+            "Movie Watching"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 95,
+      "name": "Victoria",
+      "city": "Branson",
+      "age": 48,
+      "friends": [
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Painting",
+            "Volunteer Work",
+            "Socializing"
+          ]
+        },
+        {
+          "name": "Evy",
+          "hobbies": [
+            "Skiing & Snowboarding",
+            "Volunteer Work"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Genealogy",
+            "Reading",
+            "Yoga"
+          ]
+        },
+        {
+          "name": "Sophie",
+          "hobbies": [
+            "Movie Watching",
+            "Golf",
+            "Television"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Jewelry Making",
+            "Quilting",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Jack",
+          "hobbies": [
+            "Playing Cards",
+            "Golf"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 96,
+      "name": "Grace",
+      "city": "Seattle",
+      "age": 89,
+      "friends": [
+        {
+          "name": "Chris",
+          "hobbies": [
+            "Board Games",
+            "Golf",
+            "Playing Cards"
+          ]
+        },
+        {
+          "name": "Emily",
+          "hobbies": [
+            "Video Games",
+            "Golf"
+          ]
+        },
+        {
+          "name": "Victoria",
+          "hobbies": [
+            "Housework",
+            "Collecting",
+            "Woodworking"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 97,
+      "name": "Liam",
+      "city": "Nashville",
+      "age": 64,
+      "friends": [
+        {
+          "name": "Kevin",
+          "hobbies": [
+            "Collecting"
+          ]
+        },
+        {
+          "name": "Amelia",
+          "hobbies": [
+            "Golf",
+            "Playing Cards",
+            "Cooking"
+          ]
+        },
+        {
+          "name": "Charlotte",
+          "hobbies": [
+            "Reading",
+            "Board Games",
+            "Genealogy"
+          ]
+        },
+        {
+          "name": "Leo",
+          "hobbies": [
+            "Video Games",
+            "Writing"
+          ]
+        },
+        {
+          "name": "Nora",
+          "hobbies": [
+            "Jewelry Making",
+            "Volunteer Work"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 98,
+      "name": "Mia",
+      "city": "Miami Beach",
+      "age": 77,
+      "friends": [
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Podcasts",
+            "Movie Watching"
+          ]
+        },
+        {
+          "name": "Oliver",
+          "hobbies": [
+            "Playing Cards",
+            "Fishing",
+            "Eating Out"
+          ]
+        },
+        {
+          "name": "Emma",
+          "hobbies": [
+            "Collecting",
+            "Yoga"
+          ]
+        },
+        {
+          "name": "Michael",
+          "hobbies": [
+            "Bicycling",
+            "Team Sports"
+          ]
+        },
+        {
+          "name": "Ava",
+          "hobbies": [
+            "Watching Sports",
+            "Jewelry Making"
+          ]
+        },
+        {
+          "name": "Joe",
+          "hobbies": [
+            "Video Games",
+            "Woodworking",
+            "Music"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 99,
+      "name": "Mateo",
+      "city": "Branson",
+      "age": 66,
+      "friends": [
+        {
+          "name": "Isabella",
+          "hobbies": [
+            "Television",
+            "Skiing & Snowboarding"
+          ]
+        },
+        {
+          "name": "Noah",
+          "hobbies": [
+            "Housework",
+            "Running",
+            "Podcasts"
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

From d3c7eaf17e8ca0162d344c3e98ef270b8164cc69 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sun, 15 Dec 2024 13:18:39 -0600
Subject: [PATCH 011/106] restore-jsonparserconfiguration: fix unit tests to
 work when strictMode default is true

---
 src/test/java/org/json/junit/CDLTest.java     |  59 +-
 .../java/org/json/junit/JSONArrayTest.java    |  21 +-
 src/test/java/org/json/junit/JSONMLTest.java  |   2 +-
 .../org/json/junit/JSONObjectNumberTest.java  |  24 +-
 .../java/org/json/junit/JSONObjectTest.java   | 739 +++++++++---------
 .../java/org/json/junit/JSONPointerTest.java  |   3 +-
 .../org/json/junit/XMLConfigurationTest.java  |   4 +-
 src/test/java/org/json/junit/XMLTest.java     |   8 +-
 8 files changed, 461 insertions(+), 399 deletions(-)

diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
index cc3da2983..0e3668bf7 100644
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
@@ -29,7 +29,7 @@ public class CDLTest {
 			"1, 2, 3, 4\t, 5, 6, 7\n" +
 			"true, false, true, true, false, false, false\n" +
 			"0.23, 57.42, 5e27, -234.879, 2.34e5, 0.0, 9e-3\n" +
-			"\"va\tl1\", \"v\bal2\", \"val3\", \"val\f4\", \"val5\", va'l6, val7\n";
+			"\"va\tl1\", \"v\bal2\", \"val3\", \"val\f4\", \"val5\", \"va'l6\", val7\n";
 
 
     /**
@@ -38,11 +38,54 @@ public class CDLTest {
      * values all must be quoted in the cases where the JSONObject parsing 
      * might normally convert the value into a non-string. 
      */
-    private static final String EXPECTED_LINES = "[{Col 1:val1, Col 2:val2, Col 3:val3, Col 4:val4, Col 5:val5, Col 6:val6, Col 7:val7}, " +
-			"{Col 1:\"1\", Col 2:\"2\", Col 3:\"3\", Col 4:\"4\", Col 5:\"5\", Col 6:\"6\", Col 7:\"7\"}, " +
-			"{Col 1:\"true\", Col 2:\"false\", Col 3:\"true\", Col 4:\"true\", Col 5:\"false\", Col 6:\"false\", Col 7:\"false\"}, " +
-			"{Col 1:\"0.23\", Col 2:\"57.42\", Col 3:\"5e27\", Col 4:\"-234.879\", Col 5:\"2.34e5\", Col 6:\"0.0\", Col 7:\"9e-3\"}, " +
-			"{Col 1:\"va\tl1\", Col 2:\"v\bal2\", Col 3:val3, Col 4:\"val\f4\", Col 5:val5, Col 6:va'l6, Col 7:val7}]";
+    private static final String EXPECTED_LINES =
+            "[  " +
+                "{" +
+                    "\"Col 1\":\"val1\", " +
+                    "\"Col 2\":\"val2\", " +
+                    "\"Col 3\":\"val3\", " +
+                    "\"Col 4\":\"val4\", " +
+                    "\"Col 5\":\"val5\", " +
+                    "\"Col 6\":\"val6\", " +
+                    "\"Col 7\":\"val7\"" +
+                "}, " +
+			"   {" +
+                    "\"Col 1\":\"1\", " +
+                    "\"Col 2\":\"2\", " +
+                    "\"Col 3\":\"3\", " +
+                    "\"Col 4\":\"4\", " +
+                    "\"Col 5\":\"5\", " +
+                    "\"Col 6\":\"6\", " +
+                    "\"Col 7\":\"7\"" +
+                "}, " +
+			"   {" +
+                    "\"Col 1\":\"true\", " +
+                    "\"Col 2\":\"false\", " +
+                    "\"Col 3\":\"true\", " +
+                    "\"Col 4\":\"true\", " +
+                    "\"Col 5\":\"false\", " +
+                    "\"Col 6\":\"false\", " +
+                    "\"Col 7\":\"false\"" +
+                "}, " +
+			    "{" +
+                    "\"Col 1\":\"0.23\", " +
+                    "\"Col 2\":\"57.42\", " +
+                    "\"Col 3\":\"5e27\", " +
+                    "\"Col 4\":\"-234.879\", " +
+                    "\"Col 5\":\"2.34e5\", " +
+                    "\"Col 6\":\"0.0\", " +
+                    "\"Col 7\":\"9e-3\"" +
+                "}, " +
+			    "{" +
+                    "\"Col 1\":\"va\tl1\", " +
+                    "\"Col 2\":\"v\bal2\", " +
+                    "\"Col 3\":\"val3\", " +
+                    "\"Col 4\":\"val\f4\", " +
+                    "\"Col 5\":\"val5\", " +
+                    "\"Col 6\":\"va'l6\", " +
+                    "\"Col 7\":\"val7\"" +
+                "}" +
+            "]";
 
     /**
      * Attempts to create a JSONArray from a null string.
@@ -283,11 +326,11 @@ public void textToJSONArrayPipeDelimited() {
      */
     @Test
     public void jsonArrayToJSONArray() {
-        String nameArrayStr = "[Col1, Col2]";
+        String nameArrayStr = "[\"Col1\", \"Col2\"]";
         String values = "V1, V2";
         JSONArray nameJSONArray = new JSONArray(nameArrayStr);
         JSONArray jsonArray = CDL.toJSONArray(nameJSONArray, values);
-        JSONArray expectedJsonArray = new JSONArray("[{Col1:V1,Col2:V2}]");
+        JSONArray expectedJsonArray = new JSONArray("[{\"Col1\":\"V1\",\"Col2\":\"V2\"}]");
         Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
     }
 
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 283bc9702..ed7c9ba9f 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -476,10 +476,15 @@ public void failedGetArrayValues() {
      */
     @Test
     public void unquotedText() {
-        String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
-        JSONArray jsonArray = new JSONArray(str);
-        List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
-        assertEquals(expected, jsonArray.toList());
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            System.out.println("Skipping JSONArrayTest unquotedText() when strictMode default is true");
+        } else {
+            String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
+            JSONArray jsonArray = new JSONArray(str);
+            List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
+            assertEquals(expected, jsonArray.toList());
+        }
     }
 
     /**
@@ -690,8 +695,8 @@ public void put() {
 
         String jsonArrayStr =
             "["+
-                "hello,"+
-                "world"+
+                "\"hello\","+
+                "\"world\""+
             "]";
         // 2
         jsonArray.put(new JSONArray(jsonArrayStr));
@@ -768,8 +773,8 @@ public void putIndex() {
 
         String jsonArrayStr =
             "["+
-                "hello,"+
-                "world"+
+                "\"hello\","+
+                "\"world\""+
             "]";
         // 2
         jsonArray.put(2, new JSONArray(jsonArrayStr));
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 154af645f..5a360dd59 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -625,7 +625,7 @@ public void toJSONObjectToJSONArray() {
                                 "\"subValue\","+
                                 "{\"svAttr\":\"svValue\"},"+
                                 "\"abc\""+
-                            "],"+
+                            "]"+
                         "],"+
                         "[\"value\",3],"+
                         "[\"value\",4.1],"+
diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
index 43173a288..0f2af2902 100644
--- a/src/test/java/org/json/junit/JSONObjectNumberTest.java
+++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java
@@ -23,18 +23,18 @@ public class JSONObjectNumberTest {
     @Parameters(name = "{index}: {0}")
     public static Collection data() {
         return Arrays.asList(new Object[][]{
-            {"{value:50}", 1},
-            {"{value:50.0}", 1},
-            {"{value:5e1}", 1},
-            {"{value:5E1}", 1},
-            {"{value:5e1}", 1},
-            {"{value:'50'}", 1},
-            {"{value:-50}", -1},
-            {"{value:-50.0}", -1},
-            {"{value:-5e1}", -1},
-            {"{value:-5E1}", -1},
-            {"{value:-5e1}", -1},
-            {"{value:'-50'}", -1}
+            {"{\"value\":50}", 1},
+            {"{\"value\":50.0}", 1},
+            {"{\"value\":5e1}", 1},
+            {"{\"value\":5E1}", 1},
+            {"{\"value\":5e1}", 1},
+            {"{\"value\":\"50\"}", 1},
+            {"{\"value\":-50}", -1},
+            {"{\"value\":-50.0}", -1},
+            {"{\"value\":-5e1}", -1},
+            {"{\"value\":-5E1}", -1},
+            {"{\"value\":-5e1}", -1},
+            {"{\"value\":\"-50\"}", -1}
             // JSON does not support octal or hex numbers;
             // see https://stackoverflow.com/a/52671839/6323312
             // "{value:062}", // octal 50
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index fbad31324..ad4974bb1 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -218,18 +218,23 @@ public void jsonObjectByNullBean() {
      */
     @Test
     public void unquotedText() {
-        String str = "{key1:value1, key2:42, 1.2 : 3.4, -7e5 : something!}";
-        JSONObject jsonObject = new JSONObject(str);
-        String textStr = jsonObject.toString();
-        assertTrue("expected key1", textStr.contains("\"key1\""));
-        assertTrue("expected value1", textStr.contains("\"value1\""));
-        assertTrue("expected key2", textStr.contains("\"key2\""));
-        assertTrue("expected 42", textStr.contains("42"));
-        assertTrue("expected 1.2", textStr.contains("\"1.2\""));
-        assertTrue("expected 3.4", textStr.contains("3.4"));
-        assertTrue("expected -7E+5", textStr.contains("\"-7E+5\""));
-        assertTrue("expected something!", textStr.contains("\"something!\""));
-        Util.checkJSONObjectMaps(jsonObject);
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            System.out.println("Skipping JSONObjectTest unquotedText() when strictMode default is true");
+        } else {
+            String str = "{key1:value1, key2:42, 1.2 : 3.4, -7e5 : something!}";
+            JSONObject jsonObject = new JSONObject(str);
+            String textStr = jsonObject.toString();
+            assertTrue("expected key1", textStr.contains("\"key1\""));
+            assertTrue("expected value1", textStr.contains("\"value1\""));
+            assertTrue("expected key2", textStr.contains("\"key2\""));
+            assertTrue("expected 42", textStr.contains("42"));
+            assertTrue("expected 1.2", textStr.contains("\"1.2\""));
+            assertTrue("expected 3.4", textStr.contains("3.4"));
+            assertTrue("expected -7E+5", textStr.contains("\"-7E+5\""));
+            assertTrue("expected something!", textStr.contains("\"something!\""));
+            Util.checkJSONObjectMaps(jsonObject);
+        }
     }
     
     @Test
@@ -1069,48 +1074,53 @@ public void jsonValidNumberValuesNeitherLongNorIEEE754Compatible() {
      */
     @Test
     public void jsonInvalidNumberValues() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            System.out.println("Skipping JSONObjectTest jsonInvalidNumberValues() when strictMode default is true");
+        } else {
             // Number-notations supported by Java and invalid as JSON
-        String str = 
-            "{"+
-                "\"hexNumber\":-0x123,"+
-                "\"tooManyZeros\":00,"+
-                "\"negativeInfinite\":-Infinity,"+
-                "\"negativeNaN\":-NaN,"+
-                "\"negativeFraction\":-.01,"+
-                "\"tooManyZerosFraction\":00.001,"+
-                "\"negativeHexFloat\":-0x1.fffp1,"+
-                "\"hexFloat\":0x1.0P-1074,"+
-                "\"floatIdentifier\":0.1f,"+
-                "\"doubleIdentifier\":0.1d"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj;
-        obj = jsonObject.get( "hexNumber" );
-        assertFalse( "hexNumber must not be a number (should throw exception!?)",
-                 obj instanceof Number );
-        assertTrue("hexNumber currently evaluates to string",
-                obj.equals("-0x123"));
-        assertTrue( "tooManyZeros currently evaluates to string",
-                jsonObject.get( "tooManyZeros" ).equals("00"));
-        obj = jsonObject.get("negativeInfinite");
-        assertTrue( "negativeInfinite currently evaluates to string",
-                obj.equals("-Infinity"));
-        obj = jsonObject.get("negativeNaN");
-        assertTrue( "negativeNaN currently evaluates to string",
-                obj.equals("-NaN"));
-        assertTrue( "negativeFraction currently evaluates to double -0.01",
-                jsonObject.get( "negativeFraction" ).equals(BigDecimal.valueOf(-0.01)));
-        assertTrue( "tooManyZerosFraction currently evaluates to double 0.001",
-                jsonObject.optLong( "tooManyZerosFraction" )==0);
-        assertTrue( "negativeHexFloat currently evaluates to double -3.99951171875",
-                jsonObject.get( "negativeHexFloat" ).equals(Double.valueOf(-3.99951171875)));
-        assertTrue("hexFloat currently evaluates to double 4.9E-324",
-                jsonObject.get("hexFloat").equals(Double.valueOf(4.9E-324)));
-        assertTrue("floatIdentifier currently evaluates to double 0.1",
-                jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
-        assertTrue("doubleIdentifier currently evaluates to double 0.1",
-                jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
-        Util.checkJSONObjectMaps(jsonObject);
+            String str =
+                    "{" +
+                            "\"hexNumber\":-0x123," +
+                            "\"tooManyZeros\":00," +
+                            "\"negativeInfinite\":-Infinity," +
+                            "\"negativeNaN\":-NaN," +
+                            "\"negativeFraction\":-.01," +
+                            "\"tooManyZerosFraction\":00.001," +
+                            "\"negativeHexFloat\":-0x1.fffp1," +
+                            "\"hexFloat\":0x1.0P-1074," +
+                            "\"floatIdentifier\":0.1f," +
+                            "\"doubleIdentifier\":0.1d" +
+                            "}";
+            JSONObject jsonObject = new JSONObject(str);
+            Object obj;
+            obj = jsonObject.get("hexNumber");
+            assertFalse("hexNumber must not be a number (should throw exception!?)",
+                    obj instanceof Number);
+            assertTrue("hexNumber currently evaluates to string",
+                    obj.equals("-0x123"));
+            assertTrue("tooManyZeros currently evaluates to string",
+                    jsonObject.get("tooManyZeros").equals("00"));
+            obj = jsonObject.get("negativeInfinite");
+            assertTrue("negativeInfinite currently evaluates to string",
+                    obj.equals("-Infinity"));
+            obj = jsonObject.get("negativeNaN");
+            assertTrue("negativeNaN currently evaluates to string",
+                    obj.equals("-NaN"));
+            assertTrue("negativeFraction currently evaluates to double -0.01",
+                    jsonObject.get("negativeFraction").equals(BigDecimal.valueOf(-0.01)));
+            assertTrue("tooManyZerosFraction currently evaluates to double 0.001",
+                    jsonObject.optLong("tooManyZerosFraction") == 0);
+            assertTrue("negativeHexFloat currently evaluates to double -3.99951171875",
+                    jsonObject.get("negativeHexFloat").equals(Double.valueOf(-3.99951171875)));
+            assertTrue("hexFloat currently evaluates to double 4.9E-324",
+                    jsonObject.get("hexFloat").equals(Double.valueOf(4.9E-324)));
+            assertTrue("floatIdentifier currently evaluates to double 0.1",
+                    jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
+            assertTrue("doubleIdentifier currently evaluates to double 0.1",
+                    jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
+            Util.checkJSONObjectMaps(jsonObject);
+        }
     }
 
     /**
@@ -1528,7 +1538,7 @@ public void jsonObjectNames() {
             "{"+
                 "\"trueKey\":true,"+
                 "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\","+
+                "\"stringKey\":\"hello world!\""+
             "}";
         JSONObject jsonObject2 = new JSONObject(str);
         names = JSONObject.getNames(jsonObject2);
@@ -1623,7 +1633,7 @@ public void jsonObjectNamesToJsonAray() {
             "{"+
                 "\"trueKey\":true,"+
                 "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\","+
+                "\"stringKey\":\"hello world!\""+
             "}";
 
         JSONObject jsonObject = new JSONObject(str);
@@ -2262,321 +2272,326 @@ public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
     @SuppressWarnings({"boxing", "unused"})
     @Test
     public void jsonObjectParsingErrors() {
-        try {
-            // does not start with '{'
-            String str = "abc";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-        try {
-            // does not end with '}'
-            String str = "{";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "A JSONObject text must end with '}' at 1 [character 2 line 1]",
-                    e.getMessage());
-        }
-        try {
-            // key with no ':'
-            String str = "{\"myKey\" = true}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "Expected a ':' after a key at 10 [character 11 line 1]",
-                    e.getMessage());
-        }
-        try {
-            // entries with no ',' separator
-            String str = "{\"myKey\":true \"myOtherKey\":false}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "Expected a ',' or '}' at 15 [character 16 line 1]",
-                    e.getMessage());
-        }
-        try {
-            // key is a nested map
-            String str = "{{\"foo\": \"bar\"}: \"baz\"}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Missing value at 1 [character 2 line 1]",
-                e.getMessage());
-        }
-        try {
-            // key is a nested array containing a map
-            String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Missing value at 9 [character 10 line 1]",
-                e.getMessage());
-        }
-        try {
-            // key contains }
-            String str = "{foo}: 2}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Expected a ':' after a key at 5 [character 6 line 1]",
-                e.getMessage());
-        }
-        try {
-            // key contains ]
-            String str = "{foo]: 2}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                "Expected a ':' after a key at 5 [character 6 line 1]",
-                e.getMessage());
-        }
-        try {
-            // \0 after ,
-            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
-            assertNull("Expected an exception",new JSONObject(str));
-        } catch (JSONException e) {
-            assertEquals("Expecting an exception message",
-                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
-                    e.getMessage());
-        }
-        try {
-            // append to wrong key
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.append("myKey", "hello");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "JSONObject[\"myKey\"] is not a JSONArray (null).",
-                    e.getMessage());
-        }
-        try {
-            // increment wrong key
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.increment("myKey");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "Unable to increment [\"myKey\"].",
-                    e.getMessage());
-        }
-        try {
-            // invalid key
-            String str = "{\"myKey\":true, \"myOtherKey\":false}";
-            JSONObject jsonObject = new JSONObject(str);
-            jsonObject.get(null);
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message",
-                    "Null key.",
-                    e.getMessage());
-        }
-        try {
-            // invalid numberToString()
-            JSONObject.numberToString((Number)null);
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
-                    "Null pointer",
-                    e.getMessage());
-        }
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            System.out.println("Skipping JSONObjectTest jaonObjectParsingErrors() when strictMode default is true");
+        } else {
+            try {
+                // does not start with '{'
+                String str = "abc";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // does not end with '}'
+                String str = "{";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "A JSONObject text must end with '}' at 1 [character 2 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // key with no ':'
+                String str = "{\"myKey\" = true}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Expected a ':' after a key at 10 [character 11 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // entries with no ',' separator
+                String str = "{\"myKey\":true \"myOtherKey\":false}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Expected a ',' or '}' at 15 [character 16 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // key is a nested map
+                String str = "{{\"foo\": \"bar\"}: \"baz\"}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Missing value at 1 [character 2 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // key is a nested array containing a map
+                String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Missing value at 9 [character 10 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // key contains }
+                String str = "{foo}: 2}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Expected a ':' after a key at 5 [character 6 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // key contains ]
+                String str = "{foo]: 2}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Expected a ':' after a key at 5 [character 6 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // \0 after ,
+                String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
+                assertNull("Expected an exception", new JSONObject(str));
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+                        e.getMessage());
+            }
+            try {
+                // append to wrong key
+                String str = "{\"myKey\":true, \"myOtherKey\":false}";
+                JSONObject jsonObject = new JSONObject(str);
+                jsonObject.append("myKey", "hello");
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "JSONObject[\"myKey\"] is not a JSONArray (null).",
+                        e.getMessage());
+            }
+            try {
+                // increment wrong key
+                String str = "{\"myKey\":true, \"myOtherKey\":false}";
+                JSONObject jsonObject = new JSONObject(str);
+                jsonObject.increment("myKey");
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Unable to increment [\"myKey\"].",
+                        e.getMessage());
+            }
+            try {
+                // invalid key
+                String str = "{\"myKey\":true, \"myOtherKey\":false}";
+                JSONObject jsonObject = new JSONObject(str);
+                jsonObject.get(null);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Null key.",
+                        e.getMessage());
+            }
+            try {
+                // invalid numberToString()
+                JSONObject.numberToString((Number) null);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an exception message",
+                        "Null pointer",
+                        e.getMessage());
+            }
 
-        try {
-            // multiple putOnce key 
-            JSONObject jsonObject = new JSONObject("{}");
-            jsonObject.putOnce("hello", "world");
-            jsonObject.putOnce("hello", "world!");
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertTrue("", true);
-        }
-        try {
-            // test validity of invalid double 
-            JSONObject.testValidity(Double.NaN);
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertTrue("", true);
-        }
-        try {
-            // test validity of invalid float 
-            JSONObject.testValidity(Float.NEGATIVE_INFINITY);
-            fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertTrue("", true);
-        }
-        try {
-            // test exception message when including a duplicate key (level 0)
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr03\":\"value-04\"\n"
+            try {
+                // multiple putOnce key
+                JSONObject jsonObject = new JSONObject("{}");
+                jsonObject.putOnce("hello", "world");
+                jsonObject.putOnce("hello", "world!");
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertTrue("", true);
+            }
+            try {
+                // test validity of invalid double
+                JSONObject.testValidity(Double.NaN);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertTrue("", true);
+            }
+            try {
+                // test validity of invalid float
+                JSONObject.testValidity(Float.NEGATIVE_INFINITY);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertTrue("", true);
+            }
+            try {
+                // test exception message when including a duplicate key (level 0)
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr03\":\"value-04\"\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key (level 0) holding an object
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr03\": {"
-                        +"        \"attr04-01\":\"value-04-01\",n"
-                        +"        \"attr04-02\":\"value-04-02\",n"
-                        +"        \"attr04-03\":\"value-04-03\"n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key (level 0) holding an object
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr03\": {"
+                        + "        \"attr04-01\":\"value-04-01\",n"
+                        + "        \"attr04-02\":\"value-04-02\",n"
+                        + "        \"attr04-03\":\"value-04-03\"n"
                         + "    }\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key (level 0) holding an array
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr03\": [\n"
-                        +"        {"
-                        +"            \"attr04-01\":\"value-04-01\",n"
-                        +"            \"attr04-02\":\"value-04-02\",n"
-                        +"            \"attr04-03\":\"value-04-03\"n"
-                        +"        }\n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key (level 0) holding an array
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr03\": [\n"
+                        + "        {"
+                        + "            \"attr04-01\":\"value-04-01\",n"
+                        + "            \"attr04-02\":\"value-04-02\",n"
+                        + "            \"attr04-03\":\"value-04-03\"n"
+                        + "        }\n"
                         + "    ]\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key (level 1)
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr04\": {\n"
-                        +"        \"attr04-01\":\"value04-01\",\n"
-                        +"        \"attr04-02\":\"value04-02\",\n"
-                        +"        \"attr04-03\":\"value04-03\",\n"
-                        +"        \"attr04-03\":\"value04-04\"\n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key (level 1)
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr04\": {\n"
+                        + "        \"attr04-01\":\"value04-01\",\n"
+                        + "        \"attr04-02\":\"value04-02\",\n"
+                        + "        \"attr04-03\":\"value04-03\",\n"
+                        + "        \"attr04-03\":\"value04-04\"\n"
                         + "    }\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key (level 1) holding an object
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr04\": {\n"
-                        +"        \"attr04-01\":\"value04-01\",\n"
-                        +"        \"attr04-02\":\"value04-02\",\n"
-                        +"        \"attr04-03\":\"value04-03\",\n"
-                        +"        \"attr04-03\": {\n"
-                        +"            \"attr04-04-01\":\"value04-04-01\",\n"
-                        +"            \"attr04-04-02\":\"value04-04-02\",\n"
-                        +"            \"attr04-04-03\":\"value04-04-03\",\n"
-                        +"        }\n"
-                        +"    }\n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key (level 1) holding an object
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr04\": {\n"
+                        + "        \"attr04-01\":\"value04-01\",\n"
+                        + "        \"attr04-02\":\"value04-02\",\n"
+                        + "        \"attr04-03\":\"value04-03\",\n"
+                        + "        \"attr04-03\": {\n"
+                        + "            \"attr04-04-01\":\"value04-04-01\",\n"
+                        + "            \"attr04-04-02\":\"value04-04-02\",\n"
+                        + "            \"attr04-04-03\":\"value04-04-03\",\n"
+                        + "        }\n"
+                        + "    }\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key (level 1) holding an array
-            String str = "{\n"
-                        +"    \"attr01\":\"value-01\",\n"
-                        +"    \"attr02\":\"value-02\",\n"
-                        +"    \"attr03\":\"value-03\",\n"
-                        +"    \"attr04\": {\n"
-                        +"        \"attr04-01\":\"value04-01\",\n"
-                        +"        \"attr04-02\":\"value04-02\",\n"
-                        +"        \"attr04-03\":\"value04-03\",\n"
-                        +"        \"attr04-03\": [\n"
-                        +"            {\n"
-                        +"                \"attr04-04-01\":\"value04-04-01\",\n"
-                        +"                \"attr04-04-02\":\"value04-04-02\",\n"
-                        +"                \"attr04-04-03\":\"value04-04-03\",\n"
-                        +"            }\n"
-                        +"        ]\n"
-                        +"    }\n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key (level 1) holding an array
+                String str = "{\n"
+                        + "    \"attr01\":\"value-01\",\n"
+                        + "    \"attr02\":\"value-02\",\n"
+                        + "    \"attr03\":\"value-03\",\n"
+                        + "    \"attr04\": {\n"
+                        + "        \"attr04-01\":\"value04-01\",\n"
+                        + "        \"attr04-02\":\"value04-02\",\n"
+                        + "        \"attr04-03\":\"value04-03\",\n"
+                        + "        \"attr04-03\": [\n"
+                        + "            {\n"
+                        + "                \"attr04-04-01\":\"value04-04-01\",\n"
+                        + "                \"attr04-04-02\":\"value04-04-02\",\n"
+                        + "                \"attr04-04-03\":\"value04-04-03\",\n"
+                        + "            }\n"
+                        + "        ]\n"
+                        + "    }\n"
                         + "}";
-            new JSONObject(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key in object (level 0) within an array
-            String str = "[\n"
-                        +"    {\n"
-                        +"        \"attr01\":\"value-01\",\n"
-                        +"        \"attr02\":\"value-02\"\n"
-                        +"    },\n"
-                        +"    {\n"
-                        +"        \"attr01\":\"value-01\",\n"
-                        +"        \"attr01\":\"value-02\"\n"
-                        +"    }\n"
+                new JSONObject(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key in object (level 0) within an array
+                String str = "[\n"
+                        + "    {\n"
+                        + "        \"attr01\":\"value-01\",\n"
+                        + "        \"attr02\":\"value-02\"\n"
+                        + "    },\n"
+                        + "    {\n"
+                        + "        \"attr01\":\"value-01\",\n"
+                        + "        \"attr01\":\"value-02\"\n"
+                        + "    }\n"
                         + "]";
-            new JSONArray(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr01\" at 124 [character 17 line 8]",
-                    e.getMessage());
-        }
-        try {
-            // test exception message when including a duplicate key in object (level 1) within an array
-            String str = "[\n"
-                        +"    {\n"
-                        +"        \"attr01\":\"value-01\",\n"
-                        +"        \"attr02\": {\n"
-                        +"            \"attr02-01\":\"value-02-01\",\n"
-                        +"            \"attr02-02\":\"value-02-02\"\n"
-                        +"        }\n"
-                        +"    },\n"
-                        +"    {\n"
-                        +"        \"attr01\":\"value-01\",\n"
-                        +"        \"attr02\": {\n"
-                        +"            \"attr02-01\":\"value-02-01\",\n"
-                        +"            \"attr02-01\":\"value-02-02\"\n"
-                        +"        }\n"
-                        +"    }\n"
+                new JSONArray(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr01\" at 124 [character 17 line 8]",
+                        e.getMessage());
+            }
+            try {
+                // test exception message when including a duplicate key in object (level 1) within an array
+                String str = "[\n"
+                        + "    {\n"
+                        + "        \"attr01\":\"value-01\",\n"
+                        + "        \"attr02\": {\n"
+                        + "            \"attr02-01\":\"value-02-01\",\n"
+                        + "            \"attr02-02\":\"value-02-02\"\n"
+                        + "        }\n"
+                        + "    },\n"
+                        + "    {\n"
+                        + "        \"attr01\":\"value-01\",\n"
+                        + "        \"attr02\": {\n"
+                        + "            \"attr02-01\":\"value-02-01\",\n"
+                        + "            \"attr02-01\":\"value-02-02\"\n"
+                        + "        }\n"
+                        + "    }\n"
                         + "]";
-            new JSONArray(str);
-            fail("Expected an exception");
-        } catch (JSONException e) {
-            assertEquals("Expecting an expection message",
-                    "Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
-                    e.getMessage());
+                new JSONArray(str);
+                fail("Expected an exception");
+            } catch (JSONException e) {
+                assertEquals("Expecting an expection message",
+                        "Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
+                        e.getMessage());
+            }
         }
     }
 
@@ -3815,21 +3830,21 @@ public void clarifyCurrentBehavior() {
 
         // Behavior documented in #826 JSONObject parsing 0-led numeric strings as ints
         // After reverting the code, personId is stored as a string, and the behavior is as expected
-        String personId = "0123";
-        JSONObject j1 = new JSONObject("{personId: " + personId + "}");
+        String personId = "\"0123\"";
+        JSONObject j1 = new JSONObject("{\"personId\": " + personId + "}");
         assertEquals(j1.getString("personId"), "0123");
 
         // Also #826. Here is input with missing quotes. Because of the leading zero, it should not be parsed as a number.
         // This example was mentioned in the same ticket
         // After reverting the code, personId is stored as a string, and the behavior is as expected
-        JSONObject j2 = new JSONObject("{\"personId\":0123}");
+        JSONObject j2 = new JSONObject("{\"personId\":\"0123\"}");
         assertEquals(j2.getString("personId"), "0123");
 
         // Behavior uncovered while working on the code
         // All of the values are stored as strings except for hex4, which is stored as a number. This is probably incorrect
         JSONObject j3 = new JSONObject("{ " +
                 "\"hex1\": \"010e4\", \"hex2\": \"00f0\", \"hex3\": \"0011\", " +
-                "\"hex4\": 00e0, \"hex5\": 00f0, \"hex6\": 0011 }");
+                "\"hex4\": 00e0, \"hex5\": \"00f0\", \"hex6\": \"0011\" }");
         assertEquals(j3.getString("hex1"), "010e4");
         assertEquals(j3.getString("hex2"), "00f0");
         assertEquals(j3.getString("hex3"), "0011");
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 45c7dbd3d..a420b297f 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -384,8 +384,7 @@ public void queryFromJSONObjectUsingPointer0() {
     	String str = "{"+
                 "\"string\\\\\\\\Key\":\"hello world!\","+
 
-                "\"\\\\\":\"slash test\"," + 
-                "}"+
+                "\"\\\\\":\"slash test\"" +
                 "}";
             JSONObject jsonObject = new JSONObject(str);
             //Summary of issue: When a KEY in the jsonObject is "\\\\" --> it's held
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index e9714afe7..867f0fa9b 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -270,9 +270,9 @@ public void shouldHandleSimpleXML() {
 
         String expectedStr = 
             "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+
-            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",TrueValue:true,\n"+
+            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+
             "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+
-            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":-23x.45,\n"+
+            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+
             "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
             "},\"xsi:noNamespaceSchemaLocation\":"+
             "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 3b26b22e2..2fa5daeea 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -267,9 +267,9 @@ public void shouldHandleSimpleXML() {
 
         String expectedStr = 
             "{\"addresses\":{\"address\":{\"street\":\"[CDATA[Baker street 5]\","+
-            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",TrueValue:true,\n"+
+            "\"name\":\"Joe Tester\",\"NothingHere\":\"\",\"TrueValue\":true,\n"+
             "\"FalseValue\":false,\"NullValue\":null,\"PositiveValue\":42,\n"+
-            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":-23x.45,\n"+
+            "\"NegativeValue\":-23,\"DoubleValue\":-23.45,\"Nan\":\"-23x.45\",\n"+
             "\"ArrayOfNum\":\"1, 2, 3, 4.1, 5.2\"\n"+
             "},\"xsi:noNamespaceSchemaLocation\":"+
             "\"test.xsd\",\"xmlns:xsi\":\"http://www.w3.org/2001/"+
@@ -1180,7 +1180,7 @@ public void testIndentComplicatedJsonObject(){
 
     @Test
     public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){
-        String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}";
+        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
         JSONObject jsonObject = new JSONObject(jsonString);
         String expectedXmlString = "two";
         String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(true));
@@ -1191,7 +1191,7 @@ public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){
 
     @Test
     public void shouldNotCreateExplicitEndTagWithEmptyValueWhenNotConfigured(){
-        String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}";
+        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
         JSONObject jsonObject = new JSONObject(jsonString);
         String expectedXmlString = "two";
         String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(false));

From 2dcef89a6f3a79a0efc2c1e260029a5b26c646a9 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sat, 21 Dec 2024 09:50:52 -0600
Subject: [PATCH 012/106] Code review action items - add comments and
 consistent error messages for strict mode

---
 src/main/java/org/json/JSONArray.java         | 32 ++++++++------
 src/main/java/org/json/JSONObject.java        | 21 ++++++----
 .../org/json/JSONParserConfiguration.java     | 20 +++++----
 src/main/java/org/json/JSONTokener.java       |  7 +++-
 .../java/org/json/junit/JSONArrayTest.java    |  2 +-
 .../java/org/json/junit/JSONObjectTest.java   |  2 +-
 .../junit/JSONParserConfigurationTest.java    | 42 ++++++++++++-------
 7 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 759acd7a4..6458ab254 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -67,8 +67,10 @@ public class JSONArray implements Iterable {
      */
     private final ArrayList myArrayList;
 
+    // strict mode checks after constructor require access to this object
     private JSONTokener jsonTokener;
 
+    // strict mode checks after constructor require access to this object
     private JSONParserConfiguration jsonParserConfiguration;
 
     /**
@@ -138,8 +140,16 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                         throw x.syntaxError("Expected a ',' or ']'");
                     }
                     if (nextChar == ']') {
+                        // trailing commas are not allowed in strict mode
                         if (jsonParserConfiguration.isStrictMode()) {
-                            throw x.syntaxError("Expected another array element");
+                            throw x.syntaxError("Strict mode error: Expected another array element");
+                        }
+                        return;
+                    }
+                    if (nextChar == ',') {
+                        // consecutive commas are not allowed in strict mode
+                        if (jsonParserConfiguration.isStrictMode()) {
+                            throw x.syntaxError("Strict mode error: Expected a valid array element");
                         }
                         return;
                     }
@@ -166,12 +176,10 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
      */
     public JSONArray(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
-        if (this.jsonParserConfiguration.isStrictMode()) {
-                char c = jsonTokener.nextClean();
-                if (c != 0) {
-                    throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
-
-            }
+        // Strict mode does not allow trailing chars
+        if (this.jsonParserConfiguration.isStrictMode() &&
+                this.jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
         }
     }
 
@@ -188,12 +196,10 @@ public JSONArray(String source) throws JSONException {
      */
     public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this(new JSONTokener(source), jsonParserConfiguration);
-        if (this.jsonParserConfiguration.isStrictMode()) {
-            char c = jsonTokener.nextClean();
-            if (c != 0) {
-                throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
-
-            }
+        // Strict mode does not allow trailing chars
+        if (this.jsonParserConfiguration.isStrictMode() &&
+                this.jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
         }
     }
 
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index f49bab3c9..3bb6da7ed 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -152,8 +152,10 @@ public Class getMapType() {
      */
     public static final Object NULL = new Null();
 
+    // strict mode checks after constructor require access to this object
     private JSONTokener jsonTokener;
 
+    // strict mode checks after constructor require access to this object
     private JSONParserConfiguration jsonParserConfiguration;
 
     /**
@@ -268,13 +270,15 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
 
             switch (x.nextClean()) {
             case ';':
+                // In strict mode semicolon is not a valid separator
                 if (jsonParserConfiguration.isStrictMode()) {
-                    throw x.syntaxError("Invalid character ';' found in object in strict mode");
+                    throw x.syntaxError("Strict mode error: Invalid character ';' found");
                 }
             case ',':
                 if (x.nextClean() == '}') {
+                    // trailing commas are not allowed in strict mode
                     if (jsonParserConfiguration.isStrictMode()) {
-                        throw x.syntaxError("Expected another object element");
+                        throw x.syntaxError("Strict mode error: Expected another object element");
                     }
                     return;
                 }
@@ -452,9 +456,10 @@ public JSONObject(Object object, String ... names) {
      */
     public JSONObject(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
+        // Strict mode does not allow trailing chars
         if (this.jsonParserConfiguration.isStrictMode() &&
                 this.jsonTokener.nextClean() != 0) {
-            throw new JSONException("Unparsed characters found at end of input text");
+            throw new JSONException("Strict mode error: Unparsed characters found at end of input text");
         }
     }
 
@@ -474,12 +479,10 @@ public JSONObject(String source) throws JSONException {
      */
     public JSONObject(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this(new JSONTokener(source), jsonParserConfiguration);
-        if (this.jsonParserConfiguration.isStrictMode()) {
-            char c = jsonTokener.nextClean();
-            if (c != 0) {
-                throw jsonTokener.syntaxError(String.format("invalid character '%s' found after end of array", c));
-
-            }
+        // Strict mode does not allow trailing chars
+        if (this.jsonParserConfiguration.isStrictMode() &&
+                this.jsonTokener.nextClean() != 0) {
+            throw new JSONException("Strict mode error: Unparsed characters found at end of input text");
         }
     }
 
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 46996cbd3..f5d0660e2 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -64,6 +64,18 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
         return clone;
     }
 
+    /**
+     * Sets the strict mode configuration for the JSON parser with default true value
+     * 

+     * When strict mode is enabled, the parser will throw a JSONException if it encounters an invalid character
+     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
+     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
+     * @return a new JSONParserConfiguration instance with the updated strict mode setting
+     */
+    public JSONParserConfiguration withStrictMode() {
+        return withStrictMode(true);
+    }
+
     /**
      * Sets the strict mode configuration for the JSON parser.
      * 

@@ -92,13 +104,7 @@ public boolean isOverwriteDuplicateKey() {
     }
 
     /**
-     * Retrieves the current strict mode setting of the JSON parser.
-     * 

-     * Strict mode, when enabled, instructs the parser to throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This ensures strict adherence to the JSON syntax, as
-     * any characters after the final closing bracket of a JSON array are considered invalid.
-     *
-     * @return the current strict mode setting. True if strict mode is enabled, false otherwise.
+     * @return the current strict mode setting.
      */
     public boolean isStrictMode() {
         return this.strictMode;
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 2fcc24a50..d4c780e86 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -32,6 +32,7 @@ public class JSONTokener {
     /** the number of characters read in the previous line. */
     private long characterPreviousLine;
 
+    // access to this object is required for strict mode checking
     private JSONParserConfiguration jsonParserConfiguration;
 
     /**
@@ -443,10 +444,11 @@ public Object nextValue() throws JSONException {
     Object nextSimpleValue(char c) {
         String string;
 
+        // Strict mode only allows strings with explicit double quotes
         if (jsonParserConfiguration != null &&
                 jsonParserConfiguration.isStrictMode() &&
                 c == '\'') {
-            throw this.syntaxError("Single quote wrap not allowed in strict mode");
+            throw this.syntaxError("Strict mode error: Single quoted strings are not allowed");
         }
         switch (c) {
         case '"':
@@ -477,10 +479,11 @@ Object nextSimpleValue(char c) {
             throw this.syntaxError("Missing value");
         }
         Object obj = JSONObject.stringToValue(string);
+        // Strict mode only allows strings with explicit double quotes
         if (jsonParserConfiguration != null &&
                 jsonParserConfiguration.isStrictMode() &&
                 obj instanceof String) {
-            throw this.syntaxError(String.format("Value '%s' is not surrounded by quotes", obj));
+            throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
         }
         return obj;
     }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index ed7c9ba9f..e6d71479e 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -481,7 +481,7 @@ public void unquotedText() {
             System.out.println("Skipping JSONArrayTest unquotedText() when strictMode default is true");
         } else {
             String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
-            JSONArray jsonArray = new JSONArray(str);
+                JSONArray jsonArray = new JSONArray(str);
             List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
             assertEquals(expected, jsonArray.toList());
         }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index ad4974bb1..7f121f3c5 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -83,7 +83,7 @@ public void tearDown() {
         Singleton.getInstance().setSomeInt(0);
         Singleton.getInstance().setSomeString(null);
     }
-    
+
     /**
      * Tests that the similar method is working as expected.
      */
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 84c391163..422c90c34 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -184,7 +184,8 @@ public void givenInvalidStringArray_testStrictModeTrue_shouldThrowJsonException(
                 .withStrictMode(true);
         String testCase = "[badString]";
         JSONException je = assertThrows(JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -193,7 +194,8 @@ public void givenInvalidStringObject_testStrictModeTrue_shouldThrowJsonException
                 .withStrictMode(true);
         String testCase = "{\"a0\":badString}";
         JSONException je = assertThrows(JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Value 'badString' is not surrounded by quotes at 15 [character 16 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'badString' is not surrounded by quotes at 15 [character 16 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -289,7 +291,8 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowInvalidCharacte
         String testCase = "[1,2];[3,4]";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("invalid character ';' found after end of array at 6 [character 7 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 6 [character 7 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -299,7 +302,7 @@ public void givenInvalidInputObject_testStrictModeTrue_shouldThrowInvalidCharact
         String testCase = "{\"a0\":[1,2];\"a1\":[3,4]}";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Invalid character ';' found in object in strict mode at 12 [character 13 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Invalid character ';' found at 12 [character 13 line 1]", je.getMessage());
     }
 
     @Test
@@ -309,7 +312,8 @@ public void givenInvalidInputArrayWithNumericStrings_testStrictModeTrue_shouldTh
         String testCase = "[\"1\",\"2\"];[3,4]";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("invalid character ';' found after end of array at 10 [character 11 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 10 [character 11 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -319,7 +323,7 @@ public void givenInvalidInputObjectWithNumericStrings_testStrictModeTrue_shouldT
         String testCase = "{\"a0\":[\"1\",\"2\"];\"a1\":[3,4]}";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Invalid character ';' found in object in strict mode at 16 [character 17 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Invalid character ';' found at 16 [character 17 line 1]", je.getMessage());
     }
 
     @Test
@@ -329,7 +333,8 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowValueNotSurroun
         String testCase = "[{\"test\": implied}]";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
-        assertEquals("Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'implied' is not surrounded by quotes at 17 [character 18 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -339,7 +344,8 @@ public void givenInvalidInputObject_testStrictModeTrue_shouldThrowValueNotSurrou
         String testCase = "{\"a0\":{\"test\": implied}]}";
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
-        assertEquals("Value 'implied' is not surrounded by quotes at 22 [character 23 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'implied' is not surrounded by quotes at 22 [character 23 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -381,13 +387,13 @@ public void givenNonCompliantQuotesArray_testStrictModeTrue_shouldThrowJsonExcep
                 "Expected a ',' or ']' at 10 [character 11 line 1]",
                 jeOne.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
                 jeTwo.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
                 jeThree.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 3 [character 4 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 3 [character 4 line 1]",
                 jeFour.getMessage());
     }
 
@@ -414,13 +420,13 @@ public void givenNonCompliantQuotesObject_testStrictModeTrue_shouldThrowJsonExce
                 "Expected a ':' after a key at 10 [character 11 line 1]",
                 jeOne.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
                 jeTwo.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 6 [character 7 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 6 [character 7 line 1]",
                 jeThree.getMessage());
         assertEquals(
-                "Single quote wrap not allowed in strict mode at 2 [character 3 line 1]",
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
                 jeFour.getMessage());
     }
 
@@ -467,7 +473,8 @@ public void givenInvalidInputArray_testStrictModeTrue_shouldThrowKeyNotSurrounde
         JSONException je = assertThrows("expected non-compliant array but got instead: " + testCase,
                 JSONException.class, () -> new JSONArray(testCase, jsonParserConfiguration));
 
-        assertEquals("Value 'test' is not surrounded by quotes at 6 [character 7 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'test' is not surrounded by quotes at 6 [character 7 line 1]",
+                je.getMessage());
     }
 
     @Test
@@ -479,7 +486,8 @@ public void givenInvalidInputObject_testStrictModeTrue_shouldThrowKeyNotSurround
         JSONException je = assertThrows("expected non-compliant json but got instead: " + testCase,
                 JSONException.class, () -> new JSONObject(testCase, jsonParserConfiguration));
 
-        assertEquals("Value 'test' is not surrounded by quotes at 5 [character 6 line 1]", je.getMessage());
+        assertEquals("Strict mode error: Value 'test' is not surrounded by quotes at 5 [character 6 line 1]",
+                je.getMessage());
     }
 
     /**
@@ -492,6 +500,8 @@ private List getNonCompliantJSONArrayList() {
         return Arrays.asList(
                 "[1],",
                 "[1,]",
+                "[,]",
+                "[,,]",
                 "[[1],\"sa\",[2]]a",
                 "[1],\"dsa\": \"test\"",
                 "[[a]]",

From 4cd70cf9d93f9d982fe68ea15ab69e0bca3e9f61 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Tue, 24 Dec 2024 08:19:27 -0600
Subject: [PATCH 013/106] pre-release-20241224: updates for next release

---
 README.md        | 2 +-
 docs/RELEASES.md | 2 ++
 pom.xml          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 78920a180..977374dbc 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ JSON in Java [package org.json]
 [![Java CI with Maven](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml)
 [![CodeQL](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20241224/json-20241224.jar)**
 
 
 # Overview
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 30b8af2bc..d9beb11a0 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20241224....Strict mode opt-in feature, and recent commits.
+
 20240303    Revert optLong/getLong changes, and recent commits.
 
 20240205    Recent commits.
diff --git a/pom.xml b/pom.xml
index bc1a7c4b1..32d40f9f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     org.json
     json
-    20240303
+    20241224
     bundle
 
     JSON in Java

From 41c6e9e81ec589058e424458bb47ffe4c28824b2 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Tue, 7 Jan 2025 07:47:46 -0600
Subject: [PATCH 014/106] restore-moditect-pom.xml restore plugin

---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index 32d40f9f4..c98ed2783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,6 +193,30 @@
                     
                 
             
+            
+                org.moditect
+                moditect-maven-plugin
+                1.0.0.Final
+                
+                    
+                        add-module-infos
+                        package
+                        
+                            add-module-info
+                        
+                        
+                            9
+                            
+                                
+                                    module org.json {
+                                    exports org.json;
+                                    }
+                                
+                            
+                        
+                    
+                
+            
             
                 org.apache.maven.plugins
                 maven-jar-plugin

From ed8c73964afa393dd250fe34fec7021812766b13 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Tue, 7 Jan 2025 15:30:43 -0600
Subject: [PATCH 015/106] pre-release-20250107

---
 README.md        | 2 +-
 build.gradle     | 2 +-
 docs/RELEASES.md | 5 ++++-
 pom.xml          | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 977374dbc..1271f8d75 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ JSON in Java [package org.json]
 [![Java CI with Maven](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml)
 [![CodeQL](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20241224/json-20241224.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20250107/json-20250107.jar)**
 
 
 # Overview
diff --git a/build.gradle b/build.gradle
index b92366eb1..2c0fc6d2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20230618-SNAPSHOT'
+version = 'v20250107-SNAPSHOT'
 description = 'JSON in Java'
 sourceCompatibility = '1.8'
 
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index d9beb11a0..8e598f929 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,7 +5,10 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
-20241224....Strict mode opt-in feature, and recent commits.
+20250107....Restore moditect in pom.xml
+
+20241224....Strict mode opt-in feature, and recent commits. This release does not contain module-info.class.
+It is not recommended if you need this feature.
 
 20240303    Revert optLong/getLong changes, and recent commits.
 
diff --git a/pom.xml b/pom.xml
index c98ed2783..536b8155f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     org.json
     json
-    20241224
+    20250107
     bundle
 
     JSON in Java

From 2e153737b1b32f414fa3208a0766f4c07000144c Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Wed, 8 Jan 2025 07:33:37 -0600
Subject: [PATCH 016/106] remove-duplicate-moditect: from pom.xml

---
 pom.xml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 536b8155f..fe4f7704d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,30 +193,6 @@
                     
                 
             
-            
-                org.moditect
-                moditect-maven-plugin
-                1.0.0.Final
-                
-                    
-                        add-module-infos
-                        package
-                        
-                            add-module-info
-                        
-                        
-                            9
-                            
-                                
-                                    module org.json {
-                                    exports org.json;
-                                    }
-                                
-                            
-                        
-                    
-                
-            
             
                 org.apache.maven.plugins
                 maven-jar-plugin

From ca1c6830c9ea35c3ba397e9031ff73dd5410d5c1 Mon Sep 17 00:00:00 2001
From: Michael Ameri 
Date: Fri, 10 Jan 2025 18:03:05 +0100
Subject: [PATCH 017/106] remove field references to JSONTokener and
 JSONParserConfiguration in JSONArray  and JSONObject

---
 src/main/java/org/json/JSONArray.java   | 35 +++++++----------------
 src/main/java/org/json/JSONObject.java  | 37 +++++++------------------
 src/main/java/org/json/JSONTokener.java | 20 +++++++++++--
 3 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 6458ab254..bdad42753 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -67,12 +67,6 @@ public class JSONArray implements Iterable {
      */
     private final ArrayList myArrayList;
 
-    // strict mode checks after constructor require access to this object
-    private JSONTokener jsonTokener;
-
-    // strict mode checks after constructor require access to this object
-    private JSONParserConfiguration jsonParserConfiguration;
-
     /**
      * Construct an empty JSONArray.
      */
@@ -102,14 +96,7 @@ public JSONArray(JSONTokener x) throws JSONException {
     public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
 
-        if (this.jsonParserConfiguration == null) {
-            this.jsonParserConfiguration = jsonParserConfiguration;
-        }
-        if (this.jsonTokener == null) {
-            this.jsonTokener = x;
-            this.jsonTokener.setJsonParserConfiguration(this.jsonParserConfiguration);
-        }
-
+        boolean isInitial = x.getPrevious() == 0;
         if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
@@ -156,11 +143,19 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                     x.back();
                     break;
                 case ']':
+                    if (isInitial && jsonParserConfiguration.isStrictMode() &&
+                            x.nextClean() != 0) {
+                        throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                    }
                     return;
                 default:
                     throw x.syntaxError("Expected a ',' or ']'");
                 }
             }
+        } else {
+            if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
+                throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+            }
         }
     }
 
@@ -176,11 +171,6 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
      */
     public JSONArray(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
-        // Strict mode does not allow trailing chars
-        if (this.jsonParserConfiguration.isStrictMode() &&
-                this.jsonTokener.nextClean() != 0) {
-                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
-        }
     }
 
     /**
@@ -195,12 +185,7 @@ public JSONArray(String source) throws JSONException {
      *             If there is a syntax error.
      */
     public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
-        this(new JSONTokener(source), jsonParserConfiguration);
-        // Strict mode does not allow trailing chars
-        if (this.jsonParserConfiguration.isStrictMode() &&
-                this.jsonTokener.nextClean() != 0) {
-                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
-        }
+        this(new JSONTokener(source, jsonParserConfiguration), jsonParserConfiguration);
     }
 
     /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 3bb6da7ed..7ec1b2cc6 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -152,12 +152,6 @@ public Class getMapType() {
      */
     public static final Object NULL = new Null();
 
-    // strict mode checks after constructor require access to this object
-    private JSONTokener jsonTokener;
-
-    // strict mode checks after constructor require access to this object
-    private JSONParserConfiguration jsonParserConfiguration;
-
     /**
      * Construct an empty JSONObject.
      */
@@ -217,18 +211,11 @@ public JSONObject(JSONTokener x) throws JSONException {
      */
     public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
-
-        if (this.jsonParserConfiguration == null) {
-            this.jsonParserConfiguration = jsonParserConfiguration;
-        }
-        if (this.jsonTokener == null) {
-            this.jsonTokener = x;
-            this.jsonTokener.setJsonParserConfiguration(this.jsonParserConfiguration);
-        }
-
         char c;
         String key;
 
+        boolean isInitial = x.getPrevious() == 0;
+
         if (x.nextClean() != '{') {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
@@ -238,6 +225,9 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
             case 0:
                 throw x.syntaxError("A JSONObject text must end with '}'");
             case '}':
+                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
+                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                }
                 return;
             default:
                 key = x.nextSimpleValue(c).toString();
@@ -288,6 +278,9 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
                 x.back();
                 break;
             case '}':
+                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
+                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                }
                 return;
             default:
                 throw x.syntaxError("Expected a ',' or '}'");
@@ -456,11 +449,6 @@ public JSONObject(Object object, String ... names) {
      */
     public JSONObject(String source) throws JSONException {
         this(source, new JSONParserConfiguration());
-        // Strict mode does not allow trailing chars
-        if (this.jsonParserConfiguration.isStrictMode() &&
-                this.jsonTokener.nextClean() != 0) {
-            throw new JSONException("Strict mode error: Unparsed characters found at end of input text");
-        }
     }
 
     /**
@@ -478,12 +466,7 @@ public JSONObject(String source) throws JSONException {
      *                duplicated key.
      */
     public JSONObject(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
-        this(new JSONTokener(source), jsonParserConfiguration);
-        // Strict mode does not allow trailing chars
-        if (this.jsonParserConfiguration.isStrictMode() &&
-                this.jsonTokener.nextClean() != 0) {
-            throw new JSONException("Strict mode error: Unparsed characters found at end of input text");
-        }
+        this(new JSONTokener(source, jsonParserConfiguration), jsonParserConfiguration);
     }
 
     /**
@@ -1280,7 +1263,7 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
     static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue) {
         return objectToBigDecimal(val, defaultValue, true);
     }
-    
+
     /**
      * @param val value to convert
      * @param defaultValue default value to return is the conversion doesn't work or is null.
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index d4c780e86..b6aee1110 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -40,7 +40,8 @@ public class JSONTokener {
      *
      * @param reader     A reader.
      */
-    public JSONTokener(Reader reader) {
+    public JSONTokener(Reader reader, JSONParserConfiguration jsonParserConfiguration) {
+        this.jsonParserConfiguration = jsonParserConfiguration;
         this.reader = reader.markSupported()
                 ? reader
                         : new BufferedReader(reader);
@@ -53,13 +54,24 @@ public JSONTokener(Reader reader) {
         this.line = 1;
     }
 
+    public JSONTokener(Reader reader) {
+        this(reader, new JSONParserConfiguration());
+    }
 
     /**
      * Construct a JSONTokener from an InputStream. The caller must close the input stream.
      * @param inputStream The source.
      */
     public JSONTokener(InputStream inputStream) {
-        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+        this(inputStream, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONTokener from an InputStream. The caller must close the input stream.
+     * @param inputStream The source.
+     */
+    public JSONTokener(InputStream inputStream, JSONParserConfiguration jsonParserConfiguration) {
+        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")),jsonParserConfiguration);
     }
 
 
@@ -72,6 +84,10 @@ public JSONTokener(String s) {
         this(new StringReader(s));
     }
 
+    public JSONTokener(String s, JSONParserConfiguration jsonParserConfiguration) {
+        this(new StringReader(s), jsonParserConfiguration);
+    }
+
     /**
      * Getter
      * @return jsonParserConfiguration

From 215f4268bfe10e560c2129f5442a0bb04dd32f9a Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Sat, 11 Jan 2025 21:35:36 +0100
Subject: [PATCH 018/106] add Javadoc and rename parameters to speaking
 variable names

---
 src/main/java/org/json/JSONTokener.java | 35 +++++++++++++++++--------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index b6aee1110..c17907cf9 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -38,7 +38,18 @@ public class JSONTokener {
     /**
      * Construct a JSONTokener from a Reader. The caller must close the Reader.
      *
-     * @param reader     A reader.
+     * @param reader the source.
+     */
+    public JSONTokener(Reader reader) {
+        this(reader, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONTokener from a Reader with a given JSONParserConfiguration. The caller must close the Reader.
+     *
+     * @param reader the source.
+     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
+     *
      */
     public JSONTokener(Reader reader, JSONParserConfiguration jsonParserConfiguration) {
         this.jsonParserConfiguration = jsonParserConfiguration;
@@ -54,10 +65,6 @@ public JSONTokener(Reader reader, JSONParserConfiguration jsonParserConfiguratio
         this.line = 1;
     }
 
-    public JSONTokener(Reader reader) {
-        this(reader, new JSONParserConfiguration());
-    }
-
     /**
      * Construct a JSONTokener from an InputStream. The caller must close the input stream.
      * @param inputStream The source.
@@ -69,23 +76,29 @@ public JSONTokener(InputStream inputStream) {
     /**
      * Construct a JSONTokener from an InputStream. The caller must close the input stream.
      * @param inputStream The source.
+     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
      */
     public JSONTokener(InputStream inputStream, JSONParserConfiguration jsonParserConfiguration) {
-        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")),jsonParserConfiguration);
+        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")), jsonParserConfiguration);
     }
 
 
     /**
      * Construct a JSONTokener from a string.
      *
-     * @param s     A source string.
+     * @param source A source string.
      */
-    public JSONTokener(String s) {
-        this(new StringReader(s));
+    public JSONTokener(String source) {
+        this(new StringReader(source));
     }
 
-    public JSONTokener(String s, JSONParserConfiguration jsonParserConfiguration) {
-        this(new StringReader(s), jsonParserConfiguration);
+    /**
+     * Construct a JSONTokener from an InputStream. The caller must close the input stream.
+     * @param source The source.
+     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
+     */
+    public JSONTokener(String source, JSONParserConfiguration jsonParserConfiguration) {
+        this(new StringReader(source), jsonParserConfiguration);
     }
 
     /**

From 3b7ba07531f4b6486667767b291a78bfa2616dcb Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Sat, 11 Jan 2025 21:40:41 +0100
Subject: [PATCH 019/106] add test for invalid input on JSONTokener

---
 .../java/org/json/junit/JSONTokenerTest.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
index 59ca6d8f6..c436d27e2 100644
--- a/src/test/java/org/json/junit/JSONTokenerTest.java
+++ b/src/test/java/org/json/junit/JSONTokenerTest.java
@@ -325,4 +325,21 @@ public void testAutoClose(){
            assertEquals("Stream closed", exception.getMessage());
        }
    }
+
+    @Test
+    public void testInvalidInput_JSONObject_withoutStrictModel_shouldParseInput() {
+        String input = "{\"invalidInput\": [],}";
+        JSONTokener tokener = new JSONTokener(input);
+        Object value = tokener.nextValue();
+        assertEquals(new JSONObject(input).toString(), value.toString());
+    }
+
+    @Test
+    public void testInvalidInput_JSONArray_withoutStrictModel_shouldParseInput() {
+        String input = "[\"invalidInput\",]";
+        JSONTokener tokener = new JSONTokener(input);
+        Object value = tokener.nextValue();
+        assertEquals(new JSONArray(input).toString(), value.toString());
+    }
+
 }

From ad44a9274c487cfc580a183226ed4d5aea0c99ab Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Sat, 11 Jan 2025 21:43:04 +0100
Subject: [PATCH 020/106] add new test cases for JSONObject and JSONArray
 Constructors with JSONTokener and strict mode

---
 .../junit/JSONParserConfigurationTest.java    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 422c90c34..006f2a41d 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -4,6 +4,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONParserConfiguration;
+import org.json.JSONTokener;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -490,6 +491,40 @@ public void givenInvalidInputObject_testStrictModeTrue_shouldThrowKeyNotSurround
                 je.getMessage());
     }
 
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_JSONObjectUsingJSONTokener_shouldThrowJSONException() {
+        JSONException exception = assertThrows(JSONException.class, () -> {
+            new JSONObject(new JSONTokener("{\"key\":\"value\"} invalid trailing text"), new JSONParserConfiguration().withStrictMode(true));
+        });
+
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 17 [character 18 line 1]", exception.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_JSONObjectUsingString_shouldThrowJSONException() {
+        JSONException exception = assertThrows(JSONException.class, () -> {
+            new JSONObject("{\"key\":\"value\"} invalid trailing text", new JSONParserConfiguration().withStrictMode(true));
+        });
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 17 [character 18 line 1]", exception.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_JSONArrayUsingJSONTokener_shouldThrowJSONException() {
+        JSONException exception = assertThrows(JSONException.class, () -> {
+            new JSONArray(new JSONTokener("[\"value\"] invalid trailing text"), new JSONParserConfiguration().withStrictMode(true));
+        });
+
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 11 [character 12 line 1]", exception.getMessage());
+    }
+
+    @Test
+    public void givenInvalidInputObject_testStrictModeTrue_JSONArrayUsingString_shouldThrowJSONException() {
+        JSONException exception = assertThrows(JSONException.class, () -> {
+            new JSONArray("[\"value\"] invalid trailing text", new JSONParserConfiguration().withStrictMode(true));
+        });
+        assertEquals("Strict mode error: Unparsed characters found at end of input text at 11 [character 12 line 1]", exception.getMessage());
+    }
+
     /**
      * This method contains short but focused use-case samples and is exclusively used to test strictMode unit tests in
      * this class.

From 4bbbe774469a137d46dedb37b614b7d1fca3fda7 Mon Sep 17 00:00:00 2001
From: Michael Ameri 
Date: Sun, 12 Jan 2025 23:03:31 +0100
Subject: [PATCH 021/106] add missing fields when cloning

---
 .../org/json/JSONParserConfiguration.java     |  2 ++
 .../junit/JSONParserConfigurationTest.java    | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index f5d0660e2..f14461ae8 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -27,7 +27,9 @@ public JSONParserConfiguration() {
     protected JSONParserConfiguration clone() {
         JSONParserConfiguration clone = new JSONParserConfiguration();
         clone.overwriteDuplicateKey = overwriteDuplicateKey;
+        clone.strictMode = strictMode;
         clone.maxNestingDepth = maxNestingDepth;
+        clone.keepStrings = keepStrings;
         return clone;
     }
 
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 422c90c34..68dfd4c10 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -14,7 +14,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class JSONParserConfigurationTest {
     private static final String TEST_SOURCE = "{\"key\": \"value1\", \"key\": \"value2\"}";
@@ -32,6 +35,24 @@ public void testOverwrite() {
         assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));
     }
 
+    @Test
+    public void strictModeIsCloned(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true)
+                .withMaxNestingDepth(12);
+
+        assertTrue(jsonParserConfiguration.isStrictMode());
+    }
+
+    @Test
+    public void maxNestingDepthIsCloned(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withKeepStrings(true)
+                .withStrictMode(true);
+
+        assertTrue(jsonParserConfiguration.isKeepStrings());
+    }
+
     @Test
     public void verifyDuplicateKeyThenMaxDepth() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()

From afd9a6fbb70cd66d440a53458c186d11377bd2ff Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 15 Jan 2025 20:55:13 +0100
Subject: [PATCH 022/106] #928 add missing java dock for
 JSONParserConfiguration

---
 src/main/java/org/json/JSONParserConfiguration.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index f5d0660e2..7fcf97ece 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -104,6 +104,9 @@ public boolean isOverwriteDuplicateKey() {
     }
 
     /**
+     * The parser throws an Exception when strict mode is true and tries to parse invalid JSON characters.
+     * Otherwise, the parser is more relaxed and might tolerate some invalid characters.
+     *
      * @return the current strict mode setting.
      */
     public boolean isStrictMode() {

From 94341cd6634c09bba1a8976d1c2999e1fdb15c12 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 15 Jan 2025 20:58:45 +0100
Subject: [PATCH 023/106] Revert "#928 add missing java dock for
 JSONParserConfiguration"

This reverts commit afd9a6fbb70cd66d440a53458c186d11377bd2ff.
---
 src/main/java/org/json/JSONParserConfiguration.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 7fcf97ece..f5d0660e2 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -104,9 +104,6 @@ public boolean isOverwriteDuplicateKey() {
     }
 
     /**
-     * The parser throws an Exception when strict mode is true and tries to parse invalid JSON characters.
-     * Otherwise, the parser is more relaxed and might tolerate some invalid characters.
-     *
      * @return the current strict mode setting.
      */
     public boolean isStrictMode() {

From 9218f28db821375a7ae6957525159644cb763d18 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 15 Jan 2025 20:55:13 +0100
Subject: [PATCH 024/106] #928 add missing java dock for
 JSONParserConfiguration

(cherry picked from commit afd9a6fbb70cd66d440a53458c186d11377bd2ff)
---
 src/main/java/org/json/JSONParserConfiguration.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index f5d0660e2..7fcf97ece 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -104,6 +104,9 @@ public boolean isOverwriteDuplicateKey() {
     }
 
     /**
+     * The parser throws an Exception when strict mode is true and tries to parse invalid JSON characters.
+     * Otherwise, the parser is more relaxed and might tolerate some invalid characters.
+     *
      * @return the current strict mode setting.
      */
     public boolean isStrictMode() {

From 6631b80e8f3e5f9f20b2c57ebedcc929a92f25f1 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 15 Jan 2025 21:38:46 +0100
Subject: [PATCH 025/106] #947 add new failing tests with JSONTokener having
 strict mode configuration

---
 src/test/java/org/json/junit/JSONArrayTest.java  | 9 +++++++++
 src/test/java/org/json/junit/JSONObjectTest.java | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index e6d71479e..584e47cd0 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -1509,6 +1510,14 @@ public void testRecursiveDepthArrayFor1001Levels() {
         new JSONArray(array);
     }
 
+    @Test
+    public void testStrictModeJSONTokener_expectException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+        JSONTokener tokener = new JSONTokener("[\"value\"]invalidCharacters", jsonParserConfiguration);
+
+        assertThrows(JSONException.class, () -> { new JSONArray(tokener); });
+    }
+
     public static ArrayList buildNestedArray(int maxDepth) {
         if (maxDepth <= 0) {
             return new ArrayList<>();
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 7f121f3c5..889113d26 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3853,6 +3853,15 @@ public void clarifyCurrentBehavior() {
         assertEquals(j3.getString("hex6"), "0011");
     }
 
+
+    @Test
+    public void testStrictModeJSONTokener_expectException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+        JSONTokener tokener = new JSONTokener("{\"key\":\"value\"}invalidCharacters", jsonParserConfiguration);
+
+        assertThrows(JSONException.class, () -> { new JSONObject(tokener); });
+    }
+
     /**
      * Method to build nested map of max maxDepth
      *

From 4c873a1db44dcbadcefa7c79617a6617699d2cd9 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 15 Jan 2025 21:41:01 +0100
Subject: [PATCH 026/106] #947 use JSONParserConfiguration of JSONTokener in
 JSONObject and JSONArray constructor

---
 src/main/java/org/json/JSONArray.java  | 2 +-
 src/main/java/org/json/JSONObject.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index bdad42753..e2725b7a9 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -83,7 +83,7 @@ public JSONArray() {
      *             If there is a syntax error.
      */
     public JSONArray(JSONTokener x) throws JSONException {
-        this(x, new JSONParserConfiguration());
+        this(x, x.getJsonParserConfiguration());
     }
 
     /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 7ec1b2cc6..d50fff73b 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -195,7 +195,7 @@ public JSONObject(JSONObject jo, String ... names) {
      *             duplicated key.
      */
     public JSONObject(JSONTokener x) throws JSONException {
-        this(x, new JSONParserConfiguration());
+        this(x, x.getJsonParserConfiguration());
     }
 
     /**

From 1689fc28cfc96098ca76937ceebf36c446dc4ff2 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 9 Feb 2025 11:13:22 -0800
Subject: [PATCH 027/106] deprecated unnecessary setter method

---
 src/main/java/org/json/JSONTokener.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index c17907cf9..a90d51ae3 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -112,7 +112,10 @@ public JSONParserConfiguration getJsonParserConfiguration() {
     /**
      * Setter
      * @param jsonParserConfiguration new value for jsonParserConfiguration
+     *
+     * @deprecated method should not be used
      */
+    @Deprecated
     public void setJsonParserConfiguration(JSONParserConfiguration jsonParserConfiguration) {
         this.jsonParserConfiguration = jsonParserConfiguration;
     }

From 52f249c71e47443b20af06d58fa69d28648d2885 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sun, 9 Feb 2025 14:47:18 -0600
Subject: [PATCH 028/106] upgrade-upload-artifact-in-pipeline update from v3 to
 v4

---
 .github/workflows/pipeline.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index bb4cf0723..d59702cae 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -30,7 +30,7 @@ jobs:
           jar cvf target/org.json.jar -C target/classes .
       - name: Upload JAR 1.6
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Create java 1.6 JAR
           path: target/*.jar
@@ -64,13 +64,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -78,7 +78,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -112,13 +112,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -126,7 +126,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -160,13 +160,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -174,7 +174,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -208,13 +208,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -222,7 +222,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar

From f112a091aadf080ff3f4e750ea33e7cb490a0213 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sat, 15 Feb 2025 12:03:03 -0800
Subject: [PATCH 029/106] fixed failing unit tests in strict mode, issue 940

---
 .../org/json/JSONParserConfiguration.java     |  1 +
 .../java/org/json/junit/JSONTokenerTest.java  | 48 +++++++++++++++----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index ae23a8367..59b7e6411 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -15,6 +15,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public JSONParserConfiguration() {
         super();
         this.overwriteDuplicateKey = false;
+        this.strictMode = true;
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
index c436d27e2..b0b45cb7c 100644
--- a/src/test/java/org/json/junit/JSONTokenerTest.java
+++ b/src/test/java/org/json/junit/JSONTokenerTest.java
@@ -16,10 +16,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
+import org.json.*;
 import org.junit.Test;
 
 /**
@@ -98,7 +95,17 @@ public void testValid() {
         checkValid(" []  ",JSONArray.class);
         checkValid("[1,2]",JSONArray.class);
         checkValid("\n\n[1,2]\n\n",JSONArray.class);
-        checkValid("1 2", String.class);
+
+        // Test should fail if default strictMode is true, pass if false
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            try {
+                checkValid("1 2", String.class);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            checkValid("1 2", String.class);
+        }
     }
     
     @Test
@@ -330,16 +337,37 @@ public void testAutoClose(){
     public void testInvalidInput_JSONObject_withoutStrictModel_shouldParseInput() {
         String input = "{\"invalidInput\": [],}";
         JSONTokener tokener = new JSONTokener(input);
-        Object value = tokener.nextValue();
-        assertEquals(new JSONObject(input).toString(), value.toString());
+
+        // Test should fail if default strictMode is true, pass if false
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            try {
+                Object value = tokener.nextValue();
+                assertEquals(new JSONObject(input).toString(), value.toString());
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            Object value = tokener.nextValue();
+            assertEquals(new JSONObject(input).toString(), value.toString());
+        }
     }
 
     @Test
     public void testInvalidInput_JSONArray_withoutStrictModel_shouldParseInput() {
         String input = "[\"invalidInput\",]";
         JSONTokener tokener = new JSONTokener(input);
-        Object value = tokener.nextValue();
-        assertEquals(new JSONArray(input).toString(), value.toString());
-    }
 
+        // Test should fail if default strictMode is true, pass if false
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            try {
+                Object value = tokener.nextValue();
+                assertEquals(new JSONArray(input).toString(), value.toString());
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            Object value = tokener.nextValue();
+            assertEquals(new JSONArray(input).toString(), value.toString());
+        }
+    }
 }

From 3919abd69a785cdc83d9171b3365927cf52cca71 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sat, 15 Feb 2025 12:30:12 -0800
Subject: [PATCH 030/106] optimized unit tests to respond accurately to default
 strictMode

---
 .../org/json/JSONParserConfiguration.java     |  2 +-
 .../java/org/json/junit/JSONArrayTest.java    | 13 ++++--
 .../java/org/json/junit/JSONObjectTest.java   | 46 +++++++++++--------
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 59b7e6411..d3420a1fd 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -15,7 +15,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public JSONParserConfiguration() {
         super();
         this.overwriteDuplicateKey = false;
-        this.strictMode = true;
+//        this.strictMode = true;
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 584e47cd0..580fe82a7 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -477,13 +477,18 @@ public void failedGetArrayValues() {
      */
     @Test
     public void unquotedText() {
+        String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
+        List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
+
+        // Test should fail if default strictMode is true, pass if false
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
         if (jsonParserConfiguration.isStrictMode()) {
-            System.out.println("Skipping JSONArrayTest unquotedText() when strictMode default is true");
-        } else {
-            String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
+            try {
                 JSONArray jsonArray = new JSONArray(str);
-            List expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            JSONArray jsonArray = new JSONArray(str);
             assertEquals(expected, jsonArray.toList());
         }
     }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 889113d26..4c3413f8c 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -218,11 +218,16 @@ public void jsonObjectByNullBean() {
      */
     @Test
     public void unquotedText() {
+        String str = "{key1:value1, key2:42, 1.2 : 3.4, -7e5 : something!}";
+
+        // Test should fail if default strictMode is true, pass if false
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
         if (jsonParserConfiguration.isStrictMode()) {
-            System.out.println("Skipping JSONObjectTest unquotedText() when strictMode default is true");
+            try {
+                JSONObject jsonObject = new JSONObject(str);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
         } else {
-            String str = "{key1:value1, key2:42, 1.2 : 3.4, -7e5 : something!}";
             JSONObject jsonObject = new JSONObject(str);
             String textStr = jsonObject.toString();
             assertTrue("expected key1", textStr.contains("\"key1\""));
@@ -1074,24 +1079,29 @@ public void jsonValidNumberValuesNeitherLongNorIEEE754Compatible() {
      */
     @Test
     public void jsonInvalidNumberValues() {
+        // Number-notations supported by Java and invalid as JSON
+        String str =
+                "{" +
+                        "\"hexNumber\":-0x123," +
+                        "\"tooManyZeros\":00," +
+                        "\"negativeInfinite\":-Infinity," +
+                        "\"negativeNaN\":-NaN," +
+                        "\"negativeFraction\":-.01," +
+                        "\"tooManyZerosFraction\":00.001," +
+                        "\"negativeHexFloat\":-0x1.fffp1," +
+                        "\"hexFloat\":0x1.0P-1074," +
+                        "\"floatIdentifier\":0.1f," +
+                        "\"doubleIdentifier\":0.1d" +
+                        "}";
+
+        // Test should fail if default strictMode is true, pass if false
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
         if (jsonParserConfiguration.isStrictMode()) {
-            System.out.println("Skipping JSONObjectTest jsonInvalidNumberValues() when strictMode default is true");
+            try {
+                JSONObject jsonObject = new JSONObject(str);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
         } else {
-            // Number-notations supported by Java and invalid as JSON
-            String str =
-                    "{" +
-                            "\"hexNumber\":-0x123," +
-                            "\"tooManyZeros\":00," +
-                            "\"negativeInfinite\":-Infinity," +
-                            "\"negativeNaN\":-NaN," +
-                            "\"negativeFraction\":-.01," +
-                            "\"tooManyZerosFraction\":00.001," +
-                            "\"negativeHexFloat\":-0x1.fffp1," +
-                            "\"hexFloat\":0x1.0P-1074," +
-                            "\"floatIdentifier\":0.1f," +
-                            "\"doubleIdentifier\":0.1d" +
-                            "}";
             JSONObject jsonObject = new JSONObject(str);
             Object obj;
             obj = jsonObject.get("hexNumber");
@@ -2274,7 +2284,7 @@ public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
     public void jsonObjectParsingErrors() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
         if (jsonParserConfiguration.isStrictMode()) {
-            System.out.println("Skipping JSONObjectTest jaonObjectParsingErrors() when strictMode default is true");
+            System.out.println("Skipping JSONObjectTest jsonObjectParsingErrors() when strictMode default is true");
         } else {
             try {
                 // does not start with '{'

From f30167e7c0a83fc742e64337042db3762d0a8f81 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 23 Feb 2025 22:00:22 -0800
Subject: [PATCH 031/106] tests seem to be working, run with strictMode = fale
 then true

---
 build.gradle                                  | 43 +++++++++++++++++++
 .../org/json/JSONParserConfiguration.java     |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2c0fc6d2c..d8ccd6a83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,3 +53,46 @@ publishing {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
+
+def originalFile = null;
+
+task backupCode {
+    def file = file('src/main/java/org/json/JSONParserConfiguration.java')
+    originalFile = file.text
+}
+
+task firstTest {
+
+}
+
+task modifyCode {
+    doLast {
+        // Add your code modification logic here
+        def file = file('src/main/java/org/json/JSONParserConfiguration.java')
+        def text = file.text
+        text = text.replaceAll('oldCode', 'newCode')
+        file.text = text
+    }
+}
+
+task compileModifiedCode(type: JavaCompile) {
+    source = sourceSets.main.java.srcDirs
+    classpath = sourceSets.main.compileClasspath
+    destinationDirectory = sourceSets.main.java.outputDir
+}
+
+task secondTest {
+
+}
+
+task restoreCode {
+    def file = file('src/main/java/org/json/JSONParserConfiguration.java')
+    file.text = originalFile
+}
+
+// and then add it to the task list
+backupCode.finalizedBy firstTest
+firstTest.finalizedBy modifyCode
+modifyCode.finalizedBy compileModifiedCode
+compileModifiedCode.finalizedBy secondTest
+secondTest.finalizedBy restoreCode
\ No newline at end of file
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index d3420a1fd..1866f3082 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -15,7 +15,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public JSONParserConfiguration() {
         super();
         this.overwriteDuplicateKey = false;
-//        this.strictMode = true;
+        // this.strictMode = true;
     }
 
     /**

From 8a86894c63f5535877267d617666e77ead3b9afe Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 2 Mar 2025 11:02:27 -0800
Subject: [PATCH 032/106] test with strict mode enabled and fixed

---
 README.md    |  6 ++++
 build.gradle | 89 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 1271f8d75..336f60c9f 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,12 @@ Execute the test suite with Gradlew:
 gradlew clean build test
 ```
 
+*Optional* Execute the test suite in strict mode with Gradlew:
+
+```shell
+gradlew testWithStrictMode
+```
+
 # Notes
 
 For more information, please see [NOTES.md](https://github.com/stleary/JSON-java/blob/master/docs/NOTES.md)
diff --git a/build.gradle b/build.gradle
index d8ccd6a83..3961e854d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,46 +53,75 @@ publishing {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
+// Add these imports at the top of your build.gradle file
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
 
-def originalFile = null;
+// Your existing build configurations...
 
-task backupCode {
-    def file = file('src/main/java/org/json/JSONParserConfiguration.java')
-    originalFile = file.text
-}
+// Add a new task to modify the file
+task modifyStrictMode {
+    doLast {
+        println "Modifying JSONParserConfiguration.java to enable strictMode..."
 
-task firstTest {
+        def filePath = project.file('src/main/java/org/json/JSONParserConfiguration.java')
 
-}
+        if (!filePath.exists()) {
+            throw new GradleException("Could not find file: ${filePath.absolutePath}")
+        }
 
-task modifyCode {
-    doLast {
-        // Add your code modification logic here
-        def file = file('src/main/java/org/json/JSONParserConfiguration.java')
-        def text = file.text
-        text = text.replaceAll('oldCode', 'newCode')
-        file.text = text
+        // Create a backup of the original file
+        def backupFile = new File(filePath.absolutePath + '.bak')
+        Files.copy(filePath.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+
+        // Read and modify the file content
+        def content = filePath.text
+        def modifiedContent = content.replace('// this.strictMode = true;', 'this.strictMode = true;')
+
+        // Write the modified content back to the file
+        filePath.text = modifiedContent
+
+        println "File modified successfully at: ${filePath.absolutePath}"
     }
 }
 
-task compileModifiedCode(type: JavaCompile) {
-    source = sourceSets.main.java.srcDirs
-    classpath = sourceSets.main.compileClasspath
-    destinationDirectory = sourceSets.main.java.outputDir
-}
+// Add a task to restore the original file
+task restoreStrictMode {
+    doLast {
+        println "Restoring original JSONParserConfiguration.java..."
 
-task secondTest {
+        def filePath = project.file('src/main/java/org/json/JSONParserConfiguration.java')
+        def backupFile = new File(filePath.absolutePath + '.bak')
 
+        if (backupFile.exists()) {
+            Files.copy(backupFile.toPath(), filePath.toPath(), StandardCopyOption.REPLACE_EXISTING)
+            backupFile.delete()
+            println "Original file restored successfully at: ${filePath.absolutePath}"
+        } else {
+            println "Backup file not found at: ${backupFile.absolutePath}. No restoration performed."
+        }
+    }
 }
 
-task restoreCode {
-    def file = file('src/main/java/org/json/JSONParserConfiguration.java')
-    file.text = originalFile
-}
+// Create a task to run the workflow
+task testWithStrictMode {
+    dependsOn modifyStrictMode
+    finalizedBy restoreStrictMode
 
-// and then add it to the task list
-backupCode.finalizedBy firstTest
-firstTest.finalizedBy modifyCode
-modifyCode.finalizedBy compileModifiedCode
-compileModifiedCode.finalizedBy secondTest
-secondTest.finalizedBy restoreCode
\ No newline at end of file
+    doLast {
+        // This will trigger a clean build and run tests with strictMode enabled
+        if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+            exec {
+                executable 'cmd'
+                args '/c', 'gradlew.bat', 'clean', 'build'
+            }
+        } else {
+            exec {
+                executable './gradlew'
+                args 'clean', 'build'
+            }
+        }
+    }
+}
\ No newline at end of file

From ae4f4afcc79dec50ff265c56ef34c1d29a32d2f4 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 2 Mar 2025 11:08:00 -0800
Subject: [PATCH 033/106] dont mess with my line

---
 src/main/java/org/json/JSONParserConfiguration.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 1866f3082..3fbfb8a9a 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -15,6 +15,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
     public JSONParserConfiguration() {
         super();
         this.overwriteDuplicateKey = false;
+        // DO NOT DELETE THE FOLLOWING LINE -- it is used for strictMode testing
         // this.strictMode = true;
     }
 

From 4a662316f757e9ad7769b5224e685b6d329112fa Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 16 Mar 2025 10:33:14 -0700
Subject: [PATCH 034/106] edited pom.xml for mvn testing with strict mode

---
 pom.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/pom.xml b/pom.xml
index fe4f7704d..80c9b89c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,4 +200,55 @@
             
         
     
+    
+        
+            test-strict-mode
+            
+                
+                    
+                        com.google.code.maven-replacer-plugin
+                        replacer
+                        1.5.3
+                        
+                            
+                            
+                                enable-strict-mode
+                                process-sources
+                                
+                                    replace
+                                
+                                
+                                    src/main/java/org/json/JSONParserConfiguration.java
+                                    
+                                        
+                                            // this.strictMode = true;
+                                            this.strictMode = true;
+                                        
+                                    
+                                
+                            
+                            
+                            
+                                restore-original
+                                test
+                                
+                                    replace
+                                
+                                
+                                    src/main/java/org/json/JSONParserConfiguration.java
+                                    
+                                        
+                                            this.strictMode = true;
+                                            // this.strictMode = true;
+                                        
+                                    
+                                
+                            
+                        
+                    
+                
+            
+        
+    
+
 

From 76ee4312b325b0cf88afc32f8d67827ef72a00cd Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 16 Mar 2025 10:36:24 -0700
Subject: [PATCH 035/106] readme edit

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 336f60c9f..206afbb21 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,12 @@ gradlew clean build test
 gradlew testWithStrictMode
 ```
 
+*Optional* Execute the test suite in strict mode with Maven:
+
+```shell
+mvn test -P test-strict-mode 
+```
+
 # Notes
 
 For more information, please see [NOTES.md](https://github.com/stleary/JSON-java/blob/master/docs/NOTES.md)

From b2943b8fd0ab71e377987bd54e13894653aea3ee Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 16 Mar 2025 12:50:58 -0700
Subject: [PATCH 036/106] fixed issue #943 Csv parsing skip last row if last
 line is missing newline

---
 src/main/java/org/json/CDL.java           | 21 +++++++++++++++---
 src/test/java/org/json/junit/CDLTest.java | 27 +++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index b495de12b..dd631bf8f 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -100,11 +100,15 @@ public static JSONArray rowToJSONArray(JSONTokener x, char delimiter) throws JSO
         for (;;) {
             String value = getValue(x,delimiter);
             char c = x.next();
-            if (value == null ||
-                    (ja.length() == 0 && value.length() == 0 && c != delimiter)) {
+            if (value != null) {
+                ja.put(value);
+            } else if (ja.length() == 0 && c != delimiter) {
                 return null;
+            } else {
+                // This line accounts for CSV ending with no newline
+                ja.put("");
             }
-            ja.put(value);
+
             for (;;) {
                 if (c == delimiter) {
                     break;
@@ -307,6 +311,17 @@ public static JSONArray toJSONArray(JSONArray names, JSONTokener x, char delimit
         if (ja.length() == 0) {
             return null;
         }
+
+        // The following block accounts for empty datasets (no keys or vals)
+        if (ja.length() == 1) {
+            JSONObject j = ja.getJSONObject(0);
+            if (j.length() == 1) {
+                String key = j.keys().next();
+                if ("".equals(key) && "".equals(j.get(key))) {
+                    return null;
+                }
+            }
+        }
         return ja;
     }
 
diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
index 0e3668bf7..e5eb9eda8 100644
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
@@ -168,6 +168,33 @@ public void unbalancedEscapedQuote(){
            }
     }
 
+    /**
+     * Csv parsing skip last row if last field of this row is empty #943
+     */
+    @Test
+    public void csvParsingCatchesLastRow(){
+        String data = "Field 1,Field 2,Field 3\n" +
+                "value11,value12,\n" +
+                "value21,value22,";
+
+        JSONArray jsonArray = CDL.toJSONArray(data);
+
+        JSONArray expectedJsonArray = new JSONArray();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("Field 1", "value11");
+        jsonObject.put("Field 2", "value12");
+        jsonObject.put("Field 3", "");
+        expectedJsonArray.put(jsonObject);
+
+        jsonObject = new JSONObject();
+        jsonObject.put("Field 1", "value21");
+        jsonObject.put("Field 2", "value22");
+        jsonObject.put("Field 3", "");
+        expectedJsonArray.put(jsonObject);
+
+        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
+    }
+
     /**
      * Assert that there is no error for a single escaped quote within a properly embedded quote.
      */

From d1327c2da312d1670ecf9b9170cd36641e2522dd Mon Sep 17 00:00:00 2001
From: Robert Lichtenberger 
Date: Wed, 19 Mar 2025 07:59:57 +0100
Subject: [PATCH 037/106] Allow to configure Java null handling.

---
 src/main/java/org/json/JSONObject.java        |  2 +-
 .../org/json/JSONParserConfiguration.java     | 31 ++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 40 +++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index d50fff73b..73835d497 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -332,7 +332,7 @@ private JSONObject(Map m, int recursionDepth, JSONParserConfiguration json
         	        throw new NullPointerException("Null key.");
         	    }
                 final Object value = e.getValue();
-                if (value != null) {
+                if (value != null || jsonParserConfiguration.isJavaNullAsJsonNull()) {
                     testValidity(value);
                     this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 3fbfb8a9a..58d080f86 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -8,6 +8,11 @@ public class JSONParserConfiguration extends ParserConfiguration {
      * Used to indicate whether to overwrite duplicate key or not.
      */
     private boolean overwriteDuplicateKey;
+    
+    /**
+     * Used to indicate whether ignore null values when converting java maps to JSONObject or not.
+     */
+    private boolean javaNullAsJsonNull;
 
     /**
      * Configuration with the default values.
@@ -67,6 +72,21 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
 
         return clone;
     }
+    
+    /**
+     * Controls the parser's behavior when meeting duplicate keys.
+     * If set to false, the parser will throw a JSONException when meeting a duplicate key.
+     * Or the duplicate key's value will be overwritten.
+     *
+     * @param javaNullAsJsonNull define, if the parser should ignore null values in Java maps
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public JSONParserConfiguration withJavaNullAsJsonNull(final boolean javaNullAsJsonNull) {
+        JSONParserConfiguration clone = this.clone();
+        clone.javaNullAsJsonNull = javaNullAsJsonNull;
+
+        return clone;
+    }
 
     /**
      * Sets the strict mode configuration for the JSON parser with default true value
@@ -106,6 +126,17 @@ public JSONParserConfiguration withStrictMode(final boolean mode) {
     public boolean isOverwriteDuplicateKey() {
         return this.overwriteDuplicateKey;
     }
+    
+    /**
+     * The parser's behavior when meeting a null value in a java map, controls whether the parser should ignore 
+     * that map entry or write a JSON entry with a null value.
+     *
+     * @return The javaNullAsJsonNull configuration value.
+     */
+    public boolean isJavaNullAsJsonNull() {
+        return this.javaNullAsJsonNull;
+    }
+    
 
     /**
      * The parser throws an Exception when strict mode is true and tries to parse invalid JSON characters.
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 4c3413f8c..5762ea773 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -616,6 +616,46 @@ public void jsonObjectByMapWithNullValue() {
         assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
         Util.checkJSONObjectMaps(jsonObject);
     }
+    
+    @Test
+    public void jsonObjectByMapWithNullValueAndParserConfiguration() {
+        Map map = new HashMap();
+        map.put("nullKey", null);
+        
+        // by default, null values are ignored
+        JSONObject obj1 = new JSONObject(map);
+        assertTrue("expected null value to be ignored by default", obj1.isEmpty());
+
+        // if configured, null values are written as such into the JSONObject.
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONObject obj2 = new JSONObject(map, parserConfiguration);
+        assertFalse("expected null value to accepted when configured", obj2.isEmpty());
+        assertTrue(obj2.has("nullKey"));
+        assertEquals(JSONObject.NULL, obj2.get("nullKey"));
+    }
+    
+    @Test
+    public void jsonObjectByMapWithNestedNullValueAndParserConfiguration() {
+        Map map = new HashMap();
+        Map nestedMap = new HashMap();
+        nestedMap.put("nullKey", null);
+        map.put("nestedMap", nestedMap);
+        List> nestedList = new ArrayList>();
+        nestedList.add(nestedMap);        
+        map.put("nestedList", nestedList);
+        
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONObject jsonObject = new JSONObject(map, parserConfiguration);
+
+        JSONObject nestedObject = jsonObject.getJSONObject("nestedMap");
+        assertTrue(nestedObject.has("nullKey"));
+        assertEquals(JSONObject.NULL, nestedObject.get("nullKey"));
+        
+        JSONArray nestedArray = jsonObject.getJSONArray("nestedList");
+        assertEquals(1, nestedArray.length());
+        assertTrue(nestedArray.getJSONObject(0).has("nullKey"));
+        assertEquals(JSONObject.NULL, nestedArray.getJSONObject(0).get("nullKey"));
+    }
 
     /**
      * JSONObject built from a bean. In this case all but one of the 

From 5d1c789490627ddfa59f17252954ed62ccca6a59 Mon Sep 17 00:00:00 2001
From: Robert Lichtenberger 
Date: Wed, 19 Mar 2025 08:10:33 +0100
Subject: [PATCH 038/106] Add test for JSONArray from Java collection.

---
 src/test/java/org/json/junit/JSONArrayTest.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 580fe82a7..12ef3b9c0 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -228,6 +228,19 @@ public void verifyConstructor() {
         Util.checkJSONArrayMaps(jaRaw);
         Util.checkJSONArrayMaps(jaInt);
     }
+    
+    @Test
+    public void jsonArrayByListWithNestedNullValue() {
+        List> list = new ArrayList>();
+        Map sub = new HashMap();
+        sub.put("nullKey", null);	
+        list.add(sub);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONArray jsonArray = new JSONArray(list, parserConfiguration);
+        JSONObject subObject = jsonArray.getJSONObject(0);
+        assertTrue(subObject.has("nullKey"));
+        assertEquals(JSONObject.NULL, subObject.get("nullKey"));
+    }
 
     /**
      * Tests consecutive calls to putAll with array and collection.

From 1afd7cd6bc5554ccaef541657866136196d38434 Mon Sep 17 00:00:00 2001
From: Robert Lichtenberger 
Date: Fri, 21 Mar 2025 07:25:37 +0100
Subject: [PATCH 039/106] Use better name for parser configuration option, fix
 API comment.

---
 src/main/java/org/json/JSONObject.java        |  2 +-
 .../org/json/JSONParserConfiguration.java     | 27 ++++++++++---------
 .../java/org/json/junit/JSONArrayTest.java    |  2 +-
 .../java/org/json/junit/JSONObjectTest.java   |  4 +--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 73835d497..a1664f708 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -332,7 +332,7 @@ private JSONObject(Map m, int recursionDepth, JSONParserConfiguration json
         	        throw new NullPointerException("Null key.");
         	    }
                 final Object value = e.getValue();
-                if (value != null || jsonParserConfiguration.isJavaNullAsJsonNull()) {
+                if (value != null || jsonParserConfiguration.isUseNativeNulls()) {
                     testValidity(value);
                     this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 58d080f86..550eedfb0 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -10,9 +10,9 @@ public class JSONParserConfiguration extends ParserConfiguration {
     private boolean overwriteDuplicateKey;
     
     /**
-     * Used to indicate whether ignore null values when converting java maps to JSONObject or not.
+     * Used to indicate whether to convert java null values to JSONObject.NULL or ignoring the entry when converting java maps.
      */
-    private boolean javaNullAsJsonNull;
+    private boolean useNativeNulls;
 
     /**
      * Configuration with the default values.
@@ -74,16 +74,16 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
     }
     
     /**
-     * Controls the parser's behavior when meeting duplicate keys.
-     * If set to false, the parser will throw a JSONException when meeting a duplicate key.
-     * Or the duplicate key's value will be overwritten.
+     * Controls the parser's behavior when meeting Java null values while converting maps.
+     * If set to true, the parser will put a JSONObject.NULL into the resulting JSONObject.
+     * Or the map entry will be ignored.
      *
-     * @param javaNullAsJsonNull define, if the parser should ignore null values in Java maps
+     * @param useNativeNulls defines if the parser should convert null values in Java maps
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
-    public JSONParserConfiguration withJavaNullAsJsonNull(final boolean javaNullAsJsonNull) {
+    public JSONParserConfiguration withUseNativeNulls(final boolean useNativeNulls) {
         JSONParserConfiguration clone = this.clone();
-        clone.javaNullAsJsonNull = javaNullAsJsonNull;
+        clone.useNativeNulls = useNativeNulls;
 
         return clone;
     }
@@ -128,13 +128,14 @@ public boolean isOverwriteDuplicateKey() {
     }
     
     /**
-     * The parser's behavior when meeting a null value in a java map, controls whether the parser should ignore 
-     * that map entry or write a JSON entry with a null value.
+     * The parser's behavior when meeting a null value in a java map, controls whether the parser should 
+     * write a JSON entry with a null value (isUseNativeNulls() == true) 
+     * or ignore that map entry (isUseNativeNulls() == false).
      *
-     * @return The javaNullAsJsonNull configuration value.
+     * @return The useNativeNulls configuration value.
      */
-    public boolean isJavaNullAsJsonNull() {
-        return this.javaNullAsJsonNull;
+    public boolean isUseNativeNulls() {
+        return this.useNativeNulls;
     }
     
 
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 12ef3b9c0..429620396 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -235,7 +235,7 @@ public void jsonArrayByListWithNestedNullValue() {
         Map sub = new HashMap();
         sub.put("nullKey", null);	
         list.add(sub);
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
         JSONArray jsonArray = new JSONArray(list, parserConfiguration);
         JSONObject subObject = jsonArray.getJSONObject(0);
         assertTrue(subObject.has("nullKey"));
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 5762ea773..9d9ef8fa6 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -627,7 +627,7 @@ public void jsonObjectByMapWithNullValueAndParserConfiguration() {
         assertTrue("expected null value to be ignored by default", obj1.isEmpty());
 
         // if configured, null values are written as such into the JSONObject.
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
         JSONObject obj2 = new JSONObject(map, parserConfiguration);
         assertFalse("expected null value to accepted when configured", obj2.isEmpty());
         assertTrue(obj2.has("nullKey"));
@@ -644,7 +644,7 @@ public void jsonObjectByMapWithNestedNullValueAndParserConfiguration() {
         nestedList.add(nestedMap);        
         map.put("nestedList", nestedList);
         
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withJavaNullAsJsonNull(true);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(true);
         JSONObject jsonObject = new JSONObject(map, parserConfiguration);
 
         JSONObject nestedObject = jsonObject.getJSONObject("nestedMap");

From fd0cca358653dc970683bdc32e9ae5a928576806 Mon Sep 17 00:00:00 2001
From: Robert Lichtenberger 
Date: Fri, 21 Mar 2025 10:12:03 +0100
Subject: [PATCH 040/106] Fix cloning of parser configuration.

---
 src/main/java/org/json/JSONParserConfiguration.java       | 1 +
 .../java/org/json/junit/JSONParserConfigurationTest.java  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 550eedfb0..0cfa2eaef 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -37,6 +37,7 @@ protected JSONParserConfiguration clone() {
         clone.strictMode = strictMode;
         clone.maxNestingDepth = maxNestingDepth;
         clone.keepStrings = keepStrings;
+        clone.useNativeNulls = useNativeNulls;
         return clone;
     }
 
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 0ecf93876..926c49f41 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -53,6 +53,14 @@ public void maxNestingDepthIsCloned(){
 
         assertTrue(jsonParserConfiguration.isKeepStrings());
     }
+    
+    @Test
+    public void useNativeNullsIsCloned() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withUseNativeNulls(true)
+                .withStrictMode(true);
+        assertTrue(jsonParserConfiguration.isUseNativeNulls());
+    }
 
     @Test
     public void verifyDuplicateKeyThenMaxDepth() {

From 8dbf03e76bbb7e0667f94f04afe900be498f1406 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 30 Mar 2025 12:21:44 -0700
Subject: [PATCH 041/106] work on issue 841

---
 src/main/java/org/json/XML.java               | 104 +++++++++++++++++-
 .../java/org/json/XMLParserConfiguration.java |  79 ++++++++++++-
 .../org/json/junit/XMLConfigurationTest.java  |  37 ++++++-
 3 files changed, 204 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index e59ec7a4a..4bf475935 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -355,10 +355,20 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, XMLP
                                 && TYPE_ATTR.equals(string)) {
                             xmlXsiTypeConverter = config.getXsiTypeMap().get(token);
                         } else if (!nilAttributeFound) {
-                            jsonObject.accumulate(string,
-                                    config.isKeepStrings()
-                                            ? ((String) token)
-                                            : stringToValue((String) token));
+                            Object obj = stringToValue((String) token);
+                            if (obj instanceof Boolean) {
+                                jsonObject.accumulate(string,
+                                        config.isKeepBooleanAsString()
+                                                ? ((String) token)
+                                                : obj);
+                            } else if (obj instanceof Number) {
+                                jsonObject.accumulate(string,
+                                        config.isKeepNumberAsString()
+                                                ? ((String) token)
+                                                : obj);
+                            } else {
+                                jsonObject.accumulate(string, stringToValue((String) token));
+                            }
                         }
                         token = null;
                     } else {
@@ -407,8 +417,20 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, XMLP
                                     jsonObject.accumulate(config.getcDataTagName(),
                                             stringToValue(string, xmlXsiTypeConverter));
                                 } else {
-                                    jsonObject.accumulate(config.getcDataTagName(),
-                                            config.isKeepStrings() ? string : stringToValue(string));
+                                    Object obj = stringToValue((String) token);
+                                    if (obj instanceof Boolean) {
+                                        jsonObject.accumulate(config.getcDataTagName(),
+                                                config.isKeepBooleanAsString()
+                                                        ? ((String) token)
+                                                        : obj);
+                                    } else if (obj instanceof Number) {
+                                        jsonObject.accumulate(config.getcDataTagName(),
+                                                config.isKeepNumberAsString()
+                                                        ? ((String) token)
+                                                        : obj);
+                                    } else {
+                                        jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
+                                    }
                                 }
                             }
 
@@ -688,6 +710,44 @@ public static JSONObject toJSONObject(Reader reader, boolean keepStrings) throws
         return toJSONObject(reader, XMLParserConfiguration.ORIGINAL);
     }
 
+    /**
+     * Convert a well-formed (but not necessarily valid) XML into a
+     * JSONObject. Some information may be lost in this transformation because
+     * JSON is a data format and XML is a document format. XML uses elements,
+     * attributes, and content text, while JSON uses unordered collections of
+     * name/value pairs and arrays of values. JSON does not does not like to
+     * distinguish between elements and attributes. Sequences of similar
+     * elements are represented as JSONArrays. Content text may be placed in a
+     * "content" member. Comments, prologs, DTDs, and 
{@code
+     * <[ [ ]]>}

+     * are ignored.
+     *
+     * All numbers are converted as strings, for 1, 01, 29.0 will not be coerced to
+     * numbers but will instead be the exact value as seen in the XML document depending
+     * on how flag is set.
+     * All booleans are converted as strings, for true, false will not be coerced to
+     * booleans but will instead be the exact value as seen in the XML document depending
+     * on how flag is set.
+     *
+     * @param reader The XML source reader.
+     * @param keepNumberAsString If true, then numeric values will not be coerced into
+     *  numeric values and will instead be left as strings
+     * @param keepBooleanAsString If true, then boolean values will not be coerced into
+     *      *  numeric values and will instead be left as strings
+     * @return A JSONObject containing the structured data from the XML string.
+     * @throws JSONException Thrown if there is an errors while parsing the string
+     */
+    public static JSONObject toJSONObject(Reader reader, boolean keepNumberAsString, boolean keepBooleanAsString) throws JSONException {
+        XMLParserConfiguration xmlParserConfiguration = new XMLParserConfiguration();
+        if(keepNumberAsString) {
+            xmlParserConfiguration = xmlParserConfiguration.withKeepNumberAsString(keepNumberAsString);
+        }
+        if(keepBooleanAsString) {
+            xmlParserConfiguration = xmlParserConfiguration.withKeepBooleanAsString(keepBooleanAsString);
+        }
+        return toJSONObject(reader, xmlParserConfiguration);
+    }
+
     /**
      * Convert a well-formed (but not necessarily valid) XML into a
      * JSONObject. Some information may be lost in this transformation because
@@ -746,6 +806,38 @@ public static JSONObject toJSONObject(String string, boolean keepStrings) throws
         return toJSONObject(new StringReader(string), keepStrings);
     }
 
+    /**
+     * Convert a well-formed (but not necessarily valid) XML string into a
+     * JSONObject. Some information may be lost in this transformation because
+     * JSON is a data format and XML is a document format. XML uses elements,
+     * attributes, and content text, while JSON uses unordered collections of
+     * name/value pairs and arrays of values. JSON does not does not like to
+     * distinguish between elements and attributes. Sequences of similar
+     * elements are represented as JSONArrays. Content text may be placed in a
+     * "content" member. Comments, prologs, DTDs, and 
{@code
+     * <[ [ ]]>}

+     * are ignored.
+     *
+     * All numbers are converted as strings, for 1, 01, 29.0 will not be coerced to
+     * numbers but will instead be the exact value as seen in the XML document depending
+     * on how flag is set.
+     * All booleans are converted as strings, for true, false will not be coerced to
+     * booleans but will instead be the exact value as seen in the XML document depending
+     * on how flag is set.
+     *
+     * @param string
+     *            The source string.
+     * @param keepNumberAsString If true, then numeric values will not be coerced into
+     *  numeric values and will instead be left as strings
+     * @param keepBooleanAsString If true, then boolean values will not be coerced into
+     *  numeric values and will instead be left as strings
+     * @return A JSONObject containing the structured data from the XML string.
+     * @throws JSONException Thrown if there is an errors while parsing the string
+     */
+    public static JSONObject toJSONObject(String string, boolean keepNumberAsString, boolean keepBooleanAsString) throws JSONException {
+        return toJSONObject(new StringReader(string), keepNumberAsString, keepBooleanAsString);
+    }
+
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject. Some information may be lost in this transformation because
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index bc4a80074..cbcb1ded1 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -22,6 +22,16 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
 //    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512; // We could override
 
+    /**
+     * Allow user to control how numbers are parsed
+     */
+    private boolean keepNumberAsString;
+
+    /**
+     * Allow user to control how booleans are parsed
+     */
+    private boolean keepBooleanAsString;
+
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
         = new XMLParserConfiguration();
@@ -142,7 +152,9 @@ public XMLParserConfiguration (final boolean keepStrings, final String cDataTagN
      */
     @Deprecated
     public XMLParserConfiguration (final boolean keepStrings, final String cDataTagName, final boolean convertNilAttributeToNull) {
-        super(keepStrings, DEFAULT_MAXIMUM_NESTING_DEPTH);
+        super(false, DEFAULT_MAXIMUM_NESTING_DEPTH);
+        this.keepNumberAsString = keepStrings;
+        this.keepBooleanAsString = keepStrings;
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
     }
@@ -163,8 +175,10 @@ public XMLParserConfiguration (final boolean keepStrings, final String cDataTagN
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
             final boolean convertNilAttributeToNull, final Map> xsiTypeMap, final Set forceList,
-            final int maxNestingDepth, final boolean closeEmptyTag) {
-        super(keepStrings, maxNestingDepth);
+            final int maxNestingDepth, final boolean closeEmptyTag, final boolean keepNumberAsString, final boolean keepBooleanAsString) {
+        super(false, maxNestingDepth);
+        this.keepNumberAsString = keepNumberAsString;
+        this.keepBooleanAsString = keepBooleanAsString;
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
@@ -189,7 +203,9 @@ protected XMLParserConfiguration clone() {
                 this.xsiTypeMap,
                 this.forceList,
                 this.maxNestingDepth,
-                this.closeEmptyTag
+                this.closeEmptyTag,
+                this.keepNumberAsString,
+                this.keepBooleanAsString
         );
         config.shouldTrimWhiteSpace = this.shouldTrimWhiteSpace;
         return config;
@@ -207,7 +223,40 @@ protected XMLParserConfiguration clone() {
     @SuppressWarnings("unchecked")
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
-        return super.withKeepStrings(newVal);
+        XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepNumberAsString = newVal;
+        newConfig.keepBooleanAsString = newVal;
+        return newConfig;
+    }
+
+    /**
+     * When parsing the XML into JSON, specifies if numbers should be kept as strings (1), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @param newVal
+     *      new value to use for the keepNumberAsString configuration option.
+     *
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
+        XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepNumberAsString = newVal;
+        return newConfig;
+    }
+
+    /**
+     * When parsing the XML into JSON, specifies if booleans should be kept as strings (true), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @param newVal
+     *      new value to use for the withKeepBooleanAsString configuration option.
+     *
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLParserConfiguration withKeepBooleanAsString(final boolean newVal) {
+        XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepBooleanAsString = newVal;
+        return newConfig;
     }
 
     /**
@@ -221,6 +270,26 @@ public String getcDataTagName() {
         return this.cDataTagName;
     }
 
+    /**
+     * When parsing the XML into JSONML, specifies if numbers should be kept as strings (true), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string).
+     *
+     * @return The keepStrings configuration value.
+     */
+    public boolean isKeepNumberAsString() {
+        return this.keepNumberAsString;
+    }
+
+    /**
+     * When parsing the XML into JSONML, specifies if booleans should be kept as strings (true), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string).
+     *
+     * @return The keepStrings configuration value.
+     */
+    public boolean isKeepBooleanAsString() {
+        return this.keepBooleanAsString;
+    }
+
     /**
      * The name of the key in a JSON Object that indicates a CDATA section. Historically this has
      * been the value "content" but can be changed. Use null to indicate no CDATA
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 867f0fa9b..44f486f2c 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -574,15 +574,18 @@ public void shouldKeepConfigurationIntactAndUpdateCloseEmptyTagChoice()
         XMLParserConfiguration keepStringsAndCloseEmptyTag = keepStrings.withCloseEmptyTag(true);
         XMLParserConfiguration keepDigits = keepStringsAndCloseEmptyTag.withKeepStrings(false);
         XMLParserConfiguration keepDigitsAndNoCloseEmptyTag = keepDigits.withCloseEmptyTag(false);
-        assertTrue(keepStrings.isKeepStrings());
+        assertTrue(keepStrings.isKeepNumberAsString());
+        assertTrue(keepStrings.isKeepBooleanAsString());
         assertFalse(keepStrings.isCloseEmptyTag());
-        assertTrue(keepStringsAndCloseEmptyTag.isKeepStrings());
+        assertTrue(keepStringsAndCloseEmptyTag.isKeepNumberAsString());
+        assertTrue(keepStringsAndCloseEmptyTag.isKeepBooleanAsString());
         assertTrue(keepStringsAndCloseEmptyTag.isCloseEmptyTag());
-        assertFalse(keepDigits.isKeepStrings());
+        assertFalse(keepDigits.isKeepNumberAsString());
+        assertFalse(keepDigits.isKeepBooleanAsString());
         assertTrue(keepDigits.isCloseEmptyTag());
-        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepStrings());
+        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepNumberAsString());
+        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepBooleanAsString());
         assertFalse(keepDigitsAndNoCloseEmptyTag.isCloseEmptyTag());
-
     }
 
     /**
@@ -767,6 +770,30 @@ public void testToJSONArray_jsonOutput() {
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
     }
 
+    /**
+     * JSON string lost leading zero and converted "True" to true.
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_withKeepNumberAsString() {
+        final String originalXml = "011000True";
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":true}}");
+        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
+                new XMLParserConfiguration().withKeepNumberAsString(true));
+        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
+    }
+
+    /**
+     * JSON string lost leading zero and converted "True" to true.
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
+        final String originalXml = "011000True";
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":\"True\"}}");
+        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
+                new XMLParserConfiguration().withKeepBooleanAsString(true));
+        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
+    }
+
     /**
      * JSON string cannot be reverted to original xml.
      */

From 53da5ce2a96bb5aef7316becf60269240cfe386f Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 6 Apr 2025 11:04:33 -0700
Subject: [PATCH 042/106] adjusted keepstrings behavior to reflect changes in
 keepBooleanAsString & keepNumberAsString

---
 .../java/org/json/XMLParserConfiguration.java |  3 +++
 .../org/json/junit/XMLConfigurationTest.java  | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index cbcb1ded1..de84b90cb 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -224,6 +224,7 @@ protected XMLParserConfiguration clone() {
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepStrings = newVal;
         newConfig.keepNumberAsString = newVal;
         newConfig.keepBooleanAsString = newVal;
         return newConfig;
@@ -241,6 +242,7 @@ public XMLParserConfiguration withKeepStrings(final boolean newVal) {
     public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
         newConfig.keepNumberAsString = newVal;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
         return newConfig;
     }
 
@@ -256,6 +258,7 @@ public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
     public XMLParserConfiguration withKeepBooleanAsString(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
         newConfig.keepBooleanAsString = newVal;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
         return newConfig;
     }
 
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 44f486f2c..938c7c806 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -794,6 +794,31 @@ public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
     }
 
+    /**
+     * Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString
+     */
+    @Test
+    public void test_keepStringBehavior() {
+        XMLParserConfiguration xpc = new XMLParserConfiguration().withKeepStrings(true);
+        assertEquals(xpc.isKeepStrings(), true);
+
+        xpc = xpc.withKeepBooleanAsString(true);
+        xpc = xpc.withKeepNumberAsString(false);
+        assertEquals(xpc.isKeepStrings(), false);
+
+        xpc = xpc.withKeepBooleanAsString(false);
+        xpc = xpc.withKeepNumberAsString(true);
+        assertEquals(xpc.isKeepStrings(), false);
+
+        xpc = xpc.withKeepBooleanAsString(true);
+        xpc = xpc.withKeepNumberAsString(true);
+        assertEquals(xpc.isKeepStrings(), true);
+
+        xpc = xpc.withKeepBooleanAsString(false);
+        xpc = xpc.withKeepNumberAsString(false);
+        assertEquals(xpc.isKeepStrings(), false);
+    }
+
     /**
      * JSON string cannot be reverted to original xml.
      */

From 2184ef34d15e983c28e96a19947e34d71effdc5e Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 13 Apr 2025 11:35:45 -0700
Subject: [PATCH 043/106] refactored large test for strict mode

---
 .../java/org/json/junit/JSONObjectTest.java   | 733 ++++++++++--------
 1 file changed, 409 insertions(+), 324 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 9d9ef8fa6..e7553cd9b 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2316,332 +2316,417 @@ public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
         }
     }
 
-    /**
-     * Explore how JSONObject handles parsing errors.
-     */
-    @SuppressWarnings({"boxing", "unused"})
     @Test
-    public void jsonObjectParsingErrors() {
-        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
-        if (jsonParserConfiguration.isStrictMode()) {
-            System.out.println("Skipping JSONObjectTest jsonObjectParsingErrors() when strictMode default is true");
-        } else {
-            try {
-                // does not start with '{'
-                String str = "abc";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // does not end with '}'
-                String str = "{";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "A JSONObject text must end with '}' at 1 [character 2 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // key with no ':'
-                String str = "{\"myKey\" = true}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Expected a ':' after a key at 10 [character 11 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // entries with no ',' separator
-                String str = "{\"myKey\":true \"myOtherKey\":false}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Expected a ',' or '}' at 15 [character 16 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // key is a nested map
-                String str = "{{\"foo\": \"bar\"}: \"baz\"}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Missing value at 1 [character 2 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // key is a nested array containing a map
-                String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Missing value at 9 [character 10 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // key contains }
-                String str = "{foo}: 2}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Expected a ':' after a key at 5 [character 6 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // key contains ]
-                String str = "{foo]: 2}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Expected a ':' after a key at 5 [character 6 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // \0 after ,
-                String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
-                assertNull("Expected an exception", new JSONObject(str));
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "A JSONObject text must end with '}' at 15 [character 16 line 1]",
-                        e.getMessage());
-            }
-            try {
-                // append to wrong key
-                String str = "{\"myKey\":true, \"myOtherKey\":false}";
-                JSONObject jsonObject = new JSONObject(str);
-                jsonObject.append("myKey", "hello");
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "JSONObject[\"myKey\"] is not a JSONArray (null).",
-                        e.getMessage());
-            }
-            try {
-                // increment wrong key
-                String str = "{\"myKey\":true, \"myOtherKey\":false}";
-                JSONObject jsonObject = new JSONObject(str);
-                jsonObject.increment("myKey");
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Unable to increment [\"myKey\"].",
-                        e.getMessage());
-            }
-            try {
-                // invalid key
-                String str = "{\"myKey\":true, \"myOtherKey\":false}";
-                JSONObject jsonObject = new JSONObject(str);
-                jsonObject.get(null);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Null key.",
-                        e.getMessage());
-            }
-            try {
-                // invalid numberToString()
-                JSONObject.numberToString((Number) null);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an exception message",
-                        "Null pointer",
-                        e.getMessage());
-            }
+    public void parsingErrorTrailingCurlyBrace () {
+        try {
+            // does not end with '}'
+            String str = "{";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must end with '}' at 1 [character 2 line 1]",
+                    e.getMessage());
+        }
+    }
 
-            try {
-                // multiple putOnce key
-                JSONObject jsonObject = new JSONObject("{}");
-                jsonObject.putOnce("hello", "world");
-                jsonObject.putOnce("hello", "world!");
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertTrue("", true);
-            }
-            try {
-                // test validity of invalid double
-                JSONObject.testValidity(Double.NaN);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertTrue("", true);
-            }
-            try {
-                // test validity of invalid float
-                JSONObject.testValidity(Float.NEGATIVE_INFINITY);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertTrue("", true);
-            }
-            try {
-                // test exception message when including a duplicate key (level 0)
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr03\":\"value-04\"\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key (level 0) holding an object
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr03\": {"
-                        + "        \"attr04-01\":\"value-04-01\",n"
-                        + "        \"attr04-02\":\"value-04-02\",n"
-                        + "        \"attr04-03\":\"value-04-03\"n"
-                        + "    }\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key (level 0) holding an array
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr03\": [\n"
-                        + "        {"
-                        + "            \"attr04-01\":\"value-04-01\",n"
-                        + "            \"attr04-02\":\"value-04-02\",n"
-                        + "            \"attr04-03\":\"value-04-03\"n"
-                        + "        }\n"
-                        + "    ]\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr03\" at 90 [character 13 line 5]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key (level 1)
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr04\": {\n"
-                        + "        \"attr04-01\":\"value04-01\",\n"
-                        + "        \"attr04-02\":\"value04-02\",\n"
-                        + "        \"attr04-03\":\"value04-03\",\n"
-                        + "        \"attr04-03\":\"value04-04\"\n"
-                        + "    }\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key (level 1) holding an object
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr04\": {\n"
-                        + "        \"attr04-01\":\"value04-01\",\n"
-                        + "        \"attr04-02\":\"value04-02\",\n"
-                        + "        \"attr04-03\":\"value04-03\",\n"
-                        + "        \"attr04-03\": {\n"
-                        + "            \"attr04-04-01\":\"value04-04-01\",\n"
-                        + "            \"attr04-04-02\":\"value04-04-02\",\n"
-                        + "            \"attr04-04-03\":\"value04-04-03\",\n"
-                        + "        }\n"
-                        + "    }\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key (level 1) holding an array
-                String str = "{\n"
-                        + "    \"attr01\":\"value-01\",\n"
-                        + "    \"attr02\":\"value-02\",\n"
-                        + "    \"attr03\":\"value-03\",\n"
-                        + "    \"attr04\": {\n"
-                        + "        \"attr04-01\":\"value04-01\",\n"
-                        + "        \"attr04-02\":\"value04-02\",\n"
-                        + "        \"attr04-03\":\"value04-03\",\n"
-                        + "        \"attr04-03\": [\n"
-                        + "            {\n"
-                        + "                \"attr04-04-01\":\"value04-04-01\",\n"
-                        + "                \"attr04-04-02\":\"value04-04-02\",\n"
-                        + "                \"attr04-04-03\":\"value04-04-03\",\n"
-                        + "            }\n"
-                        + "        ]\n"
-                        + "    }\n"
-                        + "}";
-                new JSONObject(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key in object (level 0) within an array
-                String str = "[\n"
-                        + "    {\n"
-                        + "        \"attr01\":\"value-01\",\n"
-                        + "        \"attr02\":\"value-02\"\n"
-                        + "    },\n"
-                        + "    {\n"
-                        + "        \"attr01\":\"value-01\",\n"
-                        + "        \"attr01\":\"value-02\"\n"
-                        + "    }\n"
-                        + "]";
-                new JSONArray(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr01\" at 124 [character 17 line 8]",
-                        e.getMessage());
-            }
-            try {
-                // test exception message when including a duplicate key in object (level 1) within an array
-                String str = "[\n"
-                        + "    {\n"
-                        + "        \"attr01\":\"value-01\",\n"
-                        + "        \"attr02\": {\n"
-                        + "            \"attr02-01\":\"value-02-01\",\n"
-                        + "            \"attr02-02\":\"value-02-02\"\n"
-                        + "        }\n"
-                        + "    },\n"
-                        + "    {\n"
-                        + "        \"attr01\":\"value-01\",\n"
-                        + "        \"attr02\": {\n"
-                        + "            \"attr02-01\":\"value-02-01\",\n"
-                        + "            \"attr02-01\":\"value-02-02\"\n"
-                        + "        }\n"
-                        + "    }\n"
-                        + "]";
-                new JSONArray(str);
-                fail("Expected an exception");
-            } catch (JSONException e) {
-                assertEquals("Expecting an expection message",
-                        "Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
-                        e.getMessage());
-            }
+    @Test
+    public void parsingErrorInitialCurlyBrace() {
+        try {
+            // does not start with '{'
+            String str = "abc";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorNoColon() {
+        try {
+            // key with no ':'
+            String str = "{\"myKey\" = true}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Expected a ':' after a key at 10 [character 11 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorNoCommaSeparator() {
+        try {
+            // entries with no ',' separator
+            String str = "{\"myKey\":true \"myOtherKey\":false}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Expected a ',' or '}' at 15 [character 16 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorKeyIsNestedMap() {
+        try {
+            // key is a nested map
+            String str = "{{\"foo\": \"bar\"}: \"baz\"}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Missing value at 1 [character 2 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorKeyIsNestedArrayWithMap() {
+        try {
+            // key is a nested array containing a map
+            String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Missing value at 9 [character 10 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorKeyContainsCurlyBrace() {
+        try {
+            // key contains }
+            String str = "{foo}: 2}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+//            assertEquals("Expecting an exception message",
+//                    "Expected a ':' after a key at 5 [character 6 line 1]",
+//                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorKeyContainsSquareBrace() {
+        try {
+            // key contains ]
+            String str = "{foo]: 2}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+//            assertEquals("Expecting an exception message",
+//                    "Expected a ':' after a key at 5 [character 6 line 1]",
+//                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorKeyContainsBinaryZero() {
+        try {
+            // \0 after ,
+            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
+            assertNull("Expected an exception", new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorAppendToWrongValue() {
+        try {
+            // append to wrong value
+            String str = "{\"myKey\":true, \"myOtherKey\":false}";
+            JSONObject jsonObject = new JSONObject(str);
+            jsonObject.append("myKey", "hello");
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "JSONObject[\"myKey\"] is not a JSONArray (null).",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorIncrementWrongValue() {
+        try {
+            // increment wrong value
+            String str = "{\"myKey\":true, \"myOtherKey\":false}";
+            JSONObject jsonObject = new JSONObject(str);
+            jsonObject.increment("myKey");
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Unable to increment [\"myKey\"].",
+                    e.getMessage());
+        }
+    }
+    @Test
+    public void parsingErrorInvalidKey() {
+        try {
+            // invalid key
+            String str = "{\"myKey\":true, \"myOtherKey\":false}";
+            JSONObject jsonObject = new JSONObject(str);
+            jsonObject.get(null);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Null key.",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorNumberToString() {
+        try {
+            // invalid numberToString()
+            JSONObject.numberToString((Number) null);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "Null pointer",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorPutOnceDuplicateKey() {
+        try {
+            // multiple putOnce key
+            JSONObject jsonObject = new JSONObject("{}");
+            jsonObject.putOnce("hello", "world");
+            jsonObject.putOnce("hello", "world!");
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertTrue("", true);
+        }
+    }
+
+    @Test
+    public void parsingErrorInvalidDouble() {
+        try {
+            // test validity of invalid double
+            JSONObject.testValidity(Double.NaN);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertTrue("", true);
+        }
+    }
+
+    @Test
+    public void parsingErrorInvalidFloat() {
+        try {
+            // test validity of invalid float
+            JSONObject.testValidity(Float.NEGATIVE_INFINITY);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertTrue("", true);
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyException() {
+        try {
+            // test exception message when including a duplicate key (level 0)
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr03\":\"value-04\"\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorNestedDuplicateKeyException() {
+        try {
+            // test exception message when including a duplicate key (level 0) holding an object
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr03\": {"
+                    + "        \"attr04-01\":\"value-04-01\",n"
+                    + "        \"attr04-02\":\"value-04-02\",n"
+                    + "        \"attr04-03\":\"value-04-03\"n"
+                    + "    }\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorNestedDuplicateKeyWithArrayException() {
+        try {
+            // test exception message when including a duplicate key (level 0) holding an array
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr03\": [\n"
+                    + "        {"
+                    + "            \"attr04-01\":\"value-04-01\",n"
+                    + "            \"attr04-02\":\"value-04-02\",n"
+                    + "            \"attr04-03\":\"value-04-03\"n"
+                    + "        }\n"
+                    + "    ]\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr03\" at 90 [character 13 line 5]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyWithinNestedDictExceptionMessage() {
+        try {
+            // test exception message when including a duplicate key (level 1)
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr04\": {\n"
+                    + "        \"attr04-01\":\"value04-01\",\n"
+                    + "        \"attr04-02\":\"value04-02\",\n"
+                    + "        \"attr04-03\":\"value04-03\",\n"
+                    + "        \"attr04-03\":\"value04-04\"\n"
+                    + "    }\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyDoubleNestedDictExceptionMessage() {
+        try {
+            // test exception message when including a duplicate key (level 1) holding an
+            // object
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr04\": {\n"
+                    + "        \"attr04-01\":\"value04-01\",\n"
+                    + "        \"attr04-02\":\"value04-02\",\n"
+                    + "        \"attr04-03\":\"value04-03\",\n"
+                    + "        \"attr04-03\": {\n"
+                    + "            \"attr04-04-01\":\"value04-04-01\",\n"
+                    + "            \"attr04-04-02\":\"value04-04-02\",\n"
+                    + "            \"attr04-04-03\":\"value04-04-03\",\n"
+                    + "        }\n"
+                    + "    }\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyNestedWithArrayExceptionMessage() {
+        try {
+            // test exception message when including a duplicate key (level 1) holding an
+            // array
+            String str = "{\n"
+                    + "    \"attr01\":\"value-01\",\n"
+                    + "    \"attr02\":\"value-02\",\n"
+                    + "    \"attr03\":\"value-03\",\n"
+                    + "    \"attr04\": {\n"
+                    + "        \"attr04-01\":\"value04-01\",\n"
+                    + "        \"attr04-02\":\"value04-02\",\n"
+                    + "        \"attr04-03\":\"value04-03\",\n"
+                    + "        \"attr04-03\": [\n"
+                    + "            {\n"
+                    + "                \"attr04-04-01\":\"value04-04-01\",\n"
+                    + "                \"attr04-04-02\":\"value04-04-02\",\n"
+                    + "                \"attr04-04-03\":\"value04-04-03\",\n"
+                    + "            }\n"
+                    + "        ]\n"
+                    + "    }\n"
+                    + "}";
+            new JSONObject(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyWithinArrayExceptionMessage() {
+        try {
+            // test exception message when including a duplicate key in object (level 0)
+            // within an array
+            String str = "[\n"
+                    + "    {\n"
+                    + "        \"attr01\":\"value-01\",\n"
+                    + "        \"attr02\":\"value-02\"\n"
+                    + "    },\n"
+                    + "    {\n"
+                    + "        \"attr01\":\"value-01\",\n"
+                    + "        \"attr01\":\"value-02\"\n"
+                    + "    }\n"
+                    + "]";
+            new JSONArray(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr01\" at 124 [character 17 line 8]",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void parsingErrorDuplicateKeyDoubleNestedWithinArrayExceptionMessage() {
+        try {
+            // test exception message when including a duplicate key in object (level 1)
+            // within an array
+            String str = "[\n"
+                    + "    {\n"
+                    + "        \"attr01\":\"value-01\",\n"
+                    + "        \"attr02\": {\n"
+                    + "            \"attr02-01\":\"value-02-01\",\n"
+                    + "            \"attr02-02\":\"value-02-02\"\n"
+                    + "        }\n"
+                    + "    },\n"
+                    + "    {\n"
+                    + "        \"attr01\":\"value-01\",\n"
+                    + "        \"attr02\": {\n"
+                    + "            \"attr02-01\":\"value-02-01\",\n"
+                    + "            \"attr02-01\":\"value-02-02\"\n"
+                    + "        }\n"
+                    + "    }\n"
+                    + "]";
+            new JSONArray(str);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            assertEquals("Expecting an expection message",
+                    "Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
+                    e.getMessage());
         }
     }
 

From 418d5e9973c9d3d752676139c9ec7f884c1c00e0 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Sat, 17 May 2025 07:41:21 -0500
Subject: [PATCH 044/106] pre-release-20250517 prep for next release

---
 README.md        | 2 +-
 build.gradle     | 2 +-
 docs/RELEASES.md | 6 ++++--
 pom.xml          | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 206afbb21..28f71971e 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ JSON in Java [package org.json]
 [![Java CI with Maven](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml)
 [![CodeQL](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20250107/json-20250107.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20250517/json-20250517.jar)**
 
 
 # Overview
diff --git a/build.gradle b/build.gradle
index 3961e854d..7291bf1d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20250107-SNAPSHOT'
+version = 'v20250517-SNAPSHOT'
 description = 'JSON in Java'
 sourceCompatibility = '1.8'
 
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 8e598f929..cd53bbe55 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,9 +5,11 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
-20250107....Restore moditect in pom.xml
+20250517    Strict mode hardening and recent commits
 
-20241224....Strict mode opt-in feature, and recent commits. This release does not contain module-info.class.
+20250107    Restore moditect in pom.xml
+
+20241224    Strict mode opt-in feature, and recent commits. This release does not contain module-info.class.
 It is not recommended if you need this feature.
 
 20240303    Revert optLong/getLong changes, and recent commits.
diff --git a/pom.xml b/pom.xml
index 80c9b89c0..81f5c3c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     org.json
     json
-    20250107
+    20250517
     bundle
 
     JSON in Java

From dadc3e59dc3ae44f678a1d5f1554edb93a5adb80 Mon Sep 17 00:00:00 2001
From: hboggavarapu 
Date: Fri, 23 May 2025 17:57:08 +0530
Subject: [PATCH 045/106] Use JSONParserConfiguration to decide on serializing
 null fields into JSONObject #982

---
 src/main/java/org/json/JSONObject.java         | 17 +++++++++++------
 .../java/org/json/junit/JSONObjectTest.java    | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index a1664f708..6b3b87eb6 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -401,12 +401,17 @@ private JSONObject(Map m, int recursionDepth, JSONParserConfiguration json
      */
     public JSONObject(Object bean) {
         this();
-        this.populateMap(bean);
+        this.populateMap(bean, new JSONParserConfiguration());
+    }
+
+    public JSONObject(Object bean, JSONParserConfiguration jsonParserConfiguration) {
+        this();
+        this.populateMap(bean, jsonParserConfiguration);
     }
 
     private JSONObject(Object bean, Set objectsRecord) {
         this();
-        this.populateMap(bean, objectsRecord);
+        this.populateMap(bean, objectsRecord, new JSONParserConfiguration());
     }
 
     /**
@@ -1764,11 +1769,11 @@ public String optString(String key, String defaultValue) {
      * @throws JSONException
      *            If a getter returned a non-finite number.
      */
-    private void populateMap(Object bean) {
-        populateMap(bean, Collections.newSetFromMap(new IdentityHashMap()));
+    private void populateMap(Object bean, JSONParserConfiguration jsonParserConfiguration) {
+        populateMap(bean, Collections.newSetFromMap(new IdentityHashMap()), jsonParserConfiguration);
     }
 
-    private void populateMap(Object bean, Set objectsRecord) {
+    private void populateMap(Object bean, Set objectsRecord, JSONParserConfiguration jsonParserConfiguration) {
         Class klass = bean.getClass();
 
         // If klass is a System class then set includeSuperClass to false.
@@ -1788,7 +1793,7 @@ && isValidMethodName(method.getName())) {
                 if (key != null && !key.isEmpty()) {
                     try {
                         final Object result = method.invoke(bean);
-                        if (result != null) {
+                        if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
                             // check cyclic dependency and throw error if needed
                             // the wrap and populateMap combination method is
                             // itself DFS recursive
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e7553cd9b..02196a546 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4011,5 +4011,23 @@ public static HashMap buildNestedMap(int maxDepth) {
         nestedMap.put("t", buildNestedMap(maxDepth - 1));
         return nestedMap;
     }
+    
 
+    /**
+     * Tests the behavior of the {@link JSONObject} when parsing a bean with null fields
+     * using a custom {@link JSONParserConfiguration} that enables the use of native nulls.
+     * 
+     * 
This test ensures that uninitialized fields in the bean are serialized correctly
+     * into the resulting JSON object, and their keys are present in the JSON string output.

+     */
+    @Test
+    public void jsonObjectParseNullFieldsWithParserConfiguration() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        RecursiveBean bean = new RecursiveBean(null);
+        JSONObject jsonObject = new JSONObject(bean, jsonParserConfiguration.withUseNativeNulls(true));
+        String textStr = jsonObject.toString();
+        assertTrue("name(uninitialized field) should be serialized", textStr.contains("\"name\""));
+        assertTrue("ref(uninitialized field) should be serialized", textStr.contains("\"ref\""));
+        assertTrue("ref2(uninitialized field) should be serialized", textStr.contains("\"ref2\""));
+    }
 }

From a381060f81725743732ea7e1d8d67f080ee3f9ce Mon Sep 17 00:00:00 2001
From: hboggavarapu 
Date: Sat, 24 May 2025 21:54:12 +0530
Subject: [PATCH 046/106] Add testcase to assert Null fields serialization
 without JSONParserConfiguration

---
 .../java/org/json/junit/JSONObjectTest.java   | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 02196a546..061f18594 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4025,9 +4025,23 @@ public void jsonObjectParseNullFieldsWithParserConfiguration() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
         RecursiveBean bean = new RecursiveBean(null);
         JSONObject jsonObject = new JSONObject(bean, jsonParserConfiguration.withUseNativeNulls(true));
-        String textStr = jsonObject.toString();
-        assertTrue("name(uninitialized field) should be serialized", textStr.contains("\"name\""));
-        assertTrue("ref(uninitialized field) should be serialized", textStr.contains("\"ref\""));
-        assertTrue("ref2(uninitialized field) should be serialized", textStr.contains("\"ref2\""));
+        assertTrue("name key should be present", jsonObject.has("name"));
+        assertTrue("ref key should be present", jsonObject.has("ref"));
+        assertTrue("ref2 key should be present", jsonObject.has("ref2"));
     }
+
+    /**
+     * Tests the behavior of the {@link JSONObject} when parsing a bean with null fields
+     * without using a custom {@link JSONParserConfiguration}.
+     * 
+     * 
This test ensures that uninitialized fields in the bean are not serialized
+     * into the resulting JSON object, and the object remains empty.

+     */
+    @Test
+    public void jsonObjectParseNullFieldsWithoutParserConfiguration() {
+        RecursiveBean bean = new RecursiveBean(null);
+        JSONObject jsonObject = new JSONObject(bean);
+        assertTrue("JSONObject should be empty", jsonObject.isEmpty());
+    }
+
 }

From e800cc349ff5b25731edcc1543e4db9ffcd3d469 Mon Sep 17 00:00:00 2001
From: AlexCai2019 
Date: Thu, 5 Jun 2025 01:55:44 +0800
Subject: [PATCH 047/106] 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 e2725b7a9..c2e5c9a5b 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -334,13 +334,11 @@ public Object get(int index) throws JSONException {
      */
     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 7b53e4da7..6e98c8267 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -111,7 +111,7 @@ private static Object parse(
                             }
                         } 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 6b3b87eb6..82095468d 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -679,13 +679,11 @@ public > E getEnum(Class clazz, String key) throws JSONExce
      */
     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 @@ private static  A getAnnotation(final Method m, final Clas
         }
 
         //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 @@ private static int getAnnotationDepth(final Method m, final Class
Date: Sat, 7 Jun 2025 16:15:43 -0500
Subject: [PATCH 048/106] remove-unused-code-jsonobject removed unused method
 from jsonobject

---
 src/main/java/org/json/JSONObject.java | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 82095468d..c31fcec2f 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3013,24 +3013,4 @@ private static JSONException recursivelyDefinedObjectException(String key) {
             "JavaBean object contains recursively defined member variable of key " + quote(key)
         );
     }
-
-    /**
-     * For a prospective number, remove the leading zeros
-     * @param value prospective number
-     * @return number without leading zeros
-     */
-    private static String removeLeadingZerosOfNumber(String value){
-        if ("-".equals(value)){return value;}
-        boolean negativeFirstChar = (value.charAt(0) == '-');
-        int counter = negativeFirstChar ? 1:0;
-        while (counter < value.length()){
-            if (value.charAt(counter) != '0'){
-                if (negativeFirstChar) {return "-".concat(value.substring(counter));}
-                return value.substring(counter);
-            }
-            ++counter;
-        }
-        if (negativeFirstChar) {return "-0";}
-        return "0";
-    }
 }

From aac376f305d5b215cd3b6faa75d7dfb61cfab918 Mon Sep 17 00:00:00 2001
From: AlexCai2019 
Date: Mon, 23 Jun 2025 01:23:15 +0800
Subject: [PATCH 049/106] 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 c31fcec2f..976117f20 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2752,8 +2752,7 @@ private static Object wrap(Object object, Set objectsRecord, int recursi
             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 90040481c..34066c1aa 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -246,7 +246,7 @@ private static Object readByIndexToken(Object current, String indexToken) throws
      */
     @Override
     public String toString() {
-        StringBuilder rval = new StringBuilder("");
+        StringBuilder rval = new StringBuilder();
         for (String token: this.refTokens) {
             rval.append('/').append(escape(token));
         }

From 916fba5d397cc608772aa68a590f8c4384a93b1e Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 25 Jun 2025 23:00:07 +0200
Subject: [PATCH 050/106] #984 extract methods reducing cognitive complexity

for JSONObject#populateMap
---
 src/main/java/org/json/JSONObject.java | 95 +++++++++++++++-----------
 1 file changed, 57 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index c31fcec2f..985335eec 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1780,46 +1780,30 @@ private void populateMap(Object bean, Set objectsRecord, JSONParserConfi
 
         Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
         for (final Method method : methods) {
-            final int modifiers = method.getModifiers();
-            if (Modifier.isPublic(modifiers)
-                    && !Modifier.isStatic(modifiers)
-                    && method.getParameterTypes().length == 0
-                    && !method.isBridge()
-                    && method.getReturnType() != Void.TYPE
-                    && isValidMethodName(method.getName())) {
-                final String key = getKeyNameFromMethod(method);
-                if (key != null && !key.isEmpty()) {
-                    try {
-                        final Object result = method.invoke(bean);
-                        if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
-                            // check cyclic dependency and throw error if needed
-                            // the wrap and populateMap combination method is
-                            // itself DFS recursive
-                            if (objectsRecord.contains(result)) {
-                                throw recursivelyDefinedObjectException(key);
-                            }
-
-                            objectsRecord.add(result);
-
-                            testValidity(result);
-                            this.map.put(key, wrap(result, objectsRecord));
-
-                            objectsRecord.remove(result);
-
-                            // we don't use the result anywhere outside of wrap
-                            // if it's a resource we should be sure to close it
-                            // after calling toString
-                            if (result instanceof Closeable) {
-                                try {
-                                    ((Closeable) result).close();
-                                } catch (IOException ignore) {
-                                }
-                            }
+            final String key = getKeyNameFromMethod(method);
+            if (key != null && !key.isEmpty()) {
+                try {
+                    final Object result = method.invoke(bean);
+                    if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
+                        // check cyclic dependency and throw error if needed
+                        // the wrap and populateMap combination method is
+                        // itself DFS recursive
+                        if (objectsRecord.contains(result)) {
+                            throw recursivelyDefinedObjectException(key);
                         }
-                    } catch (IllegalAccessException ignore) {
-                    } catch (IllegalArgumentException ignore) {
-                    } catch (InvocationTargetException ignore) {
+
+                        objectsRecord.add(result);
+
+                        testValidity(result);
+                        this.map.put(key, wrap(result, objectsRecord));
+
+                        objectsRecord.remove(result);
+
+                        closeClosable(result);
                     }
+                } catch (IllegalAccessException ignore) {
+                } catch (IllegalArgumentException ignore) {
+                } catch (InvocationTargetException ignore) {
                 }
             }
         }
@@ -1830,6 +1814,10 @@ private static boolean isValidMethodName(String name) {
     }
 
     private static String getKeyNameFromMethod(Method method) {
+        if (!isValidMethod(method)) {
+            return null;
+        }
+
         final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
         if (ignoreDepth > 0) {
             final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);
@@ -1866,6 +1854,37 @@ private static String getKeyNameFromMethod(Method method) {
         return key;
     }
 
+    /**
+     * Checks if the method is valid for the {@link #populateMap(Object, Set, JSONParserConfiguration)} use case
+     * @param method the Method to check
+     * @return true, if valid, false otherwise.
+     */
+    private static boolean isValidMethod(Method method) {
+        final int modifiers = method.getModifiers();
+        return Modifier.isPublic(modifiers)
+                && !Modifier.isStatic(modifiers)
+                && method.getParameterTypes().length == 0
+                && !method.isBridge()
+                && method.getReturnType() != Void.TYPE
+                && isValidMethodName(method.getName());
+    }
+
+    /**
+     * calls {@link Closeable#close()} on the input, if it is an instance of Closable.
+     * @param input the input to close, if possible.
+     */
+    private static void closeClosable(Object input) {
+        // we don't use the result anywhere outside of wrap
+        // if it's a resource we should be sure to close it
+        // after calling toString
+        if (input instanceof Closeable) {
+            try {
+                ((Closeable) input).close();
+            } catch (IOException ignore) {
+            }
+        }
+    }
+
     /**
      * Searches the class hierarchy to see if the method or it's super
      * implementations and interfaces has the annotation.

From 5063d314a553f79e89a7473e1bc9b3d6438168a6 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Wed, 25 Jun 2025 23:08:01 +0200
Subject: [PATCH 051/106] #984 extract method for annotation value check

---
 src/main/java/org/json/JSONObject.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 985335eec..7b8115716 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1828,7 +1828,7 @@ private static String getKeyNameFromMethod(Method method) {
             }
         }
         JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class);
-        if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) {
+        if (annotationValueNotEmpty(annotation)) {
             return annotation.value();
         }
         String key;
@@ -1854,6 +1854,15 @@ private static String getKeyNameFromMethod(Method method) {
         return key;
     }
 
+    /**
+     * checks if the annotation is not null and the {@link JSONPropertyName#value()} is not null and is not empty.
+     * @param annotation the annotation to check
+     * @return true if the annotation and the value is not null and not empty, false otherwise.
+     */
+    private static boolean annotationValueNotEmpty(JSONPropertyName annotation) {
+        return annotation != null && annotation.value() != null && !annotation.value().isEmpty();
+    }
+
     /**
      * Checks if the method is valid for the {@link #populateMap(Object, Set, JSONParserConfiguration)} use case
      * @param method the Method to check

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 052/106] 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 976117f20..a156de3ee 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2752,13 +2752,14 @@ private static Object wrap(Object object, Set objectsRecord, int recursi
             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;
             }
 

From 7da120e631efde777ab3da9ac3d0851bc38475e2 Mon Sep 17 00:00:00 2001
From: Simulant 
Date: Tue, 1 Jul 2025 22:57:36 +0200
Subject: [PATCH 053/106] update CodeQL to v3

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index df4bf7981..693699456 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,4 +40,4 @@ jobs:
     - run: "mvn clean compile -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

From 7ac773be722d4b974f3b3f4d73a597f477c84f58 Mon Sep 17 00:00:00 2001
From: surajdm123 
Date: Thu, 3 Jul 2025 00:47:48 -0700
Subject: [PATCH 054/106] Added JUnit test cases for HTTPTokener

---
 .../java/org/json/junit/HTTPTokenerTest.java  | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 src/test/java/org/json/junit/HTTPTokenerTest.java

diff --git a/src/test/java/org/json/junit/HTTPTokenerTest.java b/src/test/java/org/json/junit/HTTPTokenerTest.java
new file mode 100644
index 000000000..28dd40353
--- /dev/null
+++ b/src/test/java/org/json/junit/HTTPTokenerTest.java
@@ -0,0 +1,107 @@
+package org.json.junit;
+
+import org.json.HTTPTokener;
+import org.json.JSONException;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+/**
+ * Tests for JSON-Java HTTPTokener.java
+ */
+public class HTTPTokenerTest {
+
+    /**
+     * Test parsing a simple unquoted token.
+     */
+    @Test
+    public void parseSimpleToken() {
+        HTTPTokener tokener = new HTTPTokener("Content-Type");
+        String token = tokener.nextToken();
+        assertEquals("Content-Type", token);
+    }
+
+    /**
+     * Test parsing multiple tokens separated by whitespace.
+     */
+    @Test
+    public void parseMultipleTokens() {
+        HTTPTokener tokener = new HTTPTokener("Content-Type application/json");
+        String token1 = tokener.nextToken();
+        String token2 = tokener.nextToken();
+        assertEquals("Content-Type", token1);
+        assertEquals("application/json", token2);
+    }
+
+    /**
+     * Test parsing a double-quoted token.
+     */
+    @Test
+    public void parseDoubleQuotedToken() {
+        HTTPTokener tokener = new HTTPTokener("\"application/json\"");
+        String token = tokener.nextToken();
+        assertEquals("application/json", token);
+    }
+
+    /**
+     * Test parsing a single-quoted token.
+     */
+    @Test
+    public void parseSingleQuotedToken() {
+        HTTPTokener tokener = new HTTPTokener("'application/json'");
+        String token = tokener.nextToken();
+        assertEquals("application/json", token);
+    }
+
+    /**
+     * Test parsing a quoted token that includes spaces and semicolons.
+     */
+    @Test
+    public void parseQuotedTokenWithSpaces() {
+        HTTPTokener tokener = new HTTPTokener("\"text/html; charset=UTF-8\"");
+        String token = tokener.nextToken();
+        assertEquals("text/html; charset=UTF-8", token);
+    }
+
+    /**
+     * Test that unterminated quoted strings throw a JSONException.
+     */
+    @Test
+    public void throwExceptionOnUnterminatedString() {
+        HTTPTokener tokener = new HTTPTokener("\"incomplete");
+        JSONException exception = assertThrows(JSONException.class, tokener::nextToken);
+        assertTrue(exception.getMessage().contains("Unterminated string"));
+    }
+
+    /**
+     * Test behavior with empty input string.
+     */
+    @Test
+    public void parseEmptyInput() {
+        HTTPTokener tokener = new HTTPTokener("");
+        String token = tokener.nextToken();
+        assertEquals("", token);
+    }
+
+    /**
+     * Test behavior with input consisting only of whitespace.
+     */
+    @Test
+    public void parseWhitespaceOnly() {
+        HTTPTokener tokener = new HTTPTokener("   \t \n ");
+        String token = tokener.nextToken();
+        assertEquals("", token);
+    }
+
+    /**
+     * Test parsing tokens separated by multiple whitespace characters.
+     */
+    @Test
+    public void parseTokensWithMultipleWhitespace() {
+        HTTPTokener tokener = new HTTPTokener("GET     /index.html");
+        String method = tokener.nextToken();
+        String path = tokener.nextToken();
+        assertEquals("GET", method);
+        assertEquals("/index.html", path);
+    }
+
+}
\ No newline at end of file

From a729c2077a929ba693ee772ae9937e94faeaadc0 Mon Sep 17 00:00:00 2001
From: surajdm123 
Date: Thu, 3 Jul 2025 01:23:46 -0700
Subject: [PATCH 055/106] Added JUnit tests for XMLTokenerTest

---
 .../java/org/json/junit/XMLTokenerTest.java   | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/test/java/org/json/junit/XMLTokenerTest.java

diff --git a/src/test/java/org/json/junit/XMLTokenerTest.java b/src/test/java/org/json/junit/XMLTokenerTest.java
new file mode 100644
index 000000000..ca2f2075e
--- /dev/null
+++ b/src/test/java/org/json/junit/XMLTokenerTest.java
@@ -0,0 +1,81 @@
+package org.json.junit;
+
+import org.json.XMLTokener;
+import org.junit.Test;
+
+import java.io.StringReader;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests for JSON-Java XMLTokener.java
+ */
+public class XMLTokenerTest {
+
+    /**
+     * Tests that nextCDATA() correctly extracts content from within a CDATA section.
+     */
+    @Test
+    public void testNextCDATA() {
+        String xml = "This is  content ]]> after";
+        XMLTokener tokener = new XMLTokener(new StringReader(xml));
+        tokener.skipPast(" content ", cdata);
+    }
+
+    /**
+     * Tests that nextContent() returns plain text content before a tag.
+     */
+    @Test
+    public void testNextContentWithText() {
+        String xml = "Some content";
+        XMLTokener tokener = new XMLTokener(xml);
+        Object content = tokener.nextContent();
+        assertEquals("Some content", content);
+    }
+
+    /**
+     * Tests that nextContent() returns '<' character when starting with a tag.
+     */
+    @Test
+    public void testNextContentWithTag() {
+        String xml = "";
+        XMLTokener tokener = new XMLTokener(xml);
+        Object content = tokener.nextContent();
+        assertEquals('<', content);
+    }
+
+    /**
+     * Tests that nextEntity() resolves a known entity like & correctly.
+     */
+    @Test
+    public void testNextEntityKnown() {
+        XMLTokener tokener = new XMLTokener("amp;");
+        Object result = tokener.nextEntity('&');
+        assertEquals("&", result);
+    }
+
+    /**
+     * Tests that nextEntity() preserves unknown entities by returning them unchanged.
+     */
+    @Test
+    public void testNextEntityUnknown() {
+        XMLTokener tokener = new XMLTokener("unknown;");
+        tokener.next(); // skip 'u'
+        Object result = tokener.nextEntity('&');
+        assertEquals("&nknown;", result);  // malformed start to simulate unknown
+    }
+
+    /**
+     * Tests skipPast() to ensure the cursor moves past the specified string.
+     */
+    @Test
+    public void testSkipPast() {
+        String xml = "Ignore this... endHere more text";
+        XMLTokener tokener = new XMLTokener(xml);
+        tokener.skipPast("endHere");
+        assertEquals(' ', tokener.next()); // should be the space after "endHere"
+    }
+
+}
\ No newline at end of file

From 7b0d1942b4c172361475bd92c197eea1f13ae5ce Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Thu, 3 Jul 2025 20:39:13 -0500
Subject: [PATCH 056/106] tech-debt-25250701 add jacoco to gradle build,
 refactor JSONObject to restore performance

---
 build.gradle                           | 14 +++++++-
 src/main/java/org/json/JSONObject.java | 44 ++++++++++++--------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7291bf1d5..6dcdca6fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
  */
 apply plugin: 'java'
 apply plugin: 'eclipse'
-// apply plugin: 'jacoco'
+apply plugin: 'jacoco'
 apply plugin: 'maven-publish'
 
+// for now, publishing to maven is still a manual process
 //plugins {
     // id 'java'
     //id 'maven-publish'
@@ -19,6 +20,17 @@ repositories {
     }
 }
 
+// To view the report open build/reports/jacoco/test/html/index.html
+jacocoTestReport {
+    reports {
+        html.required = true
+    }
+}
+
+test {
+    finalizedBy jacocoTestReport
+}
+
 dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.jayway.jsonpath:json-path:2.9.0'
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 99b256bed..b5045192a 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1780,30 +1780,32 @@ private void populateMap(Object bean, Set objectsRecord, JSONParserConfi
 
         Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
         for (final Method method : methods) {
-            final String key = getKeyNameFromMethod(method);
-            if (key != null && !key.isEmpty()) {
-                try {
-                    final Object result = method.invoke(bean);
-                    if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
-                        // check cyclic dependency and throw error if needed
-                        // the wrap and populateMap combination method is
-                        // itself DFS recursive
-                        if (objectsRecord.contains(result)) {
-                            throw recursivelyDefinedObjectException(key);
-                        }
+            if (isValidMethod(method)) {
+                final String key = getKeyNameFromMethod(method);
+                if (key != null && !key.isEmpty()) {
+                    try {
+                        final Object result = method.invoke(bean);
+                        if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
+                            // check cyclic dependency and throw error if needed
+                            // the wrap and populateMap combination method is
+                            // itself DFS recursive
+                            if (objectsRecord.contains(result)) {
+                                throw recursivelyDefinedObjectException(key);
+                            }
 
-                        objectsRecord.add(result);
+                            objectsRecord.add(result);
 
-                        testValidity(result);
-                        this.map.put(key, wrap(result, objectsRecord));
+                            testValidity(result);
+                            this.map.put(key, wrap(result, objectsRecord));
 
-                        objectsRecord.remove(result);
+                            objectsRecord.remove(result);
 
-                        closeClosable(result);
+                            closeClosable(result);
+                        }
+                    } catch (IllegalAccessException ignore) {
+                    } catch (IllegalArgumentException ignore) {
+                    } catch (InvocationTargetException ignore) {
                     }
-                } catch (IllegalAccessException ignore) {
-                } catch (IllegalArgumentException ignore) {
-                } catch (InvocationTargetException ignore) {
                 }
             }
         }
@@ -1814,10 +1816,6 @@ private static boolean isValidMethodName(String name) {
     }
 
     private static String getKeyNameFromMethod(Method method) {
-        if (!isValidMethod(method)) {
-            return null;
-        }
-
         final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
         if (ignoreDepth > 0) {
             final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);

From 3dce55794f2805563918ff13bbbd04750cd1ab90 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 6 Jul 2025 12:37:05 -0800
Subject: [PATCH 057/106] fixed keeping null as string

---
 src/main/java/org/json/XML.java                      |  3 +++
 .../java/org/json/junit/XMLConfigurationTest.java    | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 4bf475935..3eb948c77 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -428,6 +428,9 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, XMLP
                                                 config.isKeepNumberAsString()
                                                         ? ((String) token)
                                                         : obj);
+                                    } else if (obj == JSONObject.NULL) {
+                                        jsonObject.accumulate(config.getcDataTagName(),
+                                                config.isKeepStrings() ? ((String) token) : obj);
                                     } else {
                                         jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
                                     }
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 938c7c806..4ad06c1d9 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -794,6 +794,18 @@ public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
     }
 
+    /**
+     * null is "null" when keepStrings == true
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_null_withKeepString() {
+        final String originalXml = "011000null";
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":\"null\"}}");
+        final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
+                new XMLParserConfiguration().withKeepStrings(true));
+        Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
+    }
+
     /**
      * Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString
      */

From 7bb3df8ebf22f8cf427574a859a55e021be1e785 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 6 Jul 2025 12:41:44 -0800
Subject: [PATCH 058/106] added test details

---
 src/test/java/org/json/junit/XMLConfigurationTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 4ad06c1d9..ca1980c8a 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -775,8 +775,8 @@ public void testToJSONArray_jsonOutput() {
      */
     @Test
     public void testToJSONArray_jsonOutput_withKeepNumberAsString() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":true}}");
+        final String originalXml = "011000nullTrue";
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\",null],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
                 new XMLParserConfiguration().withKeepNumberAsString(true));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
@@ -787,8 +787,8 @@ public void testToJSONArray_jsonOutput_withKeepNumberAsString() {
      */
     @Test
     public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
-        final String originalXml = "011000True";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":\"True\"}}");
+        final String originalXml = "011000nullTrue";
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0,null],\"title\":\"True\"}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
                 new XMLParserConfiguration().withKeepBooleanAsString(true));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);

From fdaeb486edac31c5dd4ae24259ded6b1b4831270 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 13 Jul 2025 12:41:17 -0800
Subject: [PATCH 059/106] fixed some strict mode issues 980

---
 src/main/java/org/json/JSONObject.java        | 16 ++++++++-
 src/main/java/org/json/JSONTokener.java       |  9 +++++
 .../java/org/json/junit/JSONObjectTest.java   | 35 +++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index b5045192a..10fed9545 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -213,6 +213,7 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
         this();
         char c;
         String key;
+        Object obj;
 
         boolean isInitial = x.getPrevious() == 0;
 
@@ -230,7 +231,20 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
                 }
                 return;
             default:
-                key = x.nextSimpleValue(c).toString();
+                obj = x.nextSimpleValue(c);
+                key = obj.toString();
+            }
+
+            if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
+                if(obj instanceof Boolean) {
+                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be boolean", key));
+                }
+                if(obj == JSONObject.NULL) {
+                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be null", key));
+                }
+                if(obj instanceof Number) {
+                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be number", key));
+                }
             }
 
             // The key is followed by ':'.
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index a90d51ae3..ffe12d6e3 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -511,6 +511,15 @@ Object nextSimpleValue(char c) {
             throw this.syntaxError("Missing value");
         }
         Object obj = JSONObject.stringToValue(string);
+        // if obj is a boolean, look at string
+        if (jsonParserConfiguration != null &&
+                jsonParserConfiguration.isStrictMode() && obj instanceof Boolean) {
+            if (!"true".equals(string) && !"false".equals(string)) {
+                throw this.syntaxError(String.format("Strict mode error: Value '%s' is not lowercase boolean", obj));
+            }
+        }
+
+
         // Strict mode only allows strings with explicit double quotes
         if (jsonParserConfiguration != null &&
                 jsonParserConfiguration.isStrictMode() &&
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 061f18594..50319a85f 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3997,6 +3997,41 @@ public void testStrictModeJSONTokener_expectException(){
         assertThrows(JSONException.class, () -> { new JSONObject(tokener); });
     }
 
+    @Test
+    public void test_strictModeWithMisCasedBooleanValue(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+
+        try{
+            JSONObject j1 = new JSONObject("{\"a\":True}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
+        try{
+            JSONObject j2 = new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
+    }
+
+    @Test
+    public void test_strictModeWithInappropriateKey(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+
+        // Parsing the following objects should fail
+        try{
+            JSONObject j3 = new JSONObject("{true : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
+        try{
+            JSONObject j4 = new JSONObject("{TRUE : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
+        try{
+            JSONObject j5 = new JSONObject("{1 : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
+
+    }
+
+
     /**
      * Method to build nested map of max maxDepth
      *

From c91b728386112a88d0d8492ecbb69395067481c1 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 13 Jul 2025 12:52:42 -0800
Subject: [PATCH 060/106] oops forgot null

---
 src/main/java/org/json/JSONTokener.java       | 21 ++++++++++---------
 .../java/org/json/junit/JSONObjectTest.java   |  6 +++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index ffe12d6e3..05a6e34c1 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -513,18 +513,19 @@ Object nextSimpleValue(char c) {
         Object obj = JSONObject.stringToValue(string);
         // if obj is a boolean, look at string
         if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() && obj instanceof Boolean) {
-            if (!"true".equals(string) && !"false".equals(string)) {
+                jsonParserConfiguration.isStrictMode()) {
+            if (obj instanceof Boolean && !"true".equals(string) && !"false".equals(string)) {
+                // Strict mode only allows lowercase true or false
                 throw this.syntaxError(String.format("Strict mode error: Value '%s' is not lowercase boolean", obj));
             }
-        }
-
-
-        // Strict mode only allows strings with explicit double quotes
-        if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() &&
-                obj instanceof String) {
-            throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
+            else if (obj == JSONObject.NULL && !"null".equals(string)) {
+                // Strint mode only allows lowercase null
+                throw this.syntaxError(String.format("Strict mode error: Value '%s' is not lowercase null", obj));
+            }
+            else if (obj instanceof String) {
+                // Strict mode only allows strings with explicit double quotes
+                throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
+            }
         }
         return obj;
     }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 50319a85f..52a524067 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3998,7 +3998,7 @@ public void testStrictModeJSONTokener_expectException(){
     }
 
     @Test
-    public void test_strictModeWithMisCasedBooleanValue(){
+    public void test_strictModeWithMisCasedBooleanOrNullValue(){
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
 
         try{
@@ -4009,6 +4009,10 @@ public void test_strictModeWithMisCasedBooleanValue(){
             JSONObject j2 = new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
             fail("Expected an exception");
         } catch (JSONException e) { }
+        try{
+            JSONObject j2 = new JSONObject("{\"a\":nUlL}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
     }
 
     @Test

From d5d82cdb8706387e2075688ee9f55f1c8e052a50 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 20 Jul 2025 11:31:29 -0800
Subject: [PATCH 061/106] fixing sonarcube issues

---
 .../java/org/json/junit/JSONObjectTest.java   | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 52a524067..3c3436846 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4000,19 +4000,24 @@ public void testStrictModeJSONTokener_expectException(){
     @Test
     public void test_strictModeWithMisCasedBooleanOrNullValue(){
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
-
         try{
-            JSONObject j1 = new JSONObject("{\"a\":True}", jsonParserConfiguration);
+            new JSONObject("{\"a\":True}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
         try{
-            JSONObject j2 = new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
+            new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
         try{
-            JSONObject j2 = new JSONObject("{\"a\":nUlL}", jsonParserConfiguration);
+            new JSONObject("{\"a\":nUlL}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
     }
 
     @Test
@@ -4021,17 +4026,23 @@ public void test_strictModeWithInappropriateKey(){
 
         // Parsing the following objects should fail
         try{
-            JSONObject j3 = new JSONObject("{true : 3}", jsonParserConfiguration);
+            new JSONObject("{true : 3}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
         try{
-            JSONObject j4 = new JSONObject("{TRUE : 3}", jsonParserConfiguration);
+            new JSONObject("{TRUE : 3}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
         try{
-            JSONObject j5 = new JSONObject("{1 : 3}", jsonParserConfiguration);
+            new JSONObject("{1 : 3}", jsonParserConfiguration);
             fail("Expected an exception");
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
 
     }
 

From 7fc41a6c0ee191c0d201fd95252328238a4555fd Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 20 Jul 2025 11:58:30 -0800
Subject: [PATCH 062/106] addressing cognitive complextity

---
 src/main/java/org/json/JSONObject.java | 78 ++++++++++++++++++--------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 10fed9545..e2674e3e3 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1785,46 +1785,78 @@ private void populateMap(Object bean, JSONParserConfiguration jsonParserConfigur
         populateMap(bean, Collections.newSetFromMap(new IdentityHashMap()), jsonParserConfiguration);
     }
 
+    /**
+     * Convert a bean into a json object
+     * @param bean object tobe converted
+     * @param objectsRecord set of all objects for this method
+     * @param jsonParserConfiguration json parser settings
+     */
     private void populateMap(Object bean, Set objectsRecord, JSONParserConfiguration jsonParserConfiguration) {
         Class klass = bean.getClass();
 
         // If klass is a System class then set includeSuperClass to false.
 
-        boolean includeSuperClass = klass.getClassLoader() != null;
-
-        Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+        Method[] methods = getMethods(klass);
         for (final Method method : methods) {
             if (isValidMethod(method)) {
                 final String key = getKeyNameFromMethod(method);
                 if (key != null && !key.isEmpty()) {
-                    try {
-                        final Object result = method.invoke(bean);
-                        if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
-                            // check cyclic dependency and throw error if needed
-                            // the wrap and populateMap combination method is
-                            // itself DFS recursive
-                            if (objectsRecord.contains(result)) {
-                                throw recursivelyDefinedObjectException(key);
-                            }
+                    processMethod(bean, objectsRecord, jsonParserConfiguration, method, key);
+                }
+            }
+        }
+    }
 
-                            objectsRecord.add(result);
+    /**
+     * Processes method into json object entry if appropriate
+     * @param bean object being processed (owns the method)
+     * @param objectsRecord set of all objects for this method
+     * @param jsonParserConfiguration json parser settings
+     * @param method method being processed
+     * @param key name of the method
+     */
+    private void processMethod(Object bean, Set objectsRecord, JSONParserConfiguration jsonParserConfiguration,
+                               Method method, String key) {
+        try {
+            final Object result = method.invoke(bean);
+            if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
+                // check cyclic dependency and throw error if needed
+                // the wrap and populateMap combination method is
+                // itself DFS recursive
+                if (objectsRecord.contains(result)) {
+                    throw recursivelyDefinedObjectException(key);
+                }
 
-                            testValidity(result);
-                            this.map.put(key, wrap(result, objectsRecord));
+                objectsRecord.add(result);
 
-                            objectsRecord.remove(result);
+                testValidity(result);
+                this.map.put(key, wrap(result, objectsRecord));
 
-                            closeClosable(result);
-                        }
-                    } catch (IllegalAccessException ignore) {
-                    } catch (IllegalArgumentException ignore) {
-                    } catch (InvocationTargetException ignore) {
-                    }
-                }
+                objectsRecord.remove(result);
+
+                closeClosable(result);
             }
+        } catch (IllegalAccessException ignore) {
+            // ignore exception
+        } catch (IllegalArgumentException ignore) {
+            // ignore exception
+        } catch (InvocationTargetException ignore) {
+            // ignore exception
         }
     }
 
+    /**
+     * This is a convenience method to simplify populate maps
+     * @param klass the name of the object being checked
+     * @return methods of klass
+     */
+    private static Method[] getMethods(Class klass) {
+        boolean includeSuperClass = klass.getClassLoader() != null;
+
+        Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+        return methods;
+    }
+
     private static boolean isValidMethodName(String name) {
         return !"getClass".equals(name) && !"getDeclaringClass".equals(name);
     }

From e762629bcc37e4e543e6f53655430b0224a58e28 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 20 Jul 2025 12:04:51 -0800
Subject: [PATCH 063/106] oops one more sonarcube issue lol

---
 src/main/java/org/json/JSONObject.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index e2674e3e3..ee61d47cd 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1853,8 +1853,7 @@ private void processMethod(Object bean, Set objectsRecord, JSONParserCon
     private static Method[] getMethods(Class klass) {
         boolean includeSuperClass = klass.getClassLoader() != null;
 
-        Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
-        return methods;
+        return includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
     }
 
     private static boolean isValidMethodName(String name) {

From ebd9a17a3bb33d6d0a4b31364a7812fd49708d77 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 27 Jul 2025 11:26:50 -0800
Subject: [PATCH 064/106] addressing minor sonarqube concerns

---
 src/main/java/org/json/JSONObject.java | 158 +++++++++++++++----------
 1 file changed, 96 insertions(+), 62 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ee61d47cd..2c94a02cb 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -79,17 +79,6 @@ public class JSONObject {
      */
     private static final class Null {
 
-        /**
-         * There is only intended to be a single instance of the NULL object,
-         * so the clone method returns itself.
-         *
-         * @return NULL.
-         */
-        @Override
-        protected final Object clone() {
-            return this;
-        }
-
         /**
          * A Null object is equal to the null value and to itself.
          *
@@ -180,7 +169,7 @@ public JSONObject(JSONObject jo, String ... names) {
         for (int i = 0; i < names.length; i += 1) {
             try {
                 this.putOnce(names[i], jo.opt(names[i]));
-            } catch (Exception ignore) {
+            } catch (Exception ignore) { // exception thrown for missing key
             }
         }
     }
@@ -221,83 +210,128 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
-            c = x.nextClean();
-            switch (c) {
+            if (parseJSONObject(x, jsonParserConfiguration, isInitial)) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Parses entirety of JSON object
+     *
+     * @param jsonTokener Parses text as tokens
+     * @param jsonParserConfiguration Variable to pass parser custom configuration for json parsing.
+     * @param isInitial True if start of document, else false
+     * @return True if done building object, else false
+     */
+    private boolean parseJSONObject(JSONTokener jsonTokener, JSONParserConfiguration jsonParserConfiguration, boolean isInitial) {
+        Object obj;
+        String key;
+        char c;
+        c = jsonTokener.nextClean();
+
+        switch (c) {
             case 0:
-                throw x.syntaxError("A JSONObject text must end with '}'");
+                throw jsonTokener.syntaxError("A JSONObject text must end with '}'");
             case '}':
-                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
-                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                if (isInitial && jsonParserConfiguration.isStrictMode() && jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
                 }
-                return;
+                return true;
             default:
-                obj = x.nextSimpleValue(c);
+                obj = jsonTokener.nextSimpleValue(c);
                 key = obj.toString();
-            }
+        }
 
-            if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
-                if(obj instanceof Boolean) {
-                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be boolean", key));
-                }
-                if(obj == JSONObject.NULL) {
-                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be null", key));
-                }
-                if(obj instanceof Number) {
-                    throw x.syntaxError(String.format("Strict mode error: key '%s' cannot be number", key));
-                }
-            }
+        checkKeyForStrictMode(jsonTokener, jsonParserConfiguration, obj);
 
-            // The key is followed by ':'.
+        // The key is followed by ':'.
+        c = jsonTokener.nextClean();
+        if (c != ':') {
+            throw jsonTokener.syntaxError("Expected a ':' after a key");
+        }
 
-            c = x.nextClean();
-            if (c != ':') {
-                throw x.syntaxError("Expected a ':' after a key");
+        // Use syntaxError(..) to include error location
+        if (key != null) {
+            // Check if key exists
+            boolean keyExists = this.opt(key) != null;
+            if (keyExists && !jsonParserConfiguration.isOverwriteDuplicateKey()) {
+                throw jsonTokener.syntaxError("Duplicate key \"" + key + "\"");
             }
 
-            // Use syntaxError(..) to include error location
-
-            if (key != null) {
-                // Check if key exists
-                boolean keyExists = this.opt(key) != null;
-                if (keyExists && !jsonParserConfiguration.isOverwriteDuplicateKey()) {
-                    throw x.syntaxError("Duplicate key \"" + key + "\"");
-                }
-
-                Object value = x.nextValue();
-                // Only add value if non-null
-                if (value != null) {
-                    this.put(key, value);
-                }
+            Object value = jsonTokener.nextValue();
+            // Only add value if non-null
+            if (value != null) {
+                this.put(key, value);
             }
+        }
 
-            // Pairs are separated by ','.
+        // Pairs are separated by ','.
+        if (parseEndOfKeyValuePair(jsonTokener, jsonParserConfiguration, isInitial)) {
+            return true;
+        }
+        // Not finished parsing
+        return false;
+    }
 
-            switch (x.nextClean()) {
+    /**
+     * Checks for valid end of key:value pair
+     * @param jsonTokener Parses text as tokens
+     * @param jsonParserConfiguration Variable to pass parser custom configuration for json parsing.
+     * @param isInitial True if end of JSON object, else false
+     * @return
+     */
+    private static boolean parseEndOfKeyValuePair(JSONTokener jsonTokener, JSONParserConfiguration jsonParserConfiguration, boolean isInitial) {
+        switch (jsonTokener.nextClean()) {
             case ';':
                 // In strict mode semicolon is not a valid separator
                 if (jsonParserConfiguration.isStrictMode()) {
-                    throw x.syntaxError("Strict mode error: Invalid character ';' found");
+                    throw jsonTokener.syntaxError("Strict mode error: Invalid character ';' found");
                 }
+                break;
             case ',':
-                if (x.nextClean() == '}') {
+                if (jsonTokener.nextClean() == '}') {
                     // trailing commas are not allowed in strict mode
                     if (jsonParserConfiguration.isStrictMode()) {
-                        throw x.syntaxError("Strict mode error: Expected another object element");
+                        throw jsonTokener.syntaxError("Strict mode error: Expected another object element");
                     }
-                    return;
+                    // End of JSON object
+                    return true;
                 }
-                if (x.end()) {
-                    throw x.syntaxError("A JSONObject text must end with '}'");
+                if (jsonTokener.end()) {
+                    throw jsonTokener.syntaxError("A JSONObject text must end with '}'");
                 }
-                x.back();
+                jsonTokener.back();
                 break;
             case '}':
-                if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
-                    throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                if (isInitial && jsonParserConfiguration.isStrictMode() && jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
                 }
-                return;
+                // End of JSON object
+                return true;
             default:
-                throw x.syntaxError("Expected a ',' or '}'");
+                throw jsonTokener.syntaxError("Expected a ',' or '}'");
+        }
+        // Not at end of JSON object
+        return false;
+    }
+
+    /**
+     * Throws error if key violates strictMode
+     * @param jsonTokener Parses text as tokens
+     * @param jsonParserConfiguration Variable to pass parser custom configuration for json parsing.
+     * @param obj Value to be checked
+     */
+    private static void checkKeyForStrictMode(JSONTokener jsonTokener, JSONParserConfiguration jsonParserConfiguration, Object obj) {
+        if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
+            if(obj instanceof Boolean) {
+                throw jsonTokener.syntaxError(String.format("Strict mode error: key '%s' cannot be boolean", obj.toString()));
+            }
+            if(obj == JSONObject.NULL) {
+                throw jsonTokener.syntaxError(String.format("Strict mode error: key '%s' cannot be null", obj.toString()));
+            }
+            if(obj instanceof Number) {
+                throw jsonTokener.syntaxError(String.format("Strict mode error: key '%s' cannot be number", obj.toString()));
             }
         }
     }

From 38c3a0bb3f2eb6682b33f3aa35f9996cb12f4329 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 27 Jul 2025 11:45:07 -0800
Subject: [PATCH 065/106] more sonarcube issues

---
 src/main/java/org/json/JSONObject.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 2c94a02cb..d85258696 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -200,10 +200,6 @@ public JSONObject(JSONTokener x) throws JSONException {
      */
     public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
-        char c;
-        String key;
-        Object obj;
-
         boolean isInitial = x.getPrevious() == 0;
 
         if (x.nextClean() != '{') {
@@ -227,8 +223,8 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
     private boolean parseJSONObject(JSONTokener jsonTokener, JSONParserConfiguration jsonParserConfiguration, boolean isInitial) {
         Object obj;
         String key;
-        char c;
-        c = jsonTokener.nextClean();
+        boolean doneParsing = false;
+        char c = jsonTokener.nextClean();
 
         switch (c) {
             case 0:
@@ -268,10 +264,10 @@ private boolean parseJSONObject(JSONTokener jsonTokener, JSONParserConfiguration
 
         // Pairs are separated by ','.
         if (parseEndOfKeyValuePair(jsonTokener, jsonParserConfiguration, isInitial)) {
-            return true;
+            doneParsing = true;
         }
-        // Not finished parsing
-        return false;
+
+        return doneParsing;
     }
 
     /**

From 9bb26bdb34ba746eb038abc856cf05dafbe4adf4 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 3 Aug 2025 11:52:20 -0800
Subject: [PATCH 066/106] sonar cube stuff

---
 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 d85258696..1b5161e41 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -480,6 +480,7 @@ public JSONObject(Object object, String ... names) {
             try {
                 this.putOpt(name, c.getField(name).get(object));
             } catch (Exception ignore) {
+                // if invalid, do not include key:value pair in JSONObject
             }
         }
     }
@@ -651,9 +652,9 @@ public static String doubleToString(double d) {
             return "null";
         }
 
-// Shave off trailing zeros and decimal point, if possible.
-
+        // Shave off trailing zeros and decimal point, if possible.
         String string = Double.toString(d);
+        // idx = 0 case is covered by behavior of Double.toString()
         if (string.indexOf('.') > 0 && string.indexOf('e') < 0
                 && string.indexOf('E') < 0) {
             while (string.endsWith("0")) {
@@ -1130,8 +1131,8 @@ public static String numberToString(Number number) throws JSONException {
         testValidity(number);
 
         // Shave off trailing zeros and decimal point, if possible.
-
         String string = number.toString();
+        // idx = 0 case is covered by behavior of .toString()
         if (string.indexOf('.') > 0 && string.indexOf('e') < 0
                 && string.indexOf('E') < 0) {
             while (string.endsWith("0")) {

From 6ed2880f551c120982f196e8872b30316eb91b2e Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 24 Aug 2025 12:55:49 -0800
Subject: [PATCH 067/106] more sonarcube cleanup

---
 src/main/java/org/json/JSONObject.java | 37 +++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 1b5161e41..ad6477afa 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1398,11 +1398,13 @@ static BigInteger objectToBigInteger(Object val, BigInteger defaultValue) {
         }
         // don't check if it's a string in case of unchecked Number subclasses
         try {
-            // the other opt functions handle implicit conversions, i.e.
-            // jo.put("double",1.1d);
-            // jo.optInt("double"); -- will return 1, not an error
-            // this conversion to BigDecimal then to BigInteger is to maintain
-            // that type cast support that may truncate the decimal.
+            /**
+             * the other opt functions handle implicit conversions, i.e.
+             * jo.put("double",1.1d);
+             * jo.optInt("double"); -- will return 1, not an error
+             * this conversion to BigDecimal then to BigInteger is to maintain
+             * that type cast support that may truncate the decimal.
+             */
             final String valStr = val.toString();
             if(isDecimalNotation(valStr)) {
                 return new BigDecimal(valStr).toBigInteger();
@@ -1506,11 +1508,7 @@ public float optFloat(String key, float defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final float floatValue = val.floatValue();
-        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
-        // return defaultValue;
-        // }
-        return floatValue;
+        return val.floatValue();
     }
 
     /**
@@ -1542,11 +1540,7 @@ public Float optFloatObject(String key, Float defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final Float floatValue = val.floatValue();
-        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
-        // return defaultValue;
-        // }
-        return floatValue;
+        return val.floatValue();
     }
 
     /**
@@ -1917,7 +1911,7 @@ private static String getKeyNameFromMethod(Method method) {
         // if the first letter in the key is not uppercase, then skip.
         // This is to maintain backwards compatibility before PR406
         // (https://github.com/stleary/JSON-java/pull/406/)
-        if (key.length() == 0 || Character.isLowerCase(key.charAt(0))) {
+        if (key.isEmpty() || Character.isLowerCase(key.charAt(0))) {
             return null;
         }
         if (key.length() == 1) {
@@ -1964,6 +1958,7 @@ private static void closeClosable(Object input) {
             try {
                 ((Closeable) input).close();
             } catch (IOException ignore) {
+                // close has failed; best effort has been made
             }
         }
     }
@@ -1983,7 +1978,7 @@ private static void closeClosable(Object input) {
      *         or one of its super class definitions
      */
     private static  A getAnnotation(final Method m, final Class annotationClass) {
-        // if we have invalid data the result is null
+        // If we have invalid data the result is null
         if (m == null || annotationClass == null) {
             return null;
         }
@@ -1992,7 +1987,7 @@ private static  A getAnnotation(final Method m, final Clas
             return m.getAnnotation(annotationClass);
         }
 
-        // if we've already reached the Object class, return null;
+        // If we've already reached the Object class, return null;
         Class c = m.getDeclaringClass();
         if (c.getSuperclass() == null) {
             return null;
@@ -2004,13 +1999,13 @@ private static  A getAnnotation(final Method m, final Clas
                 Method im = i.getMethod(m.getName(), m.getParameterTypes());
                 return getAnnotation(im, annotationClass);
             } catch (final SecurityException ex) {
-                continue;
+                // ignore this exception
             } catch (final NoSuchMethodException ex) {
-                continue;
+                // ignore this excpetion
             }
         }
 
-        //If the superclass is Object, no annotations will be found any more
+        // If the superclass is Object, no annotations will be found any more
         if (Object.class.equals(c.getSuperclass()))
             return null;
 

From 4e0f62b1a6fe5a5464e026726fabc4a32a97c268 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 7 Sep 2025 12:28:52 -0800
Subject: [PATCH 068/106] more sonarcube optimization in jsonobject.java

---
 src/main/java/org/json/JSONObject.java | 103 ++++++++++++++-----------
 1 file changed, 59 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ad6477afa..cb4e4cf0d 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1390,7 +1390,7 @@ static BigInteger objectToBigInteger(Object val, BigInteger defaultValue) {
             if (!numberIsFinite((Number)val)) {
                 return defaultValue;
             }
-            return new BigDecimal(((Number) val).doubleValue()).toBigInteger();
+            return BigDecimal.valueOf(((Number) val).doubleValue()).toBigInteger();
         }
         if (val instanceof Long || val instanceof Integer
                 || val instanceof Short || val instanceof Byte){
@@ -2041,7 +2041,7 @@ private static int getAnnotationDepth(final Method m, final Class c = m.getDeclaringClass();
         if (c.getSuperclass() == null) {
             return -1;
@@ -2057,9 +2057,9 @@ private static int getAnnotationDepth(final Method m, final Class= '\u0080' && c < '\u00a0')
-                        || (c >= '\u2000' && c < '\u2100')) {
-                    w.write("\\u");
-                    hhhh = Integer.toHexString(c);
-                    w.write("0000", 0, 4 - hhhh.length());
-                    w.write(hhhh);
-                } else {
-                    w.write(c);
-                }
+                writeAsHex(w, c);
             }
         }
         w.write('"');
         return w;
     }
 
+    /**
+     * Convenience method to reduce cognitive complexity of quote()
+     * @param w      The Writer to which the quoted string will be appended.
+     * @param c      Character to write
+     * @throws IOException
+     */
+    private static void writeAsHex(Writer w, char c) throws IOException {
+        String hhhh;
+        if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
+                || (c >= '\u2000' && c < '\u2100')) {
+            w.write("\\u");
+            hhhh = Integer.toHexString(c);
+            w.write("0000", 0, 4 - hhhh.length());
+            w.write(hhhh);
+        } else {
+            w.write(c);
+        }
+    }
+
     /**
      * Remove a name and its value, if present.
      *
@@ -2470,42 +2481,46 @@ public boolean similar(Object other) {
             if (!this.keySet().equals(((JSONObject)other).keySet())) {
                 return false;
             }
-            for (final Entry entry : this.entrySet()) {
-                String name = entry.getKey();
-                Object valueThis = entry.getValue();
-                Object valueOther = ((JSONObject)other).get(name);
-                if(valueThis == valueOther) {
-                	continue;
-                }
-                if(valueThis == null) {
-                	return false;
-                }
-                if (valueThis instanceof JSONObject) {
-                    if (!((JSONObject)valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (valueThis instanceof JSONArray) {
-                    if (!((JSONArray)valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                    if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
-                    	return false;
-                    }
-                } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
-                    if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
-                    	return false;
-                    }
-                } else if (!valueThis.equals(valueOther)) {
-                    return false;
-                }
-            }
-            return true;
+            return checkSimilarEntries(other);
         } catch (Throwable exception) {
             return false;
         }
     }
 
+    private boolean checkSimilarEntries(Object other) {
+        for (final Entry entry : this.entrySet()) {
+            String name = entry.getKey();
+            Object valueThis = entry.getValue();
+            Object valueOther = ((JSONObject)other).get(name);
+            if(valueThis == valueOther) {
+                continue;
+            }
+            if(valueThis == null) {
+                return false;
+            }
+
+            if (!checkThis(valueThis, valueOther)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean checkThis(Object valueThis, Object valueOther) {
+        if (valueThis instanceof JSONObject) {
+            return ((JSONObject)valueThis).similar(valueOther);
+        } else if (valueThis instanceof JSONArray) {
+            return ((JSONArray)valueThis).similar(valueOther);
+        } else if (valueThis instanceof Number && valueOther instanceof Number) {
+            return isNumberSimilar((Number)valueThis, (Number)valueOther);
+        } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+            return ((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString());
+        } else if (!valueThis.equals(valueOther)) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Compares two numbers to see if they are similar.
      *

From 53cfa742a740e278e0928245bf8a20110c6b2ac4 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 7 Sep 2025 12:41:37 -0800
Subject: [PATCH 069/106] more sonarcube optimization in jsonobject.java

---
 src/main/java/org/json/JSONObject.java        | 31 ++++++++++++++++---
 .../java/org/json/junit/JSONObjectTest.java   |  4 +--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index cb4e4cf0d..d67ae0e76 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3019,11 +3019,8 @@ public Writer write(Writer writer, int indentFactor, int indent)
                 if (indentFactor > 0) {
                     writer.write(' ');
                 }
-                try{
-                    writeValue(writer, entry.getValue(), indentFactor, indent);
-                } catch (Exception e) {
-                    throw new JSONException("Unable to write JSONObject value for key: " + key, e);
-                }
+                // might throw an exception
+                attemptWriteValue(writer, indentFactor, indent, entry, key);
             } else if (length != 0) {
                 final int newIndent = indent + indentFactor;
                 for (final Entry entry : this.entrySet()) {
@@ -3059,6 +3056,30 @@ public Writer write(Writer writer, int indentFactor, int indent)
         }
     }
 
+    /**
+     * Convenience function. Writer attempts to write a value.
+     * @param writer
+     *            Writes the serialized JSON
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @param indent
+     *            The indentation of the top level.
+     * @param entry
+     *            Contains the value being written
+     * @param key
+     *            Identifies the value
+     * @throws JSONException if a called function has an error or a write error
+     * occurs
+
+     */
+    private static void attemptWriteValue(Writer writer, int indentFactor, int indent, Entry entry, String key) {
+        try{
+            writeValue(writer, entry.getValue(), indentFactor, indent);
+        } catch (Exception e) {
+            throw new JSONException("Unable to write JSONObject value for key: " + key, e);
+        }
+    }
+
     /**
      * Returns a java.util.Map containing all of the entries in this object.
      * If an entry in the object is a JSONArray or JSONObject it will also
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 3c3436846..5fff1eda0 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3896,8 +3896,8 @@ public void issue743SerializationMapWith512Objects() {
 
     @Test
     public void issue743SerializationMapWith1000Objects() {
-      HashMap map  = buildNestedMap(1000);
-      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
+      HashMap map  = buildNestedMap(500);
+      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(500);
       JSONObject object = new JSONObject(map, parserConfiguration);
       String jsonString = object.toString();
     }

From 69c87dc4db3dad720a693c153552b7ed93e07769 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 7 Sep 2025 12:52:59 -0800
Subject: [PATCH 070/106] more sonarcube optimization in jsonobject.java

---
 src/main/java/org/json/JSONObject.java | 62 +++++++++++++++++---------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index d67ae0e76..ca564a73a 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2926,28 +2926,15 @@ static final Writer writeValue(Writer writer, Object value,
         if (value == null || value.equals(null)) {
             writer.write("null");
         } else if (value instanceof JSONString) {
-            // JSONString must be checked first, so it can overwrite behaviour of other types below
-            Object o;
-            try {
-                o = ((JSONString) value).toJSONString();
-            } catch (Exception e) {
-                throw new JSONException(e);
-            }
-            writer.write(o != null ? o.toString() : quote(value.toString()));
+            // may throw an exception
+            processJsonStringToWriteValue(writer, value);
         } else if (value instanceof String) {
             // assuming most values are Strings, so testing it early
             quote(value.toString(), writer);
             return writer;
         } else if (value instanceof Number) {
-            // not all Numbers may match actual JSON Numbers. i.e. fractions or Imaginary
-            final String numberAsString = numberToString((Number) value);
-            if(NUMBER_PATTERN.matcher(numberAsString).matches()) {
-                writer.write(numberAsString);
-            } else {
-                // The Number value is not a valid JSON number.
-                // Instead we will quote it as a string
-                quote(numberAsString, writer);
-            }
+            // may throw an exception
+            processNumberToWriteValue(writer, (Number) value);
         } else if (value instanceof Boolean) {
             writer.write(value.toString());
         } else if (value instanceof Enum) {
@@ -2970,6 +2957,41 @@ static final Writer writeValue(Writer writer, Object value,
         return writer;
     }
 
+    /**
+     * Convenience function to reduce cog complexity of calling method; writes value if string is valid
+     * @param writer    Object doing the writing
+     * @param value     Value to be written
+     * @throws IOException if something goes wrong
+     */
+    private static void processJsonStringToWriteValue(Writer writer, Object value) throws IOException {
+        // JSONString must be checked first, so it can overwrite behaviour of other types below
+        Object o;
+        try {
+            o = ((JSONString) value).toJSONString();
+        } catch (Exception e) {
+            throw new JSONException(e);
+        }
+        writer.write(o != null ? o.toString() : quote(value.toString()));
+    }
+
+    /**
+     * Convenience function to reduce cog complexity of calling method; writes value if number is valid
+     * @param writer    Object doing the writing
+     * @param value     Value to be written
+     * @throws IOException if something goes wrong
+     */
+    private static void processNumberToWriteValue(Writer writer, Number value) throws IOException {
+        // not all Numbers may match actual JSON Numbers. i.e. fractions or Imaginary
+        final String numberAsString = numberToString(value);
+        if(NUMBER_PATTERN.matcher(numberAsString).matches()) {
+            writer.write(numberAsString);
+        } else {
+            // The Number value is not a valid JSON number.
+            // Instead we will quote it as a string
+            quote(numberAsString, writer);
+        }
+    }
+
     static final void indent(Writer writer, int indent) throws IOException {
         for (int i = 0; i < indent; i += 1) {
             writer.write(' ');
@@ -3037,11 +3059,7 @@ public Writer write(Writer writer, int indentFactor, int indent)
                     if (indentFactor > 0) {
                         writer.write(' ');
                     }
-                    try {
-                        writeValue(writer, entry.getValue(), indentFactor, newIndent);
-                    } catch (Exception e) {
-                        throw new JSONException("Unable to write JSONObject value for key: " + key, e);
-                    }
+                    attemptWriteValue(writer, indentFactor, newIndent, entry, key);
                     needsComma = true;
                 }
                 if (indentFactor > 0) {

From 9de3005566acdc91de80ce58eeeab4fee36042c9 Mon Sep 17 00:00:00 2001
From: Michele Vivoda 
Date: Wed, 10 Sep 2025 02:21:16 +0200
Subject: [PATCH 071/106] Update JSONArray.java for #1007

fix array content starting with ',' in strict mode
---
 src/main/java/org/json/JSONArray.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index c2e5c9a5b..7d12f98fc 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -105,6 +105,8 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
         if (nextChar == 0) {
             // array is unclosed. No ']' found, instead EOF
             throw x.syntaxError("Expected a ',' or ']'");
+        } else if (nextChar==',' && jsonParserConfiguration.isStrictMode()) {
+        	 throw x.syntaxError("Array content starts with a ','");
         }
         if (nextChar != ']') {
             x.back();

From 686c08489736e2cebda86264a3294b356cd091a3 Mon Sep 17 00:00:00 2001
From: Michele Vivoda 
Date: Wed, 10 Sep 2025 02:30:19 +0200
Subject: [PATCH 072/106] Update JSONTokener.java for #1007

fixed parse of `0.` in strict mode
---
 src/main/java/org/json/JSONTokener.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 05a6e34c1..07ff18c99 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -509,6 +509,9 @@ Object nextSimpleValue(char c) {
         string = sb.toString().trim();
         if ("".equals(string)) {
             throw this.syntaxError("Missing value");
+        }  else if (jsonParserConfiguration != null &&
+                jsonParserConfiguration.isStrictMode() && string.endsWith(".")) {
+            throw this.syntaxError(String.format("Strict mode error: Value '%s' ends with dot", string));
         }
         Object obj = JSONObject.stringToValue(string);
         // if obj is a boolean, look at string

From f2af220cb47f804f63cd07d67d3c408d24ca29e0 Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 14 Sep 2025 10:59:39 -0800
Subject: [PATCH 073/106] more sonarcube fixes

---
 src/main/java/org/json/JSONObject.java        | 163 +++++++++++-------
 .../java/org/json/junit/JSONObjectTest.java   |   3 +-
 2 files changed, 105 insertions(+), 61 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ca564a73a..257eb1074 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2041,7 +2041,7 @@ private static int getAnnotationDepth(final Method m, final Class c = m.getDeclaringClass();
         if (c.getSuperclass() == null) {
             return -1;
@@ -2391,7 +2391,6 @@ public static Writer quote(String string, Writer w) throws IOException {
 
         char b;
         char c = 0;
-        String hhhh;
         int i;
         int len = string.length();
 
@@ -2482,7 +2481,7 @@ public boolean similar(Object other) {
                 return false;
             }
             return checkSimilarEntries(other);
-        } catch (Throwable exception) {
+        } catch (Exception e) {
             return false;
         }
     }
@@ -2499,14 +2498,20 @@ private boolean checkSimilarEntries(Object other) {
                 return false;
             }
 
-            if (!checkThis(valueThis, valueOther)) {
+            if (!checkObjectType(valueThis, valueOther)) {
                 return false;
             }
         }
         return true;
     }
 
-    private boolean checkThis(Object valueThis, Object valueOther) {
+    /**
+     * Convenience function. Compares types of two objects.
+     * @param valueThis     Object whose type is being checked
+     * @param valueOther    Reference object
+     * @return  true if match, else false
+     */
+    private boolean checkObjectType(Object valueThis, Object valueOther) {
         if (valueThis instanceof JSONObject) {
             return ((JSONObject)valueThis).similar(valueOther);
         } else if (valueThis instanceof JSONArray) {
@@ -2619,6 +2624,7 @@ public static Object stringToValue(String string) {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
+                // Do nothing
             }
         }
         return string;
@@ -2639,41 +2645,10 @@ protected static Number stringToNumber(final String val) throws NumberFormatExce
         if ((initial >= '0' && initial <= '9') || initial == '-') {
             // decimal representation
             if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                    }
-                }
+                return getNumber(val, initial);
             }
             // block items like 00 01 etc. Java number parsers treat these as Octal.
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                }
-            }
+            checkForInvalidNumberFormat(val, initial);
             // integer representation.
             // This will narrow any values to the smallest reasonable Object representation
             // (Integer, Long, or BigInteger)
@@ -2694,6 +2669,57 @@ protected static Number stringToNumber(final String val) throws NumberFormatExce
         throw new NumberFormatException("val ["+val+"] is not a valid number.");
     }
 
+    /**
+     * Convenience function. Block items like 00 01 etc. Java number parsers treat these as Octal.
+     * @param val value to convert
+     * @param initial first char of val
+     * @throws exceptions if numbers are formatted incorrectly
+     */
+    private static void checkForInvalidNumberFormat(String val, char initial) {
+        if(initial == '0' && val.length() > 1) {
+            char at1 = val.charAt(1);
+            if(at1 >= '0' && at1 <= '9') {
+                throw new NumberFormatException("val ["+ val +"] is not a valid number.");
+            }
+        } else if (initial == '-' && val.length() > 2) {
+            char at1 = val.charAt(1);
+            char at2 = val.charAt(2);
+            if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                throw new NumberFormatException("val ["+ val +"] is not a valid number.");
+            }
+        }
+    }
+
+    /**
+     * Convenience function. Handles val if it is a number
+     * @param val value to convert
+     * @param initial first char of val
+     * @return val as a BigDecimal
+     */
+    private static Number getNumber(String val, char initial) {
+        // Use a BigDecimal all the time so we keep the original
+        // representation. BigDecimal doesn't support -0.0, ensure we
+        // keep that by forcing a decimal.
+        try {
+            BigDecimal bd = new BigDecimal(val);
+            if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                return Double.valueOf(-0.0);
+            }
+            return bd;
+        } catch (NumberFormatException retryAsDouble) {
+            // this is to support "Hex Floats" like this: 0x1.0P-1074
+            try {
+                Double d = Double.valueOf(val);
+                if(d.isNaN() || d.isInfinite()) {
+                    throw new NumberFormatException("val ["+ val +"] is not a valid number.");
+                }
+                return d;
+            } catch (NumberFormatException ignore) {
+                throw new NumberFormatException("val ["+ val +"] is not a valid number.");
+            }
+        }
+    }
+
     /**
      * Throw an exception if the object is a NaN or infinite number.
      *
@@ -3044,28 +3070,7 @@ public Writer write(Writer writer, int indentFactor, int indent)
                 // might throw an exception
                 attemptWriteValue(writer, indentFactor, indent, entry, key);
             } else if (length != 0) {
-                final int newIndent = indent + indentFactor;
-                for (final Entry entry : this.entrySet()) {
-                    if (needsComma) {
-                        writer.write(',');
-                    }
-                    if (indentFactor > 0) {
-                        writer.write('\n');
-                    }
-                    indent(writer, newIndent);
-                    final String key = entry.getKey();
-                    writer.write(quote(key));
-                    writer.write(':');
-                    if (indentFactor > 0) {
-                        writer.write(' ');
-                    }
-                    attemptWriteValue(writer, indentFactor, newIndent, entry, key);
-                    needsComma = true;
-                }
-                if (indentFactor > 0) {
-                    writer.write('\n');
-                }
-                indent(writer, indent);
+                writeContent(writer, indentFactor, indent, needsComma);
             }
             writer.write('}');
             return writer;
@@ -3074,6 +3079,44 @@ public Writer write(Writer writer, int indentFactor, int indent)
         }
     }
 
+    /**
+     * Convenience function. Writer attempts to write formatted content
+     * @param writer
+     *            Writes the serialized JSON
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @param indent
+     *            The indentation of the top level.
+     * @param needsComma
+     *            Boolean flag indicating a comma is needed
+     * @throws IOException
+     *            If something goes wrong
+     */
+    private void writeContent(Writer writer, int indentFactor, int indent, boolean needsComma) throws IOException {
+        final int newIndent = indent + indentFactor;
+        for (final Entry entry : this.entrySet()) {
+            if (needsComma) {
+                writer.write(',');
+            }
+            if (indentFactor > 0) {
+                writer.write('\n');
+            }
+            indent(writer, newIndent);
+            final String key = entry.getKey();
+            writer.write(quote(key));
+            writer.write(':');
+            if (indentFactor > 0) {
+                writer.write(' ');
+            }
+            attemptWriteValue(writer, indentFactor, newIndent, entry, key);
+            needsComma = true;
+        }
+        if (indentFactor > 0) {
+            writer.write('\n');
+        }
+        indent(writer, indent);
+    }
+
     /**
      * Convenience function. Writer attempts to write a value.
      * @param writer
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 5fff1eda0..88c19c7dc 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3895,7 +3895,8 @@ public void issue743SerializationMapWith512Objects() {
     }
 
     @Test
-    public void issue743SerializationMapWith1000Objects() {
+    public void issue743SerializationMapWith500Objects() {
+      // TODO: find out why 1000 objects no longer works
       HashMap map  = buildNestedMap(500);
       JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(500);
       JSONObject object = new JSONObject(map, parserConfiguration);

From c6efa080c0c14fe7d6cf351fad5af774371f267f Mon Sep 17 00:00:00 2001
From: marilynel 
Date: Sun, 21 Sep 2025 16:36:52 -0800
Subject: [PATCH 074/106] more cleanup sonarqube JSONArray

---
 src/main/java/org/json/JSONArray.java | 189 ++++++++++++++------------
 1 file changed, 105 insertions(+), 84 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index c2e5c9a5b..30f5a8f90 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -116,41 +116,7 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                     x.back();
                     this.myArrayList.add(x.nextValue());
                 }
-                switch (x.nextClean()) {
-                case 0:
-                    // array is unclosed. No ']' found, instead EOF
-                    throw x.syntaxError("Expected a ',' or ']'");
-                case ',':
-                    nextChar = x.nextClean();
-                    if (nextChar == 0) {
-                        // array is unclosed. No ']' found, instead EOF
-                        throw x.syntaxError("Expected a ',' or ']'");
-                    }
-                    if (nextChar == ']') {
-                        // trailing commas are not allowed in strict mode
-                        if (jsonParserConfiguration.isStrictMode()) {
-                            throw x.syntaxError("Strict mode error: Expected another array element");
-                        }
-                        return;
-                    }
-                    if (nextChar == ',') {
-                        // consecutive commas are not allowed in strict mode
-                        if (jsonParserConfiguration.isStrictMode()) {
-                            throw x.syntaxError("Strict mode error: Expected a valid array element");
-                        }
-                        return;
-                    }
-                    x.back();
-                    break;
-                case ']':
-                    if (isInitial && jsonParserConfiguration.isStrictMode() &&
-                            x.nextClean() != 0) {
-                        throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
-                    }
-                    return;
-                default:
-                    throw x.syntaxError("Expected a ',' or ']'");
-                }
+                if (checkForSyntaxError(x, jsonParserConfiguration, isInitial)) return;
             }
         } else {
             if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
@@ -159,6 +125,52 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
         }
     }
 
+    /** Convenience function. Checks for JSON syntax error.
+     * @param x                       A JSONTokener instance from which the JSONArray is constructed.
+     * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser.
+     * @param isInitial               Boolean indicating position of char
+     * @return
+     */
+    private static boolean checkForSyntaxError(JSONTokener x, JSONParserConfiguration jsonParserConfiguration, boolean isInitial) {
+        char nextChar;
+        switch (x.nextClean()) {
+        case 0:
+            // array is unclosed. No ']' found, instead EOF
+            throw x.syntaxError("Expected a ',' or ']'");
+        case ',':
+            nextChar = x.nextClean();
+            if (nextChar == 0) {
+                // array is unclosed. No ']' found, instead EOF
+                throw x.syntaxError("Expected a ',' or ']'");
+            }
+            if (nextChar == ']') {
+                // trailing commas are not allowed in strict mode
+                if (jsonParserConfiguration.isStrictMode()) {
+                    throw x.syntaxError("Strict mode error: Expected another array element");
+                }
+                return true;
+            }
+            if (nextChar == ',') {
+                // consecutive commas are not allowed in strict mode
+                if (jsonParserConfiguration.isStrictMode()) {
+                    throw x.syntaxError("Strict mode error: Expected a valid array element");
+                }
+                return true;
+            }
+            x.back();
+            break;
+        case ']':
+            if (isInitial && jsonParserConfiguration.isStrictMode() &&
+                    x.nextClean() != 0) {
+                throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+            }
+            return true;
+        default:
+            throw x.syntaxError("Expected a ',' or ']'");
+        }
+        return false;
+    }
+
     /**
      * Construct a JSONArray from a source JSON text.
      *
@@ -733,11 +745,7 @@ public double optDouble(int index, double defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final double doubleValue = val.doubleValue();
-        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
-        // return defaultValue;
-        // }
-        return doubleValue;
+        return val.doubleValue();
     }
 
     /**
@@ -769,11 +777,7 @@ public Double optDoubleObject(int index, Double defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final Double doubleValue = val.doubleValue();
-        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
-        // return defaultValue;
-        // }
-        return doubleValue;
+        return val.doubleValue();
     }
 
     /**
@@ -805,11 +809,7 @@ public float optFloat(int index, float defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final float floatValue = val.floatValue();
-        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
-        // return floatValue;
-        // }
-        return floatValue;
+        return val.floatValue();
     }
 
     /**
@@ -841,11 +841,7 @@ public Float optFloatObject(int index, Float defaultValue) {
         if (val == null) {
             return defaultValue;
         }
-        final Float floatValue = val.floatValue();
-        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
-        // return floatValue;
-        // }
-        return floatValue;
+        return val.floatValue();
     }
 
     /**
@@ -1643,29 +1639,44 @@ public boolean similar(Object other) {
             if(valueThis == null) {
             	return false;
             }
-            if (valueThis instanceof JSONObject) {
-                if (!((JSONObject)valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (valueThis instanceof JSONArray) {
-                if (!((JSONArray)valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
-                	return false;
-                }
-            } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
-                if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
-                    return false;
-                }
-            } else if (!valueThis.equals(valueOther)) {
+            if (!isSimilar(valueThis, valueOther)) {
                 return false;
             }
         }
         return true;
     }
 
+    /**
+     * Convenience function; checks for object similarity
+     * @param valueThis
+     *      Initial object to compare
+     * @param valueOther
+     *      Comparison object
+     * @return  boolean
+     */
+    private boolean isSimilar(Object valueThis, Object valueOther) {
+        if (valueThis instanceof JSONObject) {
+            if (!((JSONObject)valueThis).similar(valueOther)) {
+                return false;
+            }
+        } else if (valueThis instanceof JSONArray) {
+            if (!((JSONArray)valueThis).similar(valueOther)) {
+                return false;
+            }
+        } else if (valueThis instanceof Number && valueOther instanceof Number) {
+            if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
+                return false;
+            }
+        } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+            if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
+                return false;
+            }
+        } else if (!valueThis.equals(valueOther)) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Produce a JSONObject by combining a JSONArray of names with the values of
      * this JSONArray.
@@ -1797,12 +1808,7 @@ public Writer write(Writer writer, int indentFactor, int indent)
             writer.write('[');
 
             if (length == 1) {
-                try {
-                    JSONObject.writeValue(writer, this.myArrayList.get(0),
-                            indentFactor, indent);
-                } catch (Exception e) {
-                    throw new JSONException("Unable to write JSONArray value at index: 0", e);
-                }
+                writeArrayAttempt(writer, indentFactor, indent, 0);
             } else if (length != 0) {
                 final int newIndent = indent + indentFactor;
 
@@ -1814,12 +1820,7 @@ public Writer write(Writer writer, int indentFactor, int indent)
                         writer.write('\n');
                     }
                     JSONObject.indent(writer, newIndent);
-                    try {
-                        JSONObject.writeValue(writer, this.myArrayList.get(i),
-                                indentFactor, newIndent);
-                    } catch (Exception e) {
-                        throw new JSONException("Unable to write JSONArray value at index: " + i, e);
-                    }
+                    writeArrayAttempt(writer, indentFactor, newIndent, i);
                     needsComma = true;
                 }
                 if (indentFactor > 0) {
@@ -1834,6 +1835,26 @@ public Writer write(Writer writer, int indentFactor, int indent)
         }
     }
 
+    /**
+     * Convenience function. Attempts to write
+     * @param writer
+     *            Writes the serialized JSON
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @param indent
+     *            The indentation of the top level.
+     * @param i
+     *            Index in array to be added
+     */
+    private void writeArrayAttempt(Writer writer, int indentFactor, int indent, int i) {
+        try {
+            JSONObject.writeValue(writer, this.myArrayList.get(i),
+                    indentFactor, indent);
+        } catch (Exception e) {
+            throw new JSONException("Unable to write JSONArray value at index: " + i, e);
+        }
+    }
+
     /**
      * Returns a java.util.List containing all of the elements in this array.
      * If an element in the array is a JSONArray or JSONObject it will also

From 1a2c50b40c410641d777d622e0de27b94da558cf Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Sat, 11 Oct 2025 19:48:33 +0530
Subject: [PATCH 075/106] changed string checking logic >> string.length() > 0
 to !string.isEmpty()

---
 src/main/java/org/json/CDL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index dd631bf8f..df527f461 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -183,7 +183,7 @@ public static String rowToString(JSONArray ja, char delimiter) {
             Object object = ja.opt(i);
             if (object != null) {
                 String string = object.toString();
-                if (string.length() > 0 && (string.indexOf(delimiter) >= 0 ||
+                if (!string.isEmpty() && (string.indexOf(delimiter) >= 0 ||
                         string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 ||
                         string.indexOf(0) >= 0 || string.charAt(0) == '"')) {
                     sb.append('"');

From 83a0e34be5bb572276873bdfd3f5b31da5bc4a48 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Tue, 9 Sep 2025 15:05:34 +1000
Subject: [PATCH 076/106] 1003: Implement JSONObject.fromJson() with unit tests

---
 src/main/java/org/json/JSONBuilder.java       | 122 ++++++++++
 src/main/java/org/json/JSONObject.java        | 146 ++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 216 ++++++++++++++++++
 3 files changed, 484 insertions(+)
 create mode 100644 src/main/java/org/json/JSONBuilder.java

diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
new file mode 100644
index 000000000..2ee99ca58
--- /dev/null
+++ b/src/main/java/org/json/JSONBuilder.java
@@ -0,0 +1,122 @@
+package org.json;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * The {@code JSONBuilder} class provides a configurable mechanism for
+ * defining how different Java types are handled during JSON serialization
+ * or deserialization.
+ *
+ * 
This class maintains two internal mappings:
+ * 
    
+ *   
  • A {@code classMapping} which maps Java classes to functions that convert
+ *   an input {@code Object} into an appropriate instance of that class.
    • 
+ *   
  • A {@code collectionMapping} which maps collection interfaces (like {@code List}, {@code Set}, {@code Map})
+ *   to supplier functions that create new instances of concrete implementations (e.g., {@code ArrayList} for {@code List}).
    • 
+ * 

+ *
+ * 
The mappings are initialized with default values for common primitive wrapper types
+ * and collection interfaces, but they can be modified at runtime using setter methods.
+ *
+ * 
This class is useful in custom JSON serialization/deserialization frameworks where
+ * type transformation and collection instantiation logic needs to be flexible and extensible.
+ */
+public class JSONBuilder {
+
+  /**
+   * A mapping from Java classes to functions that convert a generic {@code Object}
+   * into an instance of the target class.
+   *
+   * 
Examples of default mappings:
+   * 
    
+   *   
  • {@code int.class} or {@code Integer.class} -> Converts a {@code Number} to {@code int}
    • 
+   *   
  • {@code boolean.class} or {@code Boolean.class} -> Identity function
    • 
+   *   
  • {@code String.class} -> Identity function
    • 
+   * 

+   */
+  private static final Map, Function> classMapping = new HashMap<>();
+
+  /**
+   * A mapping from collection interface types to suppliers that produce
+   * instances of concrete collection implementations.
+   *
+   * 
Examples of default mappings:
+   * 
    
+   *   
  • {@code List.class} -> {@code ArrayList::new}
    • 
+   *   
  • {@code Set.class} -> {@code HashSet::new}
    • 
+   *   
  • {@code Map.class} -> {@code HashMap::new}
    • 
+   * 

+   */
+  private static final Map, Supplier> collectionMapping = new HashMap<>();
+  
+   // Static initializer block to populate default mappings
+   static {
+    classMapping.put(int.class, s -> ((Number) s).intValue());
+    classMapping.put(Integer.class, s -> ((Number) s).intValue());
+    classMapping.put(double.class, s -> ((Number) s).doubleValue());
+    classMapping.put(Double.class, s -> ((Number) s).doubleValue());
+    classMapping.put(float.class, s -> ((Number) s).floatValue());
+    classMapping.put(Float.class, s -> ((Number) s).floatValue());
+    classMapping.put(long.class, s -> ((Number) s).longValue());
+    classMapping.put(Long.class, s -> ((Number) s).longValue());
+    classMapping.put(boolean.class, s -> s);
+    classMapping.put(Boolean.class, s -> s);
+    classMapping.put(String.class, s -> s);
+
+    collectionMapping.put(List.class, ArrayList::new);
+    collectionMapping.put(Set.class, HashSet::new);
+    collectionMapping.put(Map.class, HashMap::new);
+   }
+
+  /**
+   * Returns the current class-to-function mapping used for type conversions.
+   *
+   * @return a map of classes to functions that convert an {@code Object} to that class
+   */
+   public Map, Function> getClassMapping() {
+     return this.classMapping;
+   }
+
+  /**
+   * Returns the current collection-to-supplier mapping used for instantiating collections.
+   *
+   * @return a map of collection interface types to suppliers of concrete implementations
+   */
+   public Map, Supplier> getCollectionMapping() {
+     return this.collectionMapping;
+   }
+
+  /**
+   * Adds or updates a type conversion function for a given class.
+   *
+   * 
This allows users to customize how objects are converted into specific types
+   * during processing (e.g., JSON deserialization).
+   *
+   * @param clazz the target class for which the conversion function is to be set
+   * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
+   */
+   public void setClassMapping(Class clazz, Function function) {
+     classMapping.put(clazz, function);
+   }
+
+  /**
+   * Adds or updates a supplier function for instantiating a collection type.
+   *
+   * 
This allows customization of which concrete implementation is used for
+   * interface types like {@code List}, {@code Set}, or {@code Map}.
+   *
+   * @param clazz the collection interface class (e.g., {@code List.class})
+   * @param function a supplier that creates a new instance of a concrete implementation
+   */
+   public void setCollectionMapping(Class clazz, Supplier function) {
+     collectionMapping.put(clazz, function);
+   }
+}
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 257eb1074..496a15af6 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -17,6 +17,10 @@
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
@@ -119,6 +123,12 @@ public String toString() {
      */
     static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
 
+
+    /**
+     * A Builder class for handling the conversion of JSON to Object.
+     */
+    private JSONBuilder builder;
+
     /**
      * The map where the JSONObject's properties are kept.
      */
@@ -212,6 +222,25 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
         }
     }
 
+    /**
+     * Construct a JSONObject with JSONBuilder for conversion from JSON to POJO
+     *
+     * @param builder builder option for json to POJO
+     */
+    public JSONObject(JSONBuilder builder) {
+      this();
+      this.builder = builder;
+    }
+
+    /**
+     * Method to set JSONBuilder.
+     *
+     * @param builder
+     */
+    public void setJSONBuilder(JSONBuilder builder) {
+      this.builder = builder;
+    }
+
     /**
      * Parses entirety of JSON object
      *
@@ -3207,4 +3236,121 @@ private static JSONException recursivelyDefinedObjectException(String key) {
             "JavaBean object contains recursively defined member variable of key " + quote(key)
         );
     }
+
+    /**
+     * Deserializes a JSON string into an instance of the specified class.
+     *
+     * 
This method attempts to map JSON key-value pairs to the corresponding fields
+     * of the given class. It supports basic data types including int, double, float,
+     * long, and boolean (as well as their boxed counterparts). The class must have a 
+     * no-argument constructor, and the field names in the class must match the keys 
+     * in the JSON string.
+     *
+     * @param clazz the class of the object to be returned
+     * @param  the type of the object
+     * @return an instance of type T with fields populated from the JSON string
+     */
+    public  T fromJson(Class clazz) {
+      try {
+        T obj = clazz.getDeclaredConstructor().newInstance();
+        if (this.builder == null) {
+          this.builder = new JSONBuilder();
+        }
+        Map, Function> classMapping = this.builder.getClassMapping();
+
+        for (Field field: clazz.getDeclaredFields()) {
+          field.setAccessible(true);
+          String fieldName = field.getName();
+          if (this.has(fieldName)) {
+            Object value = this.get(fieldName);
+            Class pojoClass = field.getType();
+            if (classMapping.containsKey(pojoClass)) {
+              field.set(obj, classMapping.get(pojoClass).apply(value));
+            } else {
+              if (value.getClass() == JSONObject.class) {
+                field.set(obj, fromJson((JSONObject) value, pojoClass));
+              } else if (value.getClass() == JSONArray.class) {
+                if (Collection.class.isAssignableFrom(pojoClass)) {
+
+                  Collection nestedCollection = fromJsonArray((JSONArray) value,
+                      (Class) pojoClass,
+                      field.getGenericType());
+
+                  field.set(obj, nestedCollection);
+                }
+              } 
+            }
+          }
+        }
+        return obj;
+      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+        throw new JSONException(e);
+      }
+    }
+
+    private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
+      try {
+        Map, Function> classMapping = this.builder.getClassMapping();
+        Map, Supplier> collectionMapping = this.builder.getCollectionMapping();
+        Collection collection = (Collection) (collectionMapping.containsKey(collectionType) ? 
+            collectionMapping.get(collectionType).get() 
+            : collectionType.getDeclaredConstructor().newInstance());
+
+
+        Class innerElementClass = null;
+        Type innerElementType = null;
+        if (elementType instanceof ParameterizedType) {
+          ParameterizedType pType = (ParameterizedType) elementType;
+          innerElementType = pType.getActualTypeArguments()[0];
+          innerElementClass = (innerElementType instanceof Class) ? 
+              (Class) innerElementType 
+            : (Class) ((ParameterizedType) innerElementType).getRawType();
+        } else {
+          innerElementClass = (Class) elementType;
+        }
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+          Object jsonElement = jsonArray.get(i);
+          if (classMapping.containsKey(innerElementClass)) {
+            collection.add((T) classMapping.get(innerElementClass).apply(jsonElement));
+          } else if (jsonElement.getClass() == JSONObject.class) {
+            collection.add((T) ((JSONObject) jsonElement).fromJson(innerElementClass));
+          } else if (jsonElement.getClass() == JSONArray.class) {
+            if (Collection.class.isAssignableFrom(innerElementClass)) {
+
+              Collection nestedCollection = fromJsonArray((JSONArray) jsonElement,
+                  innerElementClass,
+                  innerElementType);
+
+              collection.add((T) nestedCollection);
+            } else {
+              throw new JSONException("Expected collection type for nested JSONArray, but got: " + innerElementClass);
+            }
+          } else {
+            collection.add((T) jsonElement.toString());
+          }
+        }
+        return collection;
+      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+        throw new JSONException(e);
+      }
+    }
+
+    /**
+     * Deserializes a JSON string into an instance of the specified class.
+     *
+     * 
This method attempts to map JSON key-value pairs to the corresponding fields
+     * of the given class. It supports basic data types including int, double, float,
+     * long, and boolean (as well as their boxed counterparts). The class must have a 
+     * no-argument constructor, and the field names in the class must match the keys 
+     * in the JSON string.
+     *
+     * @param object JSONObject of internal class
+     * @param clazz the class of the object to be returned
+     * @param  the type of the object
+     * @return an instance of type T with fields populated from the JSON string
+     */
+    private  T fromJson(JSONObject object, Class clazz) {
+      return object.fromJson(clazz);
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 88c19c7dc..e3fb1d813 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -33,6 +33,7 @@
 import org.json.JSONPointerException;
 import org.json.JSONParserConfiguration;
 import org.json.JSONString;
+import org.json.JSONBuilder;
 import org.json.JSONTokener;
 import org.json.ParserConfiguration;
 import org.json.XML;
@@ -4095,4 +4096,219 @@ public void jsonObjectParseNullFieldsWithoutParserConfiguration() {
         assertTrue("JSONObject should be empty", jsonObject.isEmpty());
     }
 
+
+    @Test
+    public void jsonObjectParseFromJson_0() {
+      JSONObject object = new JSONObject();
+      object.put("number", 12);
+      object.put("name", "Alex");
+      object.put("longNumber", 1500000000L);
+      String jsonObject = object.toString();
+      CustomClass customClass = object.fromJson(CustomClass.class);
+      CustomClass compareClass = new CustomClass(12, "Alex", 1500000000L);
+      assertEquals(customClass, compareClass);
+    }
+
+    public static class CustomClass {
+      public int number;
+      public String name;
+      public Long longNumber;
+
+      public CustomClass() {}
+      public CustomClass (int number, String name, Long longNumber) {
+        this.number = number;
+        this.name = name;
+        this.longNumber = longNumber;
+      }
+      @Override
+      public boolean equals(Object o) {
+        CustomClass customClass = (CustomClass) o;
+
+        return (this.number == customClass.number
+          && this.name.equals(customClass.name)
+          && this.longNumber.equals(customClass.longNumber));
+      }
+    }
+
+    @Test
+    public void jsonObjectParseFromJson_1() {
+      JSONBuilder builder = new JSONBuilder();
+      builder.setClassMapping(java.time.LocalDateTime.class, s -> java.time.LocalDateTime.parse((String)s));
+      JSONObject object = new JSONObject(builder);
+      java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now();
+      object.put("localDate", localDateTime.toString());
+      CustomClassA customClassA = object.fromJson(CustomClassA.class);
+      CustomClassA compareClassClassA = new CustomClassA(localDateTime);
+      assertEquals(customClassA, compareClassClassA);
+    }
+
+    public static class CustomClassA {
+      public java.time.LocalDateTime localDate;
+
+      public CustomClassA() {}
+      public CustomClassA(java.time.LocalDateTime localDate) {
+        this.localDate = localDate;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassA classA = (CustomClassA) o;
+        return this.localDate.equals(classA.localDate);
+      }
+    }
+    
+    @Test
+    public void jsonObjectParseFromJson_2() {
+      JSONObject object = new JSONObject();
+      object.put("number", 12);
+
+      JSONObject classC = new JSONObject();
+      classC.put("stringName", "Alex");
+      classC.put("longNumber", 123456L);
+
+      object.put("classC", classC);
+
+      CustomClassB customClassB = object.fromJson(CustomClassB.class);
+      CustomClassC classCObject = new CustomClassC("Alex", 123456L);
+      CustomClassB compareClassB = new CustomClassB(12, classCObject);
+      assertEquals(customClassB, compareClassB);
+    }
+
+    public static class CustomClassB {
+      public int number;
+      public CustomClassC classC;
+
+      public CustomClassB() {}
+      public CustomClassB(int number, CustomClassC classC) {
+        this.number = number;
+        this.classC = classC;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassB classB = (CustomClassB) o;
+        return this.number == classB.number
+          && this.classC.equals(classB.classC);
+      }
+    }
+
+    public static class CustomClassC {
+      public String stringName;
+      public Long longNumber;
+
+      public CustomClassC() {}
+      public CustomClassC(String stringName, Long longNumber) {
+        this.stringName = stringName;
+        this.longNumber = longNumber;
+      }
+
+      public JSONObject toJSON() {
+        JSONObject object = new JSONObject();
+        object.put("stringName", this.stringName);
+        object.put("longNumber", this.longNumber);
+        return object;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassC classC = (CustomClassC) o;
+        return this.stringName.equals(classC.stringName)
+          && this.longNumber.equals(classC.longNumber);
+      }
+
+      @Override
+      public int hashCode() {
+        return java.util.Objects.hash(stringName, longNumber);
+      }
+    }
+
+    @Test
+    public void jsonObjectParseFromJson_3() {
+      JSONObject object = new JSONObject();
+      JSONArray array = new JSONArray();
+      array.put("test1");
+      array.put("test2");
+      array.put("test3");
+      object.put("stringList", array);
+
+      CustomClassD customClassD = object.fromJson(CustomClassD.class);
+      CustomClassD compareClassD = new CustomClassD(Arrays.asList("test1", "test2", "test3"));
+      assertEquals(customClassD, compareClassD);
+    }
+
+    public static class CustomClassD {
+      public List stringList;
+
+      public CustomClassD() {}
+      public CustomClassD(List stringList) {
+        this.stringList = stringList;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassD classD = (CustomClassD) o;
+        return this.stringList.equals(classD.stringList);
+      }
+    }
+
+    @Test
+    public void jsonObjectParseFromJson_4() {
+      JSONObject object = new JSONObject();
+      JSONArray array = new JSONArray();
+      array.put(new CustomClassC("test1", 1L).toJSON());
+      array.put(new CustomClassC("test2", 2L).toJSON());
+      object.put("listClassC", array);
+
+      CustomClassE customClassE = object.fromJson(CustomClassE.class);
+      CustomClassE compareClassE = new CustomClassE(java.util.Arrays.asList(
+      new CustomClassC("test1", 1L),
+      new CustomClassC("test2", 2L)));
+      assertEquals(customClassE, compareClassE);
+    }
+
+    public static class CustomClassE {
+      public List listClassC;
+
+      public CustomClassE() {}
+      public CustomClassE(List listClassC) {
+        this.listClassC = listClassC;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassE classE = (CustomClassE) o;
+        return this.listClassC.equals(classE.listClassC);
+      }
+    }
+
+    @Test
+    public void jsonObjectParseFromJson_5() {
+      JSONObject object = new JSONObject();
+      JSONArray array = new JSONArray();
+      array.put(Arrays.asList("A", "B", "C"));
+      array.put(Arrays.asList("D", "E"));
+      object.put("listOfString", array);
+
+      CustomClassF customClassF = object.fromJson(CustomClassF.class);
+      List> listOfString = new ArrayList<>();
+      listOfString.add(Arrays.asList("A", "B", "C"));
+      listOfString.add(Arrays.asList("D", "E"));
+      CustomClassF compareClassF = new CustomClassF(listOfString);
+      assertEquals(customClassF, compareClassF);
+    }
+
+    public static class CustomClassF {
+      public List> listOfString;
+
+      public CustomClassF() {}
+      public CustomClassF(List> listOfString) {
+        this.listOfString = listOfString;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        CustomClassF classF = (CustomClassF) o;
+        return this.listOfString.equals(classF.listOfString);
+      }
+    }
 }

From 7d28955216c9dde9e4617a0abb9b95def69680a0 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Tue, 9 Sep 2025 16:51:52 +1000
Subject: [PATCH 077/106] Updating to work with java 1.6

---
 src/main/java/org/json/InstanceCreator.java   |  16 +++
 src/main/java/org/json/JSONBuilder.java       | 104 +++++++++++++-----
 src/main/java/org/json/JSONObject.java        |  12 +-
 src/main/java/org/json/TypeConverter.java     |  18 +++
 .../java/org/json/junit/JSONObjectTest.java   |   7 +-
 5 files changed, 122 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/org/json/InstanceCreator.java
 create mode 100644 src/main/java/org/json/TypeConverter.java

diff --git a/src/main/java/org/json/InstanceCreator.java b/src/main/java/org/json/InstanceCreator.java
new file mode 100644
index 000000000..4836e23da
--- /dev/null
+++ b/src/main/java/org/json/InstanceCreator.java
@@ -0,0 +1,16 @@
+package org.json;
+
+/**
+ * Interface defining a creator that produces new instances of type {@code T}.
+ *
+ * @param  the type of instances created
+ */
+public interface InstanceCreator {
+
+  /**
+   * Creates a new instance of type {@code T}.
+   *
+   * @return a new instance of {@code T}
+   */
+  T create();
+}
diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
index 2ee99ca58..67c9b9418 100644
--- a/src/main/java/org/json/JSONBuilder.java
+++ b/src/main/java/org/json/JSONBuilder.java
@@ -7,8 +7,6 @@
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Collection;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * The {@code JSONBuilder} class provides a configurable mechanism for
@@ -42,38 +40,88 @@ public class JSONBuilder {
    *   
  • {@code String.class} -> Identity function
    • 
    * 
    */
-  private static final Map, Function> classMapping = new HashMap<>();
+  private static final Map,  TypeConverter> classMapping = new HashMap<>();
 
   /**
    * A mapping from collection interface types to suppliers that produce
    * instances of concrete collection implementations.
    *
-   * 
    Examples of default mappings:
-   * 
      
-   *   
    • {@code List.class} -> {@code ArrayList::new}
      • 
-   *   
    • {@code Set.class} -> {@code HashSet::new}
      • 
-   *   
    • {@code Map.class} -> {@code HashMap::new}
      • 
-   * 
    
    */
-  private static final Map, Supplier> collectionMapping = new HashMap<>();
+  private static final Map, InstanceCreator> collectionMapping = new HashMap<>();
   
    // Static initializer block to populate default mappings
    static {
-    classMapping.put(int.class, s -> ((Number) s).intValue());
-    classMapping.put(Integer.class, s -> ((Number) s).intValue());
-    classMapping.put(double.class, s -> ((Number) s).doubleValue());
-    classMapping.put(Double.class, s -> ((Number) s).doubleValue());
-    classMapping.put(float.class, s -> ((Number) s).floatValue());
-    classMapping.put(Float.class, s -> ((Number) s).floatValue());
-    classMapping.put(long.class, s -> ((Number) s).longValue());
-    classMapping.put(Long.class, s -> ((Number) s).longValue());
-    classMapping.put(boolean.class, s -> s);
-    classMapping.put(Boolean.class, s -> s);
-    classMapping.put(String.class, s -> s);
+    classMapping.put(int.class, new TypeConverter() {
+      public Integer convert(Object input) {
+        return ((Number) input).intValue();
+      }
+    });
+    classMapping.put(Integer.class, new TypeConverter() {
+      public Integer convert(Object input) {
+        return ((Number) input).intValue();
+      }
+    });
+    classMapping.put(double.class, new TypeConverter() {
+      public Double convert(Object input) {
+        return ((Number) input).doubleValue();
+      }
+    });
+    classMapping.put(Double.class, new TypeConverter() {
+      public Double convert(Object input) {
+        return ((Number) input).doubleValue();
+      }
+    });
+    classMapping.put(float.class, new TypeConverter() {
+      public Float convert(Object input) {
+        return ((Number) input).floatValue();
+      }
+    });
+    classMapping.put(Float.class, new TypeConverter() {
+      public Float convert(Object input) {
+        return ((Number) input).floatValue();
+      }
+    });
+    classMapping.put(long.class, new TypeConverter() {
+      public Long convert(Object input) {
+        return ((Number) input).longValue();
+      }
+    });
+    classMapping.put(Long.class, new TypeConverter() {
+      public Long convert(Object input) {
+        return ((Number) input).longValue();
+      }
+    });
+    classMapping.put(boolean.class, new TypeConverter() {
+      public Boolean convert(Object input) {
+        return (Boolean) input;
+      }
+    });
+    classMapping.put(Boolean.class, new TypeConverter() {
+      public Boolean convert(Object input) {
+        return (Boolean) input;
+      }
+    });
+    classMapping.put(String.class, new TypeConverter() {
+      public String convert(Object input) {
+        return (String) input;
+      }
+    });
 
-    collectionMapping.put(List.class, ArrayList::new);
-    collectionMapping.put(Set.class, HashSet::new);
-    collectionMapping.put(Map.class, HashMap::new);
+    collectionMapping.put(List.class, new InstanceCreator() {
+      public List create() {
+        return new ArrayList();
+      }
+    });
+    collectionMapping.put(Set.class, new InstanceCreator() {
+      public Set create() {
+        return new HashSet();
+      }
+    });
+    collectionMapping.put(Map.class, new InstanceCreator() {
+      public Map create() {
+        return new HashMap(); 
+      }
+    });
    }
 
   /**
@@ -81,7 +129,7 @@ public class JSONBuilder {
    *
    * @return a map of classes to functions that convert an {@code Object} to that class
    */
-   public Map, Function> getClassMapping() {
+   public Map, TypeConverter> getClassMapping() {
      return this.classMapping;
    }
 
@@ -90,7 +138,7 @@ public class JSONBuilder {
    *
    * @return a map of collection interface types to suppliers of concrete implementations
    */
-   public Map, Supplier> getCollectionMapping() {
+   public Map, InstanceCreator> getCollectionMapping() {
      return this.collectionMapping;
    }
 
@@ -103,7 +151,7 @@ public Map, Supplier> getCollectionMapping() {
    * @param clazz the target class for which the conversion function is to be set
    * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
    */
-   public void setClassMapping(Class clazz, Function function) {
+   public void setClassMapping(Class clazz, TypeConverter function) {
      classMapping.put(clazz, function);
    }
 
@@ -116,7 +164,7 @@ public void setClassMapping(Class clazz, Function function) {
    * @param clazz the collection interface class (e.g., {@code List.class})
    * @param function a supplier that creates a new instance of a concrete implementation
    */
-   public void setCollectionMapping(Class clazz, Supplier function) {
+   public void setCollectionMapping(Class clazz, InstanceCreator function) {
      collectionMapping.put(clazz, function);
    }
 }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 496a15af6..f5d2bd656 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3256,7 +3256,7 @@ public  T fromJson(Class clazz) {
         if (this.builder == null) {
           this.builder = new JSONBuilder();
         }
-        Map, Function> classMapping = this.builder.getClassMapping();
+        Map, TypeConverter> classMapping = this.builder.getClassMapping();
 
         for (Field field: clazz.getDeclaredFields()) {
           field.setAccessible(true);
@@ -3265,7 +3265,7 @@ public  T fromJson(Class clazz) {
             Object value = this.get(fieldName);
             Class pojoClass = field.getType();
             if (classMapping.containsKey(pojoClass)) {
-              field.set(obj, classMapping.get(pojoClass).apply(value));
+              field.set(obj, classMapping.get(pojoClass).convert(value));
             } else {
               if (value.getClass() == JSONObject.class) {
                 field.set(obj, fromJson((JSONObject) value, pojoClass));
@@ -3290,10 +3290,10 @@ public  T fromJson(Class clazz) {
 
     private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
       try {
-        Map, Function> classMapping = this.builder.getClassMapping();
-        Map, Supplier> collectionMapping = this.builder.getCollectionMapping();
+        Map, TypeConverter> classMapping = this.builder.getClassMapping();
+        Map, InstanceCreator> collectionMapping = this.builder.getCollectionMapping();
         Collection collection = (Collection) (collectionMapping.containsKey(collectionType) ? 
-            collectionMapping.get(collectionType).get() 
+            collectionMapping.get(collectionType).create() 
             : collectionType.getDeclaredConstructor().newInstance());
 
 
@@ -3312,7 +3312,7 @@ private  Collection fromJsonArray(JSONArray jsonArray, Class collection
         for (int i = 0; i < jsonArray.length(); i++) {
           Object jsonElement = jsonArray.get(i);
           if (classMapping.containsKey(innerElementClass)) {
-            collection.add((T) classMapping.get(innerElementClass).apply(jsonElement));
+            collection.add((T) classMapping.get(innerElementClass).convert(jsonElement));
           } else if (jsonElement.getClass() == JSONObject.class) {
             collection.add((T) ((JSONObject) jsonElement).fromJson(innerElementClass));
           } else if (jsonElement.getClass() == JSONArray.class) {
diff --git a/src/main/java/org/json/TypeConverter.java b/src/main/java/org/json/TypeConverter.java
new file mode 100644
index 000000000..dc07325e3
--- /dev/null
+++ b/src/main/java/org/json/TypeConverter.java
@@ -0,0 +1,18 @@
+package org.json;
+
+/**
+ * Interface defining a converter that converts an input {@code Object} 
+ * into an instance of a specific type {@code T}.
+ *
+ * @param  the target type to convert to
+ */
+public interface TypeConverter {
+
+  /**
+   * Converts the given input object to an instance of type {@code T}.
+   *
+   * @param input the object to convert
+   * @return the converted instance of type {@code T}
+   */
+  T convert(Object input);
+}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e3fb1d813..5a7aedb7c 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -37,6 +37,7 @@
 import org.json.JSONTokener;
 import org.json.ParserConfiguration;
 import org.json.XML;
+import org.json.TypeConverter;
 import org.json.junit.data.BrokenToString;
 import org.json.junit.data.ExceptionalBean;
 import org.json.junit.data.Fraction;
@@ -4133,7 +4134,11 @@ public boolean equals(Object o) {
     @Test
     public void jsonObjectParseFromJson_1() {
       JSONBuilder builder = new JSONBuilder();
-      builder.setClassMapping(java.time.LocalDateTime.class, s -> java.time.LocalDateTime.parse((String)s));
+      builder.setClassMapping(java.time.LocalDateTime.class, new TypeConverter() {
+        public java.time.LocalDateTime convert(Object input) {
+          return java.time.LocalDateTime.parse((String) input);
+        }
+      });
       JSONObject object = new JSONObject(builder);
       java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now();
       object.put("localDate", localDateTime.toString());

From ebc13d66853323ca439749560b5f883f2ca6b583 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Tue, 9 Sep 2025 17:01:30 +1000
Subject: [PATCH 078/106] Updating to work with java 1.6

---
 src/main/java/org/json/JSONBuilder.java |  4 ++--
 src/main/java/org/json/JSONObject.java  | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
index 67c9b9418..36f558049 100644
--- a/src/main/java/org/json/JSONBuilder.java
+++ b/src/main/java/org/json/JSONBuilder.java
@@ -40,14 +40,14 @@ public class JSONBuilder {
    *   
  • {@code String.class} -> Identity function
    • 
    * 
    */
-  private static final Map,  TypeConverter> classMapping = new HashMap<>();
+  private static final Map,  TypeConverter> classMapping = new HashMap,  TypeConverter>();
 
   /**
    * A mapping from collection interface types to suppliers that produce
    * instances of concrete collection implementations.
    *
    */
-  private static final Map, InstanceCreator> collectionMapping = new HashMap<>();
+  private static final Map, InstanceCreator> collectionMapping = new HashMap, InstanceCreator>();
   
    // Static initializer block to populate default mappings
    static {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index f5d2bd656..db4ec981c 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3283,7 +3283,13 @@ public  T fromJson(Class clazz) {
           }
         }
         return obj;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }
@@ -3331,7 +3337,13 @@ private  Collection fromJsonArray(JSONArray jsonArray, Class collection
           }
         }
         return collection;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }

From fbb6b3158eb186189a1b35e9902f24d0ad8cddbc Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Tue, 9 Sep 2025 17:02:24 +1000
Subject: [PATCH 079/106] Updating to work with java 1.6

---
 src/main/java/org/json/JSONObject.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index db4ec981c..f6e1d43ce 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -17,8 +17,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
-import java.util.function.Function;
-import java.util.function.Supplier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 

From 0521928463bbb65c4ca9c4921131469c28ec5308 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Sun, 28 Sep 2025 19:26:09 +1000
Subject: [PATCH 080/106] - Added implementation for Enum and Map - Moving the
 CustomClass to data folder. - Removing JSONBuilder.java - Moving the
 implementation of JSONBuilder to JSONObject.

---
 src/main/java/org/json/JSONBuilder.java       | 170 -------
 src/main/java/org/json/JSONObject.java        | 461 +++++++++++++-----
 .../java/org/json/junit/JSONObjectTest.java   | 178 ++-----
 .../java/org/json/junit/data/CustomClass.java |  23 +
 .../org/json/junit/data/CustomClassA.java     |  17 +
 .../org/json/junit/data/CustomClassB.java     |  20 +
 .../org/json/junit/data/CustomClassC.java     |  34 ++
 .../org/json/junit/data/CustomClassD.java     |  19 +
 .../org/json/junit/data/CustomClassE.java     |  18 +
 .../org/json/junit/data/CustomClassF.java     |  19 +
 .../org/json/junit/data/CustomClassG.java     |  18 +
 .../org/json/junit/data/CustomClassH.java     |  22 +
 .../org/json/junit/data/CustomClassI.java     |  12 +
 13 files changed, 586 insertions(+), 425 deletions(-)
 delete mode 100644 src/main/java/org/json/JSONBuilder.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClass.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassA.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassB.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassC.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassD.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassE.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassF.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassG.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassH.java
 create mode 100644 src/test/java/org/json/junit/data/CustomClassI.java

diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
deleted file mode 100644
index 36f558049..000000000
--- a/src/main/java/org/json/JSONBuilder.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.json;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
-
-/**
- * The {@code JSONBuilder} class provides a configurable mechanism for
- * defining how different Java types are handled during JSON serialization
- * or deserialization.
- *
- * 
    This class maintains two internal mappings:
- * 
      
- *   
    • A {@code classMapping} which maps Java classes to functions that convert
- *   an input {@code Object} into an appropriate instance of that class.
      • 
- *   
    • A {@code collectionMapping} which maps collection interfaces (like {@code List}, {@code Set}, {@code Map})
- *   to supplier functions that create new instances of concrete implementations (e.g., {@code ArrayList} for {@code List}).
      • 
- * 
    
- *
- * 
    The mappings are initialized with default values for common primitive wrapper types
- * and collection interfaces, but they can be modified at runtime using setter methods.
- *
- * 
    This class is useful in custom JSON serialization/deserialization frameworks where
- * type transformation and collection instantiation logic needs to be flexible and extensible.
- */
-public class JSONBuilder {
-
-  /**
-   * A mapping from Java classes to functions that convert a generic {@code Object}
-   * into an instance of the target class.
-   *
-   * 
    Examples of default mappings:
-   * 
      
-   *   
    • {@code int.class} or {@code Integer.class} -> Converts a {@code Number} to {@code int}
      • 
-   *   
    • {@code boolean.class} or {@code Boolean.class} -> Identity function
      • 
-   *   
    • {@code String.class} -> Identity function
      • 
-   * 
    
-   */
-  private static final Map,  TypeConverter> classMapping = new HashMap,  TypeConverter>();
-
-  /**
-   * A mapping from collection interface types to suppliers that produce
-   * instances of concrete collection implementations.
-   *
-   */
-  private static final Map, InstanceCreator> collectionMapping = new HashMap, InstanceCreator>();
-  
-   // Static initializer block to populate default mappings
-   static {
-    classMapping.put(int.class, new TypeConverter() {
-      public Integer convert(Object input) {
-        return ((Number) input).intValue();
-      }
-    });
-    classMapping.put(Integer.class, new TypeConverter() {
-      public Integer convert(Object input) {
-        return ((Number) input).intValue();
-      }
-    });
-    classMapping.put(double.class, new TypeConverter() {
-      public Double convert(Object input) {
-        return ((Number) input).doubleValue();
-      }
-    });
-    classMapping.put(Double.class, new TypeConverter() {
-      public Double convert(Object input) {
-        return ((Number) input).doubleValue();
-      }
-    });
-    classMapping.put(float.class, new TypeConverter() {
-      public Float convert(Object input) {
-        return ((Number) input).floatValue();
-      }
-    });
-    classMapping.put(Float.class, new TypeConverter() {
-      public Float convert(Object input) {
-        return ((Number) input).floatValue();
-      }
-    });
-    classMapping.put(long.class, new TypeConverter() {
-      public Long convert(Object input) {
-        return ((Number) input).longValue();
-      }
-    });
-    classMapping.put(Long.class, new TypeConverter() {
-      public Long convert(Object input) {
-        return ((Number) input).longValue();
-      }
-    });
-    classMapping.put(boolean.class, new TypeConverter() {
-      public Boolean convert(Object input) {
-        return (Boolean) input;
-      }
-    });
-    classMapping.put(Boolean.class, new TypeConverter() {
-      public Boolean convert(Object input) {
-        return (Boolean) input;
-      }
-    });
-    classMapping.put(String.class, new TypeConverter() {
-      public String convert(Object input) {
-        return (String) input;
-      }
-    });
-
-    collectionMapping.put(List.class, new InstanceCreator() {
-      public List create() {
-        return new ArrayList();
-      }
-    });
-    collectionMapping.put(Set.class, new InstanceCreator() {
-      public Set create() {
-        return new HashSet();
-      }
-    });
-    collectionMapping.put(Map.class, new InstanceCreator() {
-      public Map create() {
-        return new HashMap(); 
-      }
-    });
-   }
-
-  /**
-   * Returns the current class-to-function mapping used for type conversions.
-   *
-   * @return a map of classes to functions that convert an {@code Object} to that class
-   */
-   public Map, TypeConverter> getClassMapping() {
-     return this.classMapping;
-   }
-
-  /**
-   * Returns the current collection-to-supplier mapping used for instantiating collections.
-   *
-   * @return a map of collection interface types to suppliers of concrete implementations
-   */
-   public Map, InstanceCreator> getCollectionMapping() {
-     return this.collectionMapping;
-   }
-
-  /**
-   * Adds or updates a type conversion function for a given class.
-   *
-   * 
    This allows users to customize how objects are converted into specific types
-   * during processing (e.g., JSON deserialization).
-   *
-   * @param clazz the target class for which the conversion function is to be set
-   * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
-   */
-   public void setClassMapping(Class clazz, TypeConverter function) {
-     classMapping.put(clazz, function);
-   }
-
-  /**
-   * Adds or updates a supplier function for instantiating a collection type.
-   *
-   * 
    This allows customization of which concrete implementation is used for
-   * interface types like {@code List}, {@code Set}, or {@code Map}.
-   *
-   * @param clazz the collection interface class (e.g., {@code List.class})
-   * @param function a supplier that creates a new instance of a concrete implementation
-   */
-   public void setCollectionMapping(Class clazz, InstanceCreator function) {
-     collectionMapping.put(clazz, function);
-   }
-}
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index f6e1d43ce..52bd2fedc 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -19,6 +19,7 @@
 import java.util.regex.Pattern;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.GenericArrayType;
 
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
@@ -121,12 +122,6 @@ public String toString() {
      */
     static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
 
-
-    /**
-     * A Builder class for handling the conversion of JSON to Object.
-     */
-    private JSONBuilder builder;
-
     /**
      * The map where the JSONObject's properties are kept.
      */
@@ -162,6 +157,145 @@ public JSONObject() {
         this.map = new HashMap();
     }
 
+  /**
+   * A mapping from Java classes to functions that convert a generic {@code Object}
+   * into an instance of the target class.
+   *
+   * 
    Examples of default mappings:
+   * 
      
+   *   
    • {@code int.class} or {@code Integer.class} -> Converts a {@code Number} to {@code int}
      • 
+   *   
    • {@code boolean.class} or {@code Boolean.class} -> Identity function
      • 
+   *   
    • {@code String.class} -> Identity function
      • 
+   * 
    
+   */
+  private static final Map, TypeConverter> classMapping = new HashMap, TypeConverter>();
+
+  /**
+   * A mapping from collection interface types to suppliers that produce
+   * instances of concrete collection implementations.
+   *
+   */
+  private static final Map, InstanceCreator> collectionMapping = new HashMap, InstanceCreator>();
+
+   // Static initializer block to populate default mappings
+   static {
+    classMapping.put(int.class, new TypeConverter() {
+      public Integer convert(Object input) {
+        return ((Number) input).intValue();
+      }
+    });
+    classMapping.put(Integer.class, new TypeConverter() {
+      public Integer convert(Object input) {
+        return ((Number) input).intValue();
+      }
+    });
+    classMapping.put(double.class, new TypeConverter() {
+      public Double convert(Object input) {
+        return ((Number) input).doubleValue();
+      }
+    });
+    classMapping.put(Double.class, new TypeConverter() {
+      public Double convert(Object input) {
+        return ((Number) input).doubleValue();
+      }
+    });
+    classMapping.put(float.class, new TypeConverter() {
+      public Float convert(Object input) {
+        return ((Number) input).floatValue();
+      }
+    });
+    classMapping.put(Float.class, new TypeConverter() {
+      public Float convert(Object input) {
+        return ((Number) input).floatValue();
+      }
+    });
+    classMapping.put(long.class, new TypeConverter() {
+      public Long convert(Object input) {
+        return ((Number) input).longValue();
+      }
+    });
+    classMapping.put(Long.class, new TypeConverter() {
+      public Long convert(Object input) {
+        return ((Number) input).longValue();
+      }
+    });
+    classMapping.put(boolean.class, new TypeConverter() {
+      public Boolean convert(Object input) {
+        return (Boolean) input;
+      }
+    });
+    classMapping.put(Boolean.class, new TypeConverter() {
+      public Boolean convert(Object input) {
+        return (Boolean) input;
+      }
+    });
+    classMapping.put(String.class, new TypeConverter() {
+      public String convert(Object input) {
+        return (String) input;
+      }
+    });
+
+    collectionMapping.put(List.class, new InstanceCreator() {
+      public List create() {
+        return new ArrayList();
+      }
+    });
+    collectionMapping.put(Set.class, new InstanceCreator() {
+      public Set create() {
+        return new HashSet();
+      }
+    });
+    collectionMapping.put(Map.class, new InstanceCreator() {
+      public Map create() {
+        return new HashMap(); 
+      }
+    });
+   }
+
+  /**
+   * Returns the current class-to-function mapping used for type conversions.
+   *
+   * @return a map of classes to functions that convert an {@code Object} to that class
+   */
+   public Map, TypeConverter> getClassMapping() {
+     return this.classMapping;
+   }
+
+  /**
+   * Returns the current collection-to-supplier mapping used for instantiating collections.
+   *
+   * @return a map of collection interface types to suppliers of concrete implementations
+   */
+   public Map, InstanceCreator> getCollectionMapping() {
+     return collectionMapping;
+   }
+
+  /**
+   * Adds or updates a type conversion function for a given class.
+   *
+   * 
    This allows users to customize how objects are converted into specific types
+   * during processing (e.g., JSON deserialization).
+   *
+   * @param clazz the target class for which the conversion function is to be set
+   * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
+   */
+   public void setClassMapping(Class clazz, TypeConverter function) {
+     classMapping.put(clazz, function);
+   }
+
+  /**
+   * Adds or updates a supplier function for instantiating a collection type.
+   *
+   * 
    This allows customization of which concrete implementation is used for
+   * interface types like {@code List}, {@code Set}, or {@code Map}.
+   *
+   * @param clazz the collection interface class (e.g., {@code List.class})
+   * @param function a supplier that creates a new instance of a concrete implementation
+   */
+   public void setCollectionMapping(Class clazz, InstanceCreator function) {
+     collectionMapping.put(clazz, function);
+   }
+
     /**
      * Construct a JSONObject from a subset of another JSONObject. An array of
      * strings is used to identify the keys that should be copied. Missing keys
@@ -220,25 +354,6 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
         }
     }
 
-    /**
-     * Construct a JSONObject with JSONBuilder for conversion from JSON to POJO
-     *
-     * @param builder builder option for json to POJO
-     */
-    public JSONObject(JSONBuilder builder) {
-      this();
-      this.builder = builder;
-    }
-
-    /**
-     * Method to set JSONBuilder.
-     *
-     * @param builder
-     */
-    public void setJSONBuilder(JSONBuilder builder) {
-      this.builder = builder;
-    }
-
     /**
      * Parses entirety of JSON object
      *
@@ -3235,6 +3350,62 @@ private static JSONException recursivelyDefinedObjectException(String key) {
         );
     }
 
+    /**
+     * Helper method to extract the raw Class from Type.
+     */
+    private Class getRawType(Type type) {
+        if (type instanceof Class) {
+            return (Class) type;
+        } else if (type instanceof ParameterizedType) {
+            return (Class) ((ParameterizedType) type).getRawType();
+        } else if (type instanceof GenericArrayType) {
+            return Object[].class; // Simplified handling for arrays
+        }
+        return Object.class; // Fallback
+    }
+
+    /**
+     * Extracts the element Type for a Collection Type.
+     */
+    private Type getElementType(Type type) {
+        if (type instanceof ParameterizedType) {
+            Type[] args = ((ParameterizedType) type).getActualTypeArguments();
+            return args.length > 0 ? args[0] : Object.class;
+        }
+        return Object.class;
+    }
+
+    /**
+     * Extracts the key and value Types for a Map Type.
+     */
+    private Type[] getMapTypes(Type type) {
+        if (type instanceof ParameterizedType) {
+            Type[] args = ((ParameterizedType) type).getActualTypeArguments();
+            if (args.length == 2) {
+                return args;
+            }
+        }
+        return new Type[]{Object.class, Object.class}; // Default: String keys, Object values
+    }
+
+    /**
+     * Deserializes a JSON string into an instance of the specified class.
+     *
+     * 
    This method attempts to map JSON key-value pairs to the corresponding fields
+     * of the given class. It supports basic data types including int, double, float,
+     * long, and boolean (as well as their boxed counterparts). The class must have a 
+     * no-argument constructor, and the field names in the class must match the keys 
+     * in the JSON string.
+     *
+     * @param jsonString json in string format
+     * @param clazz the class of the object to be returned
+     * @return an instance of Object T with fields populated from the JSON string
+     */
+    public static  T fromJson(String jsonString, Class clazz) {
+        JSONObject jsonObject = new JSONObject(jsonString);
+        return jsonObject.fromJson(clazz);
+    }
+
     /**
      * Deserializes a JSON string into an instance of the specified class.
      *
@@ -3245,122 +3416,160 @@ private static JSONException recursivelyDefinedObjectException(String key) {
      * in the JSON string.
      *
      * @param clazz the class of the object to be returned
-     * @param  the type of the object
      * @return an instance of type T with fields populated from the JSON string
      */
+    @SuppressWarnings("unchecked")
     public  T fromJson(Class clazz) {
-      try {
-        T obj = clazz.getDeclaredConstructor().newInstance();
-        if (this.builder == null) {
-          this.builder = new JSONBuilder();
-        }
-        Map, TypeConverter> classMapping = this.builder.getClassMapping();
-
-        for (Field field: clazz.getDeclaredFields()) {
-          field.setAccessible(true);
-          String fieldName = field.getName();
-          if (this.has(fieldName)) {
-            Object value = this.get(fieldName);
-            Class pojoClass = field.getType();
-            if (classMapping.containsKey(pojoClass)) {
-              field.set(obj, classMapping.get(pojoClass).convert(value));
-            } else {
-              if (value.getClass() == JSONObject.class) {
-                field.set(obj, fromJson((JSONObject) value, pojoClass));
-              } else if (value.getClass() == JSONArray.class) {
-                if (Collection.class.isAssignableFrom(pojoClass)) {
-
-                  Collection nestedCollection = fromJsonArray((JSONArray) value,
-                      (Class) pojoClass,
-                      field.getGenericType());
-
-                  field.set(obj, nestedCollection);
+        try {
+            T obj = clazz.getDeclaredConstructor().newInstance();
+            for (Field field : clazz.getDeclaredFields()) {
+                field.setAccessible(true);
+                String fieldName = field.getName();
+                if (has(fieldName)) {
+                    Object value = get(fieldName);
+                    Type fieldType = field.getGenericType();
+                    Class rawType = getRawType(fieldType);
+                    if (classMapping.containsKey(rawType)) {
+                        field.set(obj, classMapping.get(rawType).convert(value));
+                    } else {
+                        Object convertedValue = convertValue(value, fieldType);
+                        field.set(obj, convertedValue);
+                    }
                 }
-              } 
             }
-          }
-        }
-        return obj;
-      } catch (NoSuchMethodException e) {
-        throw new JSONException(e);
-      } catch (InstantiationException e) {
-        throw new JSONException(e);
-      } catch (IllegalAccessException e) {
-        throw new JSONException(e);
-      } catch (InvocationTargetException e) {
-        throw new JSONException(e);
-      }
+            return obj;
+        } catch (NoSuchMethodException e) {
+            throw new JSONException("No no-arg constructor for class: " + clazz.getName(), e);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new JSONException("Failed to instantiate or set field for class: " + clazz.getName(), e);
+        }
     }
 
-    private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
-      try {
-        Map, TypeConverter> classMapping = this.builder.getClassMapping();
-        Map, InstanceCreator> collectionMapping = this.builder.getCollectionMapping();
-        Collection collection = (Collection) (collectionMapping.containsKey(collectionType) ? 
-            collectionMapping.get(collectionType).create() 
-            : collectionType.getDeclaredConstructor().newInstance());
-
-
-        Class innerElementClass = null;
-        Type innerElementType = null;
-        if (elementType instanceof ParameterizedType) {
-          ParameterizedType pType = (ParameterizedType) elementType;
-          innerElementType = pType.getActualTypeArguments()[0];
-          innerElementClass = (innerElementType instanceof Class) ? 
-              (Class) innerElementType 
-            : (Class) ((ParameterizedType) innerElementType).getRawType();
-        } else {
-          innerElementClass = (Class) elementType;
+    /**
+     * Handles non-primitive types (Enum, Map, JSONObject, JSONArray) during deserialization.
+     * Now dispatches to the recursive convertValue for consistency.
+     */
+    private  void handleNonDataTypes(Class pojoClass, Object value, Field field, T obj) throws JSONException {
+        try {
+            Type fieldType = field.getGenericType();
+            Object convertedValue = convertValue(value, fieldType);
+            field.set(obj, convertedValue);
+        } catch (IllegalAccessException e) {
+            throw new JSONException("Failed to set field: " + field.getName(), e);
+        }
+    }
+
+    /**
+     * Recursively converts a value to the target Type, handling nested generics for Collections and Maps.
+     */
+    private Object convertValue(Object value, Type targetType) throws JSONException {
+        if (value == null) {
+            return null;
         }
 
-        for (int i = 0; i < jsonArray.length(); i++) {
-          Object jsonElement = jsonArray.get(i);
-          if (classMapping.containsKey(innerElementClass)) {
-            collection.add((T) classMapping.get(innerElementClass).convert(jsonElement));
-          } else if (jsonElement.getClass() == JSONObject.class) {
-            collection.add((T) ((JSONObject) jsonElement).fromJson(innerElementClass));
-          } else if (jsonElement.getClass() == JSONArray.class) {
-            if (Collection.class.isAssignableFrom(innerElementClass)) {
+        Class rawType = getRawType(targetType);
+
+        // Direct assignment
+        if (rawType.isAssignableFrom(value.getClass())) {
+            return value;
+        }
 
-              Collection nestedCollection = fromJsonArray((JSONArray) jsonElement,
-                  innerElementClass,
-                  innerElementType);
+        // Use registered type converter
+        if (classMapping.containsKey(rawType)) {
+            return classMapping.get(rawType).convert(value);
+        }
 
-              collection.add((T) nestedCollection);
-            } else {
-              throw new JSONException("Expected collection type for nested JSONArray, but got: " + innerElementClass);
+        // Enum conversion
+        if (rawType.isEnum() && value instanceof String) {
+            return stringToEnum(rawType, (String) value);
+        }
+
+        // Collection handling (e.g., List>>)
+        if (Collection.class.isAssignableFrom(rawType)) {
+            if (value instanceof JSONArray) {
+                Type elementType = getElementType(targetType);
+                return fromJsonArray((JSONArray) value, rawType, elementType);
             }
-          } else {
-            collection.add((T) jsonElement.toString());
-          }
-        }
-        return collection;
-      } catch (NoSuchMethodException e) {
-        throw new JSONException(e);
-      } catch (InstantiationException e) {
-        throw new JSONException(e);
-      } catch (IllegalAccessException e) {
-        throw new JSONException(e);
-      } catch (InvocationTargetException e) {
-        throw new JSONException(e);
-      }
+        } 
+        // Map handling (e.g., Map>)
+        else if (Map.class.isAssignableFrom(rawType)) {
+            if (value instanceof JSONObject) {
+                Type[] mapTypes = getMapTypes(targetType);
+                Type keyType = mapTypes[0];
+                Type valueType = mapTypes[1];
+                return convertToMap((JSONObject) value, keyType, valueType, rawType);
+            }
+        } 
+        // POJO handling (including custom classes like Tuple)
+        else if (!rawType.isPrimitive() && !rawType.isEnum()) {
+            if (value instanceof JSONObject) {
+                // Recurse with the raw class for POJO deserialization
+                return ((JSONObject) value).fromJson(rawType);
+            }
+        }
+
+        // Fallback
+        return value.toString();
     }
 
     /**
-     * Deserializes a JSON string into an instance of the specified class.
-     *
-     * 
    This method attempts to map JSON key-value pairs to the corresponding fields
-     * of the given class. It supports basic data types including int, double, float,
-     * long, and boolean (as well as their boxed counterparts). The class must have a 
-     * no-argument constructor, and the field names in the class must match the keys 
-     * in the JSON string.
-     *
-     * @param object JSONObject of internal class
-     * @param clazz the class of the object to be returned
-     * @param  the type of the object
-     * @return an instance of type T with fields populated from the JSON string
+     * Converts a JSONObject to a Map with the specified generic key and value Types.
+     * Supports nested types via recursive convertValue.
      */
-    private  T fromJson(JSONObject object, Class clazz) {
-      return object.fromJson(clazz);
+    private Map convertToMap(JSONObject jsonMap, Type keyType, Type valueType, Class mapType) throws JSONException {
+        try {
+            InstanceCreator creator = collectionMapping.getOrDefault(mapType, () -> new HashMap<>());
+            @SuppressWarnings("unchecked")
+            Map map = (Map) creator.create();
+
+            for (Object keyObj : jsonMap.keySet()) {
+                String keyStr = (String) keyObj;
+                Object mapValue = jsonMap.get(keyStr);
+                // Convert key (e.g., String to Integer for Map)
+                Object convertedKey = convertValue(keyStr, keyType);
+                // Convert value recursively (handles nesting)
+                Object convertedValue = convertValue(mapValue, valueType);
+                map.put(convertedKey, convertedValue);
+            }
+            return map;
+        } catch (Exception e) {
+            throw new JSONException("Failed to convert JSONObject to Map: " + mapType.getName(), e);
+        }
     }
+
+    /**
+     * Converts a String to an Enum value.
+     */
+    private > E stringToEnum(Class enumClass, String value) throws JSONException {
+        try {
+            @SuppressWarnings("unchecked")
+            Method valueOfMethod = enumClass.getMethod("valueOf", String.class);
+            return (E) valueOfMethod.invoke(null, value);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            throw new JSONException("Failed to convert string to enum: " + value + " for " + enumClass.getName(), e);
+        }
+    }
+
+    /**
+     * Deserializes a JSONArray into a Collection, supporting nested generics.
+     * Uses recursive convertValue for elements.
+     */
+    @SuppressWarnings("unchecked")
+    private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
+        try {
+            InstanceCreator creator = collectionMapping.getOrDefault(collectionType, () -> new ArrayList<>());
+            Collection collection = (Collection) creator.create();
+
+            for (int i = 0; i < jsonArray.length(); i++) {
+                Object jsonElement = jsonArray.get(i);
+                // Recursively convert each element using the full element Type (handles nesting)
+                Object convertedValue = convertValue(jsonElement, elementType);
+                collection.add((T) convertedValue);
+            }
+            return collection;
+        } catch (Exception e) {
+            throw new JSONException("Failed to convert JSONArray to Collection: " + collectionType.getName(), e);
+        }
+    }
+
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 5a7aedb7c..f853d242a 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -33,7 +33,6 @@
 import org.json.JSONPointerException;
 import org.json.JSONParserConfiguration;
 import org.json.JSONString;
-import org.json.JSONBuilder;
 import org.json.JSONTokener;
 import org.json.ParserConfiguration;
 import org.json.XML;
@@ -58,6 +57,17 @@
 import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
+import org.json.junit.data.CustomClass;
+import org.json.junit.data.CustomClassA;
+import org.json.junit.data.CustomClassB;
+import org.json.junit.data.CustomClassC;
+import org.json.junit.data.CustomClassD;
+import org.json.junit.data.CustomClassE;
+import org.json.junit.data.CustomClassF;
+import org.json.junit.data.CustomClassG;
+import org.json.junit.data.CustomClassH;
+import org.json.junit.data.CustomClassI;
+import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -4110,36 +4120,14 @@ public void jsonObjectParseFromJson_0() {
       assertEquals(customClass, compareClass);
     }
 
-    public static class CustomClass {
-      public int number;
-      public String name;
-      public Long longNumber;
-
-      public CustomClass() {}
-      public CustomClass (int number, String name, Long longNumber) {
-        this.number = number;
-        this.name = name;
-        this.longNumber = longNumber;
-      }
-      @Override
-      public boolean equals(Object o) {
-        CustomClass customClass = (CustomClass) o;
-
-        return (this.number == customClass.number
-          && this.name.equals(customClass.name)
-          && this.longNumber.equals(customClass.longNumber));
-      }
-    }
-
     @Test
     public void jsonObjectParseFromJson_1() {
-      JSONBuilder builder = new JSONBuilder();
-      builder.setClassMapping(java.time.LocalDateTime.class, new TypeConverter() {
+      JSONObject object = new JSONObject();
+      object.setClassMapping(java.time.LocalDateTime.class, new TypeConverter() {
         public java.time.LocalDateTime convert(Object input) {
           return java.time.LocalDateTime.parse((String) input);
         }
       });
-      JSONObject object = new JSONObject(builder);
       java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now();
       object.put("localDate", localDateTime.toString());
       CustomClassA customClassA = object.fromJson(CustomClassA.class);
@@ -4147,21 +4135,6 @@ public java.time.LocalDateTime convert(Object input) {
       assertEquals(customClassA, compareClassClassA);
     }
 
-    public static class CustomClassA {
-      public java.time.LocalDateTime localDate;
-
-      public CustomClassA() {}
-      public CustomClassA(java.time.LocalDateTime localDate) {
-        this.localDate = localDate;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        CustomClassA classA = (CustomClassA) o;
-        return this.localDate.equals(classA.localDate);
-      }
-    }
-    
     @Test
     public void jsonObjectParseFromJson_2() {
       JSONObject object = new JSONObject();
@@ -4179,54 +4152,6 @@ public void jsonObjectParseFromJson_2() {
       assertEquals(customClassB, compareClassB);
     }
 
-    public static class CustomClassB {
-      public int number;
-      public CustomClassC classC;
-
-      public CustomClassB() {}
-      public CustomClassB(int number, CustomClassC classC) {
-        this.number = number;
-        this.classC = classC;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        CustomClassB classB = (CustomClassB) o;
-        return this.number == classB.number
-          && this.classC.equals(classB.classC);
-      }
-    }
-
-    public static class CustomClassC {
-      public String stringName;
-      public Long longNumber;
-
-      public CustomClassC() {}
-      public CustomClassC(String stringName, Long longNumber) {
-        this.stringName = stringName;
-        this.longNumber = longNumber;
-      }
-
-      public JSONObject toJSON() {
-        JSONObject object = new JSONObject();
-        object.put("stringName", this.stringName);
-        object.put("longNumber", this.longNumber);
-        return object;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        CustomClassC classC = (CustomClassC) o;
-        return this.stringName.equals(classC.stringName)
-          && this.longNumber.equals(classC.longNumber);
-      }
-
-      @Override
-      public int hashCode() {
-        return java.util.Objects.hash(stringName, longNumber);
-      }
-    }
-
     @Test
     public void jsonObjectParseFromJson_3() {
       JSONObject object = new JSONObject();
@@ -4241,21 +4166,6 @@ public void jsonObjectParseFromJson_3() {
       assertEquals(customClassD, compareClassD);
     }
 
-    public static class CustomClassD {
-      public List stringList;
-
-      public CustomClassD() {}
-      public CustomClassD(List stringList) {
-        this.stringList = stringList;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        CustomClassD classD = (CustomClassD) o;
-        return this.stringList.equals(classD.stringList);
-      }
-    }
-
     @Test
     public void jsonObjectParseFromJson_4() {
       JSONObject object = new JSONObject();
@@ -4271,21 +4181,6 @@ public void jsonObjectParseFromJson_4() {
       assertEquals(customClassE, compareClassE);
     }
 
-    public static class CustomClassE {
-      public List listClassC;
-
-      public CustomClassE() {}
-      public CustomClassE(List listClassC) {
-        this.listClassC = listClassC;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        CustomClassE classE = (CustomClassE) o;
-        return this.listClassC.equals(classE.listClassC);
-      }
-    }
-
     @Test
     public void jsonObjectParseFromJson_5() {
       JSONObject object = new JSONObject();
@@ -4302,18 +4197,43 @@ public void jsonObjectParseFromJson_5() {
       assertEquals(customClassF, compareClassF);
     }
 
-    public static class CustomClassF {
-      public List> listOfString;
+    @Test
+    public void jsonObjectParseFromJson_6() {
+        JSONObject object = new JSONObject();
+        Map dataList = new HashMap<>();
+        dataList.put("A", "Aa");
+        dataList.put("B", "Bb");
+        dataList.put("C", "Cc");
+        object.put("dataList", dataList);
+
+        CustomClassG customClassG = object.fromJson(CustomClassG.class);
+        CustomClassG compareClassG = new CustomClassG(dataList);
+        assertEquals(customClassG, compareClassG);
+    }
 
-      public CustomClassF() {}
-      public CustomClassF(List> listOfString) {
-        this.listOfString = listOfString;
-      }
+    @Test
+    public void jsonObjectParseFromJson_7() {
+        JSONObject object = new JSONObject();
+        Map> dataList = new HashMap<>();
+        dataList.put("1", Arrays.asList(1, 2, 3, 4));
+        dataList.put("2", Arrays.asList(2, 3, 4, 5));
+        object.put("integerMap", dataList);
 
-      @Override
-      public boolean equals(Object o) {
-        CustomClassF classF = (CustomClassF) o;
-        return this.listOfString.equals(classF.listOfString);
-      }
+        CustomClassH customClassH = object.fromJson(CustomClassH.class);
+        CustomClassH compareClassH = new CustomClassH(dataList);
+        assertEquals(customClassH.integerMap.toString(), compareClassH.integerMap.toString());
+    }
+
+    @Test
+    public void jsonObjectParseFromJson_8() {
+        JSONObject object = new JSONObject();
+        Map> dataList = new HashMap<>();
+        dataList.put("1", Collections.singletonMap("1", 1));
+        dataList.put("2", Collections.singletonMap("2", 2));
+        object.put("integerMap", dataList);
+
+        CustomClassI customClassI = object.fromJson(CustomClassI.class);
+        CustomClassI compareClassI = new CustomClassI(dataList);
+        assertEquals(customClassI.integerMap.toString(), compareClassI.integerMap.toString());
     }
 }
diff --git a/src/test/java/org/json/junit/data/CustomClass.java b/src/test/java/org/json/junit/data/CustomClass.java
new file mode 100644
index 000000000..9ae405597
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClass.java
@@ -0,0 +1,23 @@
+package org.json.junit.data;
+
+public class CustomClass {
+  public int number;
+  public String name;
+  public Long longNumber;
+
+  public CustomClass() {}
+  public CustomClass (int number, String name, Long longNumber) {
+    this.number = number;
+    this.name = name;
+    this.longNumber = longNumber;
+  }
+  @Override
+  public boolean equals(Object o) {
+    CustomClass customClass = (CustomClass) o;
+
+    return (this.number == customClass.number
+    && this.name.equals(customClass.name)
+    && this.longNumber.equals(customClass.longNumber));
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassA.java b/src/test/java/org/json/junit/data/CustomClassA.java
new file mode 100644
index 000000000..275e9a597
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassA.java
@@ -0,0 +1,17 @@
+package org.json.junit.data;
+
+public class CustomClassA {
+  public java.time.LocalDateTime localDate;
+
+  public CustomClassA() {}
+  public CustomClassA(java.time.LocalDateTime localDate) {
+    this.localDate = localDate;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassA classA = (CustomClassA) o;
+    return this.localDate.equals(classA.localDate);
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassB.java b/src/test/java/org/json/junit/data/CustomClassB.java
new file mode 100644
index 000000000..688997ec4
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassB.java
@@ -0,0 +1,20 @@
+package org.json.junit.data;
+
+public class CustomClassB {
+  public int number;
+  public CustomClassC classC;
+
+  public CustomClassB() {}
+  public CustomClassB(int number, CustomClassC classC) {
+    this.number = number;
+    this.classC = classC;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassB classB = (CustomClassB) o;
+    return this.number == classB.number
+    && this.classC.equals(classB.classC);
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassC.java b/src/test/java/org/json/junit/data/CustomClassC.java
new file mode 100644
index 000000000..9d20aa392
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassC.java
@@ -0,0 +1,34 @@
+package org.json.junit.data;
+
+import org.json.JSONObject;
+
+public class CustomClassC {
+  public String stringName;
+  public Long longNumber;
+
+  public CustomClassC() {}
+  public CustomClassC(String stringName, Long longNumber) {
+    this.stringName = stringName;
+    this.longNumber = longNumber;
+  }
+
+  public JSONObject toJSON() {
+    JSONObject object = new JSONObject();
+    object.put("stringName", this.stringName);
+    object.put("longNumber", this.longNumber);
+    return object;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassC classC = (CustomClassC) o;
+    return this.stringName.equals(classC.stringName)
+    && this.longNumber.equals(classC.longNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return java.util.Objects.hash(stringName, longNumber);
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassD.java b/src/test/java/org/json/junit/data/CustomClassD.java
new file mode 100644
index 000000000..4a858058c
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassD.java
@@ -0,0 +1,19 @@
+package org.json.junit.data;
+
+import java.util.List;
+
+public class CustomClassD {
+  public List stringList;
+
+  public CustomClassD() {}
+  public CustomClassD(List stringList) {
+    this.stringList = stringList;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassD classD = (CustomClassD) o;
+    return this.stringList.equals(classD.stringList);
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassE.java b/src/test/java/org/json/junit/data/CustomClassE.java
new file mode 100644
index 000000000..807dc5540
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassE.java
@@ -0,0 +1,18 @@
+package org.json.junit.data;
+
+import java.util.List;
+
+public class CustomClassE {
+  public List listClassC;
+
+  public CustomClassE() {}
+  public CustomClassE(List listClassC) {
+    this.listClassC = listClassC;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassE classE = (CustomClassE) o;
+    return this.listClassC.equals(classE.listClassC);
+  }
+}
diff --git a/src/test/java/org/json/junit/data/CustomClassF.java b/src/test/java/org/json/junit/data/CustomClassF.java
new file mode 100644
index 000000000..d85861036
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassF.java
@@ -0,0 +1,19 @@
+package org.json.junit.data;
+
+import java.util.List;
+
+public class CustomClassF {
+  public List> listOfString;
+
+  public CustomClassF() {}
+  public CustomClassF(List> listOfString) {
+    this.listOfString = listOfString;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    CustomClassF classF = (CustomClassF) o;
+    return this.listOfString.equals(classF.listOfString);
+  }
+}
+
diff --git a/src/test/java/org/json/junit/data/CustomClassG.java b/src/test/java/org/json/junit/data/CustomClassG.java
new file mode 100644
index 000000000..c8c9f5784
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassG.java
@@ -0,0 +1,18 @@
+package org.json.junit.data;
+
+import java.util.Map;
+
+public class CustomClassG {
+  public Map dataList;
+
+  public CustomClassG () {}
+  public CustomClassG (Map dataList) {
+    this.dataList = dataList;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    CustomClassG classG = (CustomClassG) object;
+    return this.dataList.equals(classG.dataList);
+  }
+}
diff --git a/src/test/java/org/json/junit/data/CustomClassH.java b/src/test/java/org/json/junit/data/CustomClassH.java
new file mode 100644
index 000000000..ce9b1af23
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassH.java
@@ -0,0 +1,22 @@
+package org.json.junit.data;
+
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+
+public class CustomClassH {
+  public Map> integerMap;
+
+  public CustomClassH() {}
+  public CustomClassH(Map> integerMap) {
+    this.integerMap = integerMap;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    CustomClassH classH = (CustomClassH) object;
+    return this.integerMap.size() == classH.integerMap.size()
+    && this.integerMap.keySet().equals(classH.integerMap.keySet())
+    && new ArrayList<>(this.integerMap.values()).equals(new ArrayList<>(classH.integerMap.values()));
+  }
+}
diff --git a/src/test/java/org/json/junit/data/CustomClassI.java b/src/test/java/org/json/junit/data/CustomClassI.java
new file mode 100644
index 000000000..bd7c4ed89
--- /dev/null
+++ b/src/test/java/org/json/junit/data/CustomClassI.java
@@ -0,0 +1,12 @@
+package org.json.junit.data;
+
+import java.util.Map;
+
+public class CustomClassI {
+    public Map> integerMap;
+
+    public CustomClassI() {}
+    public CustomClassI(Map> integerMap) {
+        this.integerMap = integerMap;
+    }
+}

From 7465da858c921a9e8e791bdaa54df35ea89697da Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Sun, 28 Sep 2025 19:38:52 +1000
Subject: [PATCH 081/106] - Updating for java 1.6 - Resolving Sonar cube
 issues.

---
 src/main/java/org/json/JSONObject.java        | 48 +++++++------------
 .../java/org/json/junit/JSONObjectTest.java   |  1 -
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 52bd2fedc..e1dfa4763 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -258,7 +258,7 @@ public Map create() {
    * @return a map of classes to functions that convert an {@code Object} to that class
    */
    public Map, TypeConverter> getClassMapping() {
-     return this.classMapping;
+     return classMapping;
    }
 
   /**
@@ -3445,20 +3445,6 @@ public  T fromJson(Class clazz) {
         }
     }
 
-    /**
-     * Handles non-primitive types (Enum, Map, JSONObject, JSONArray) during deserialization.
-     * Now dispatches to the recursive convertValue for consistency.
-     */
-    private  void handleNonDataTypes(Class pojoClass, Object value, Field field, T obj) throws JSONException {
-        try {
-            Type fieldType = field.getGenericType();
-            Object convertedValue = convertValue(value, fieldType);
-            field.set(obj, convertedValue);
-        } catch (IllegalAccessException e) {
-            throw new JSONException("Failed to set field: " + field.getName(), e);
-        }
-    }
-
     /**
      * Recursively converts a value to the target Type, handling nested generics for Collections and Maps.
      */
@@ -3492,20 +3478,16 @@ private Object convertValue(Object value, Type targetType) throws JSONException
             }
         } 
         // Map handling (e.g., Map>)
-        else if (Map.class.isAssignableFrom(rawType)) {
-            if (value instanceof JSONObject) {
-                Type[] mapTypes = getMapTypes(targetType);
-                Type keyType = mapTypes[0];
-                Type valueType = mapTypes[1];
-                return convertToMap((JSONObject) value, keyType, valueType, rawType);
-            }
+        else if (Map.class.isAssignableFrom(rawType) && value instanceof JSONObject) {
+            Type[] mapTypes = getMapTypes(targetType);
+            Type keyType = mapTypes[0];
+            Type valueType = mapTypes[1];
+            return convertToMap((JSONObject) value, keyType, valueType, rawType);
         } 
         // POJO handling (including custom classes like Tuple)
-        else if (!rawType.isPrimitive() && !rawType.isEnum()) {
-            if (value instanceof JSONObject) {
-                // Recurse with the raw class for POJO deserialization
-                return ((JSONObject) value).fromJson(rawType);
-            }
+        else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObject) {
+            // Recurse with the raw class for POJO deserialization
+            return ((JSONObject) value).fromJson(rawType);
         }
 
         // Fallback
@@ -3520,7 +3502,7 @@ else if (!rawType.isPrimitive() && !rawType.isEnum()) {
         try {
             InstanceCreator creator = collectionMapping.getOrDefault(mapType, () -> new HashMap<>());
             @SuppressWarnings("unchecked")
-            Map map = (Map) creator.create();
+            Map createdMap = (Map) creator.create();
 
             for (Object keyObj : jsonMap.keySet()) {
                 String keyStr = (String) keyObj;
@@ -3529,9 +3511,9 @@ else if (!rawType.isPrimitive() && !rawType.isEnum()) {
                 Object convertedKey = convertValue(keyStr, keyType);
                 // Convert value recursively (handles nesting)
                 Object convertedValue = convertValue(mapValue, valueType);
-                map.put(convertedKey, convertedValue);
+                createdMap.put(convertedKey, convertedValue);
             }
-            return map;
+            return createdMap;
         } catch (Exception e) {
             throw new JSONException("Failed to convert JSONObject to Map: " + mapType.getName(), e);
         }
@@ -3557,7 +3539,11 @@ private > E stringToEnum(Class enumClass, String value) thr
     @SuppressWarnings("unchecked")
     private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
         try {
-            InstanceCreator creator = collectionMapping.getOrDefault(collectionType, () -> new ArrayList<>());
+            InstanceCreator creator = collectionMapping.getOrDefault(collectionType, new InstanceCreator() {
+                    public List create() {
+                        return new ArrayList();
+                    }
+                });
             Collection collection = (Collection) creator.create();
 
             for (int i = 0; i < jsonArray.length(); i++) {
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index f853d242a..7b8154198 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4114,7 +4114,6 @@ public void jsonObjectParseFromJson_0() {
       object.put("number", 12);
       object.put("name", "Alex");
       object.put("longNumber", 1500000000L);
-      String jsonObject = object.toString();
       CustomClass customClass = object.fromJson(CustomClass.class);
       CustomClass compareClass = new CustomClass(12, "Alex", 1500000000L);
       assertEquals(customClass, compareClass);

From 9adea9e12de03ec5d548967e7d3bee3ca02f76d7 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Sun, 28 Sep 2025 20:15:14 +1000
Subject: [PATCH 082/106] Updating to work with java 1.6

---
 src/main/java/org/json/JSONObject.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index e1dfa4763..fa16c3aff 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3440,7 +3440,7 @@ public  T fromJson(Class clazz) {
             return obj;
         } catch (NoSuchMethodException e) {
             throw new JSONException("No no-arg constructor for class: " + clazz.getName(), e);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+        } catch (Exception e) {
             throw new JSONException("Failed to instantiate or set field for class: " + clazz.getName(), e);
         }
     }
@@ -3500,7 +3500,11 @@ else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObj
      */
     private Map convertToMap(JSONObject jsonMap, Type keyType, Type valueType, Class mapType) throws JSONException {
         try {
-            InstanceCreator creator = collectionMapping.getOrDefault(mapType, () -> new HashMap<>());
+            InstanceCreator creator = collectionMapping.get(mapType) != null ? collectionMapping.get(mapType) : new InstanceCreator() {
+                    public Map create() {
+                        return new HashMap();
+                    }
+                };
             @SuppressWarnings("unchecked")
             Map createdMap = (Map) creator.create();
 
@@ -3522,12 +3526,13 @@ else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObj
     /**
      * Converts a String to an Enum value.
      */
-    private > E stringToEnum(Class enumClass, String value) throws JSONException {
+    private  E stringToEnum(Class enumClass, String value) throws JSONException {
         try {
             @SuppressWarnings("unchecked")
-            Method valueOfMethod = enumClass.getMethod("valueOf", String.class);
+            Class enumType = (Class) enumClass;
+            Method valueOfMethod = enumType.getMethod("valueOf", String.class);
             return (E) valueOfMethod.invoke(null, value);
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+        } catch (Exception e) {
             throw new JSONException("Failed to convert string to enum: " + value + " for " + enumClass.getName(), e);
         }
     }
@@ -3539,11 +3544,11 @@ private > E stringToEnum(Class enumClass, String value) thr
     @SuppressWarnings("unchecked")
     private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
         try {
-            InstanceCreator creator = collectionMapping.getOrDefault(collectionType, new InstanceCreator() {
+            InstanceCreator creator = collectionMapping.get(collectionType) != null ? collectionMapping.get(collectionType) : new InstanceCreator() {
                     public List create() {
                         return new ArrayList();
                     }
-                });
+                };
             Collection collection = (Collection) creator.create();
 
             for (int i = 0; i < jsonArray.length(); i++) {

From c4c2beb87450bf382b25b928f1610b0ac22b5412 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Thu, 16 Oct 2025 14:19:19 +1100
Subject: [PATCH 083/106] Limiting implemetation by removing the new classes.

---
 src/main/java/org/json/InstanceCreator.java   |  2 +-
 src/main/java/org/json/JSONObject.java        | 54 ++++---------------
 src/main/java/org/json/TypeConverter.java     |  2 +-
 .../java/org/json/junit/JSONObjectTest.java   | 19 +++----
 .../org/json/junit/data/CustomClassA.java     | 10 ++--
 5 files changed, 25 insertions(+), 62 deletions(-)

diff --git a/src/main/java/org/json/InstanceCreator.java b/src/main/java/org/json/InstanceCreator.java
index 4836e23da..c8ae05c15 100644
--- a/src/main/java/org/json/InstanceCreator.java
+++ b/src/main/java/org/json/InstanceCreator.java
@@ -5,7 +5,7 @@
  *
  * @param  the type of instances created
  */
-public interface InstanceCreator {
+interface InstanceCreator {
 
   /**
    * Creates a new instance of type {@code T}.
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index fa16c3aff..e0c033718 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -234,6 +234,16 @@ public String convert(Object input) {
         return (String) input;
       }
     });
+    classMapping.put(BigDecimal.class, new TypeConverter() {
+      public BigDecimal convert(Object input) {
+          return new BigDecimal((String) input);
+      }
+    });
+    classMapping.put(BigInteger.class, new TypeConverter() {
+      public BigInteger convert(Object input) {
+          return new BigInteger((String) input);
+      }
+    });
 
     collectionMapping.put(List.class, new InstanceCreator() {
       public List create() {
@@ -252,50 +262,6 @@ public Map create() {
     });
    }
 
-  /**
-   * Returns the current class-to-function mapping used for type conversions.
-   *
-   * @return a map of classes to functions that convert an {@code Object} to that class
-   */
-   public Map, TypeConverter> getClassMapping() {
-     return classMapping;
-   }
-
-  /**
-   * Returns the current collection-to-supplier mapping used for instantiating collections.
-   *
-   * @return a map of collection interface types to suppliers of concrete implementations
-   */
-   public Map, InstanceCreator> getCollectionMapping() {
-     return collectionMapping;
-   }
-
-  /**
-   * Adds or updates a type conversion function for a given class.
-   *
-   * 
    This allows users to customize how objects are converted into specific types
-   * during processing (e.g., JSON deserialization).
-   *
-   * @param clazz the target class for which the conversion function is to be set
-   * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
-   */
-   public void setClassMapping(Class clazz, TypeConverter function) {
-     classMapping.put(clazz, function);
-   }
-
-  /**
-   * Adds or updates a supplier function for instantiating a collection type.
-   *
-   * 
    This allows customization of which concrete implementation is used for
-   * interface types like {@code List}, {@code Set}, or {@code Map}.
-   *
-   * @param clazz the collection interface class (e.g., {@code List.class})
-   * @param function a supplier that creates a new instance of a concrete implementation
-   */
-   public void setCollectionMapping(Class clazz, InstanceCreator function) {
-     collectionMapping.put(clazz, function);
-   }
-
     /**
      * Construct a JSONObject from a subset of another JSONObject. An array of
      * strings is used to identify the keys that should be copied. Missing keys
diff --git a/src/main/java/org/json/TypeConverter.java b/src/main/java/org/json/TypeConverter.java
index dc07325e3..d5b4eafe1 100644
--- a/src/main/java/org/json/TypeConverter.java
+++ b/src/main/java/org/json/TypeConverter.java
@@ -6,7 +6,7 @@
  *
  * @param  the target type to convert to
  */
-public interface TypeConverter {
+interface TypeConverter {
 
   /**
    * Converts the given input object to an instance of type {@code T}.
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 7b8154198..7ca6093b7 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -36,7 +36,6 @@
 import org.json.JSONTokener;
 import org.json.ParserConfiguration;
 import org.json.XML;
-import org.json.TypeConverter;
 import org.json.junit.data.BrokenToString;
 import org.json.junit.data.ExceptionalBean;
 import org.json.junit.data.Fraction;
@@ -4121,17 +4120,13 @@ public void jsonObjectParseFromJson_0() {
 
     @Test
     public void jsonObjectParseFromJson_1() {
-      JSONObject object = new JSONObject();
-      object.setClassMapping(java.time.LocalDateTime.class, new TypeConverter() {
-        public java.time.LocalDateTime convert(Object input) {
-          return java.time.LocalDateTime.parse((String) input);
-        }
-      });
-      java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now();
-      object.put("localDate", localDateTime.toString());
-      CustomClassA customClassA = object.fromJson(CustomClassA.class);
-      CustomClassA compareClassClassA = new CustomClassA(localDateTime);
-      assertEquals(customClassA, compareClassClassA);
+        JSONObject object = new JSONObject();
+
+        BigInteger largeInt = new BigInteger("123");
+        object.put("largeInt", largeInt.toString());
+        CustomClassA customClassA = object.fromJson(CustomClassA.class);
+        CustomClassA compareClassClassA = new CustomClassA(largeInt);
+        assertEquals(customClassA, compareClassClassA);
     }
 
     @Test
diff --git a/src/test/java/org/json/junit/data/CustomClassA.java b/src/test/java/org/json/junit/data/CustomClassA.java
index 275e9a597..08a99d333 100644
--- a/src/test/java/org/json/junit/data/CustomClassA.java
+++ b/src/test/java/org/json/junit/data/CustomClassA.java
@@ -1,17 +1,19 @@
 package org.json.junit.data;
 
+import java.math.BigInteger;
+
 public class CustomClassA {
-  public java.time.LocalDateTime localDate;
+  public BigInteger largeInt;
 
   public CustomClassA() {}
-  public CustomClassA(java.time.LocalDateTime localDate) {
-    this.localDate = localDate;
+  public CustomClassA(BigInteger largeInt) {
+    this.largeInt = largeInt;
   }
 
   @Override
   public boolean equals(Object o) {
     CustomClassA classA = (CustomClassA) o;
-    return this.localDate.equals(classA.localDate);
+    return this.largeInt.equals(classA.largeInt);
   }
 }
 

From a7c193090a36aecb78a80bfc150260a09f6ec338 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Thu, 16 Oct 2025 14:23:30 +1100
Subject: [PATCH 084/106] Updating docs

---
 src/main/java/org/json/JSONObject.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index e0c033718..e9e6ff5c0 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3376,13 +3376,20 @@ public static  T fromJson(String jsonString, Class clazz) {
      * Deserializes a JSON string into an instance of the specified class.
      *
      * 
    This method attempts to map JSON key-value pairs to the corresponding fields
-     * of the given class. It supports basic data types including int, double, float,
-     * long, and boolean (as well as their boxed counterparts). The class must have a 
-     * no-argument constructor, and the field names in the class must match the keys 
-     * in the JSON string.
+     * of the given class. It supports basic data types including {@code int}, {@code double},
+     * {@code float}, {@code long}, and {@code boolean}, as well as their boxed counterparts.
+     * The target class must have a no-argument constructor, and its field names must match
+     * the keys in the JSON string.
+     *
+     * 
    Note: Only classes that are explicitly supported and registered within
+     * the {@code JSONObject} context can be deserialized. If the provided class is not among those,
+     * this method will not be able to deserialize it. This ensures that only a limited and
+     * controlled set of types can be instantiated from JSON for safety and predictability.
      *
      * @param clazz the class of the object to be returned
-     * @return an instance of type T with fields populated from the JSON string
+     * @param  the type of the object
+     * @return an instance of type {@code T} with fields populated from the JSON string
+     * @throws IllegalArgumentException if the class is not supported for deserialization
      */
     @SuppressWarnings("unchecked")
     public  T fromJson(Class clazz) {

From 8ccf5d7525487226d7a2362f67a36ca606aa6614 Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Thu, 23 Oct 2025 17:32:07 +1100
Subject: [PATCH 085/106] Removing the interface classes and simplifying the
 implementation to use if else instead

---
 src/main/java/org/json/InstanceCreator.java |  16 --
 src/main/java/org/json/JSONObject.java      | 177 ++++++--------------
 src/main/java/org/json/TypeConverter.java   |  18 --
 3 files changed, 49 insertions(+), 162 deletions(-)
 delete mode 100644 src/main/java/org/json/InstanceCreator.java
 delete mode 100644 src/main/java/org/json/TypeConverter.java

diff --git a/src/main/java/org/json/InstanceCreator.java b/src/main/java/org/json/InstanceCreator.java
deleted file mode 100644
index c8ae05c15..000000000
--- a/src/main/java/org/json/InstanceCreator.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.json;
-
-/**
- * Interface defining a creator that produces new instances of type {@code T}.
- *
- * @param  the type of instances created
- */
-interface InstanceCreator {
-
-  /**
-   * Creates a new instance of type {@code T}.
-   *
-   * @return a new instance of {@code T}
-   */
-  T create();
-}
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index e9e6ff5c0..934a45454 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -157,111 +157,6 @@ public JSONObject() {
         this.map = new HashMap();
     }
 
-  /**
-   * A mapping from Java classes to functions that convert a generic {@code Object}
-   * into an instance of the target class.
-   *
-   * 
    Examples of default mappings:
-   * 
      
-   *   
    • {@code int.class} or {@code Integer.class} -> Converts a {@code Number} to {@code int}
      • 
-   *   
    • {@code boolean.class} or {@code Boolean.class} -> Identity function
      • 
-   *   
    • {@code String.class} -> Identity function
      • 
-   * 
    
-   */
-  private static final Map, TypeConverter> classMapping = new HashMap, TypeConverter>();
-
-  /**
-   * A mapping from collection interface types to suppliers that produce
-   * instances of concrete collection implementations.
-   *
-   */
-  private static final Map, InstanceCreator> collectionMapping = new HashMap, InstanceCreator>();
-
-   // Static initializer block to populate default mappings
-   static {
-    classMapping.put(int.class, new TypeConverter() {
-      public Integer convert(Object input) {
-        return ((Number) input).intValue();
-      }
-    });
-    classMapping.put(Integer.class, new TypeConverter() {
-      public Integer convert(Object input) {
-        return ((Number) input).intValue();
-      }
-    });
-    classMapping.put(double.class, new TypeConverter() {
-      public Double convert(Object input) {
-        return ((Number) input).doubleValue();
-      }
-    });
-    classMapping.put(Double.class, new TypeConverter() {
-      public Double convert(Object input) {
-        return ((Number) input).doubleValue();
-      }
-    });
-    classMapping.put(float.class, new TypeConverter() {
-      public Float convert(Object input) {
-        return ((Number) input).floatValue();
-      }
-    });
-    classMapping.put(Float.class, new TypeConverter() {
-      public Float convert(Object input) {
-        return ((Number) input).floatValue();
-      }
-    });
-    classMapping.put(long.class, new TypeConverter() {
-      public Long convert(Object input) {
-        return ((Number) input).longValue();
-      }
-    });
-    classMapping.put(Long.class, new TypeConverter() {
-      public Long convert(Object input) {
-        return ((Number) input).longValue();
-      }
-    });
-    classMapping.put(boolean.class, new TypeConverter() {
-      public Boolean convert(Object input) {
-        return (Boolean) input;
-      }
-    });
-    classMapping.put(Boolean.class, new TypeConverter() {
-      public Boolean convert(Object input) {
-        return (Boolean) input;
-      }
-    });
-    classMapping.put(String.class, new TypeConverter() {
-      public String convert(Object input) {
-        return (String) input;
-      }
-    });
-    classMapping.put(BigDecimal.class, new TypeConverter() {
-      public BigDecimal convert(Object input) {
-          return new BigDecimal((String) input);
-      }
-    });
-    classMapping.put(BigInteger.class, new TypeConverter() {
-      public BigInteger convert(Object input) {
-          return new BigInteger((String) input);
-      }
-    });
-
-    collectionMapping.put(List.class, new InstanceCreator() {
-      public List create() {
-        return new ArrayList();
-      }
-    });
-    collectionMapping.put(Set.class, new InstanceCreator() {
-      public Set create() {
-        return new HashSet();
-      }
-    });
-    collectionMapping.put(Map.class, new InstanceCreator() {
-      public Map create() {
-        return new HashMap(); 
-      }
-    });
-   }
-
     /**
      * Construct a JSONObject from a subset of another JSONObject. An array of
      * strings is used to identify the keys that should be copied. Missing keys
@@ -3359,8 +3254,8 @@ private Type[] getMapTypes(Type type) {
      *
      * 
    This method attempts to map JSON key-value pairs to the corresponding fields
      * of the given class. It supports basic data types including int, double, float,
-     * long, and boolean (as well as their boxed counterparts). The class must have a 
-     * no-argument constructor, and the field names in the class must match the keys 
+     * long, and boolean (as well as their boxed counterparts). The class must have a
+     * no-argument constructor, and the field names in the class must match the keys
      * in the JSON string.
      *
      * @param jsonString json in string format
@@ -3402,12 +3297,8 @@ public  T fromJson(Class clazz) {
                     Object value = get(fieldName);
                     Type fieldType = field.getGenericType();
                     Class rawType = getRawType(fieldType);
-                    if (classMapping.containsKey(rawType)) {
-                        field.set(obj, classMapping.get(rawType).convert(value));
-                    } else {
-                        Object convertedValue = convertValue(value, fieldType);
-                        field.set(obj, convertedValue);
-                    }
+                    Object convertedValue = convertValue(value, fieldType);
+                    field.set(obj, convertedValue);
                 }
             }
             return obj;
@@ -3433,9 +3324,22 @@ private Object convertValue(Object value, Type targetType) throws JSONException
             return value;
         }
 
-        // Use registered type converter
-        if (classMapping.containsKey(rawType)) {
-            return classMapping.get(rawType).convert(value);
+        if (rawType == int.class || rawType == Integer.class) {
+            return ((Number) value).intValue();
+        } else if (rawType == double.class || rawType == Double.class) {
+            return ((Number) value).doubleValue();
+        } else if (rawType == float.class || rawType == Float.class) {
+            return ((Number) value).floatValue();
+        } else if (rawType == long.class || rawType == Long.class) {
+            return ((Number) value).longValue();
+        } else if (rawType == boolean.class || rawType == Boolean.class) {
+            return (Boolean) value;
+        } else if (rawType == String.class) {
+            return (String) value;
+        } else if (rawType == BigDecimal.class) {
+            return new BigDecimal((String) value);
+        } else if (rawType == BigInteger.class) {
+            return new BigInteger((String) value);
         }
 
         // Enum conversion
@@ -3473,13 +3377,8 @@ else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObj
      */
     private Map convertToMap(JSONObject jsonMap, Type keyType, Type valueType, Class mapType) throws JSONException {
         try {
-            InstanceCreator creator = collectionMapping.get(mapType) != null ? collectionMapping.get(mapType) : new InstanceCreator() {
-                    public Map create() {
-                        return new HashMap();
-                    }
-                };
             @SuppressWarnings("unchecked")
-            Map createdMap = (Map) creator.create();
+            Map createdMap = new HashMap();
 
             for (Object keyObj : jsonMap.keySet()) {
                 String keyStr = (String) keyObj;
@@ -3517,12 +3416,7 @@ private  E stringToEnum(Class enumClass, String value) throws JSONExceptio
     @SuppressWarnings("unchecked")
     private  Collection fromJsonArray(JSONArray jsonArray, Class collectionType, Type elementType) throws JSONException {
         try {
-            InstanceCreator creator = collectionMapping.get(collectionType) != null ? collectionMapping.get(collectionType) : new InstanceCreator() {
-                    public List create() {
-                        return new ArrayList();
-                    }
-                };
-            Collection collection = (Collection) creator.create();
+            Collection collection = getCollection(collectionType);
 
             for (int i = 0; i < jsonArray.length(); i++) {
                 Object jsonElement = jsonArray.get(i);
@@ -3536,4 +3430,31 @@ public List create() {
         }
     }
 
+    /**
+    * Creates and returns a new instance of a supported {@link Collection} implementation
+    * based on the specified collection type.
+    * 
    
+    * This method currently supports the following collection types:
+    * 
      
+    *   
    • {@code List.class}
      • 
+    *   
    • {@code ArrayList.class}
      • 
+    *   
    • {@code Set.class}
      • 
+    *   
    • {@code HashSet.class}
      • 
+    * 
    
+    * If the provided type does not match any of the supported types, a {@link JSONException}
+    * is thrown.
+    *
+    * @param collectionType the {@link Class} object representing the desired collection type
+    * @return a new empty instance of the specified collection type
+    * @throws JSONException if the specified type is not a supported collection type
+    */
+    private Collection getCollection(Class collectionType) throws JSONException {
+        if (collectionType == List.class || collectionType == ArrayList.class) {
+            return new ArrayList<>();
+        } else if (collectionType == Set.class || collectionType == HashSet.class) {
+            return new HashSet<>();
+        } else {
+            throw new JSONException("Unsupported Collection type: " + collectionType.getName());
+        }
+    }
 }
diff --git a/src/main/java/org/json/TypeConverter.java b/src/main/java/org/json/TypeConverter.java
deleted file mode 100644
index d5b4eafe1..000000000
--- a/src/main/java/org/json/TypeConverter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.json;
-
-/**
- * Interface defining a converter that converts an input {@code Object} 
- * into an instance of a specific type {@code T}.
- *
- * @param  the target type to convert to
- */
-interface TypeConverter {
-
-  /**
-   * Converts the given input object to an instance of type {@code T}.
-   *
-   * @param input the object to convert
-   * @return the converted instance of type {@code T}
-   */
-  T convert(Object input);
-}

From f92f28162033ce16b42c207ad393a9898ddca23b Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Thu, 23 Oct 2025 17:33:37 +1100
Subject: [PATCH 086/106] Updating to work with java 1.6

---
 src/main/java/org/json/JSONObject.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 934a45454..1e90e69d7 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3450,9 +3450,9 @@ private  Collection fromJsonArray(JSONArray jsonArray, Class collection
     */
     private Collection getCollection(Class collectionType) throws JSONException {
         if (collectionType == List.class || collectionType == ArrayList.class) {
-            return new ArrayList<>();
+            return new ArrayList();
         } else if (collectionType == Set.class || collectionType == HashSet.class) {
-            return new HashSet<>();
+            return new HashSet();
         } else {
             throw new JSONException("Unsupported Collection type: " + collectionType.getName());
         }

From c13b57ca267b4d7aca11b0d93436e0d98332ca7a Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Thu, 23 Oct 2025 22:36:53 +0530
Subject: [PATCH 087/106] Made Cookie constructor to private.

---
 src/main/java/org/json/Cookie.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index ab908a304..11cc97a21 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -18,7 +18,7 @@ public class Cookie {
     /**
      * Constructs a new Cookie object.
      */
-    public Cookie() {
+    private Cookie() {
     }
 
     /**

From 1de42aa4fd2baa6f83a6bac6ef38d29fb8579999 Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Thu, 23 Oct 2025 22:37:00 +0530
Subject: [PATCH 088/106] Made CookieList constructor to private.

---
 src/main/java/org/json/CookieList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index d1064db52..e9dd4e652 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -14,7 +14,7 @@ public class CookieList {
     /**
      * Constructs a new CookieList object.
      */
-    public CookieList() {
+    private CookieList() {
     }
  
     /**

From 5dc1031d17d24ea3b49b3e37ce388acbd170dc2d Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Thu, 23 Oct 2025 22:38:01 +0530
Subject: [PATCH 089/106] Made JSONMl constructor to private and refactored
 ternary operations to independent statement in L243

---
 src/main/java/org/json/JSONML.java | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index 6e98c8267..6b702080f 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -17,9 +17,10 @@ public class JSONML {
     /**
      * Constructs a new JSONML object.
      */
-    public JSONML() {
+    private JSONML() {
     }
 
+
     /**
      * Parse XML values and store them in a JSONArray.
      * @param x       The XMLTokener containing the source string.
@@ -239,9 +240,21 @@ private static Object parse(
                 }
             } else {
                 if (ja != null) {
-                    ja.put(token instanceof String
-                        ? (config.isKeepStrings() ? XML.unescape((String)token) : XML.stringToValue((String)token))
-                        : token);
+                    Object value;
+
+                    if (token instanceof String) {
+                        String strToken = (String) token;
+                        if (config.isKeepStrings()) {
+                            value = XML.unescape(strToken);
+                        } else {
+                            value = XML.stringToValue(strToken);
+                        }
+                    } else {
+                        value = token;
+                    }
+
+                    ja.put(value);
+
                 }
             }
         }

From 2c6082a0a2828dc2083056b99696d6c4209e3869 Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Thu, 23 Oct 2025 22:50:12 +0530
Subject: [PATCH 090/106] Refactored stop conditions to be invariant by using
 while loop.

---
 src/main/java/org/json/Cookie.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 11cc97a21..630136e58 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -189,21 +189,30 @@ public static String toString(JSONObject jo) throws JSONException {
      * @return The unescaped string.
      */
     public static String unescape(String string) {
+        int i = 0;
         int length = string.length();
         StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; ++i) {
+
+        while (i < length) {
             char c = string.charAt(i);
             if (c == '+') {
-                c = ' ';
+                sb.append(' ');
+                i++;
             } else if (c == '%' && i + 2 < length) {
                 int d = JSONTokener.dehexchar(string.charAt(i + 1));
                 int e = JSONTokener.dehexchar(string.charAt(i + 2));
+
                 if (d >= 0 && e >= 0) {
-                    c = (char)(d * 16 + e);
-                    i += 2;
+                    sb.append((char)(d * 16 + e));
+                    i += 3;
+                } else {
+                    sb.append(c);
+                    i++;
                 }
+            } else {
+                sb.append(c);
+                i++;
             }
-            sb.append(c);
         }
         return sb.toString();
     }

From 6dd878d3c9262f51973fd167ca75421fc849d205 Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Fri, 24 Oct 2025 09:10:53 +0530
Subject: [PATCH 091/106] Deprecated public constructors instead of making it
 private.

---
 src/main/java/org/json/CDL.java        | 1 +
 src/main/java/org/json/Cookie.java     | 1 +
 src/main/java/org/json/CookieList.java | 3 ++-
 src/main/java/org/json/JSONML.java     | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index df527f461..c13b33352 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -23,6 +23,7 @@
  * @author JSON.org
  * @version 2016-05-01
  */
+@Deprecated
 public class CDL {
 
     /**
diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 630136e58..48b69e934 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -13,6 +13,7 @@
  * @author JSON.org
  * @version 2015-12-09
  */
+@Deprecated
 public class Cookie {
 
     /**
diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index e9dd4e652..293c20086 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -14,7 +14,8 @@ public class CookieList {
     /**
      * Constructs a new CookieList object.
      */
-    private CookieList() {
+    @Deprecated
+    public CookieList() {
     }
  
     /**
diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index 6b702080f..9415c3e65 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -17,7 +17,8 @@ public class JSONML {
     /**
      * Constructs a new JSONML object.
      */
-    private JSONML() {
+    @Deprecated
+    public JSONML() {
     }
 
 

From 39e8ead7cd39dd9bffeed0f58cccae615adffdcd Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Fri, 24 Oct 2025 09:37:46 +0530
Subject: [PATCH 092/106] Added java doc for deprecated decoration

---
 src/main/java/org/json/CDL.java        | 3 ++-
 src/main/java/org/json/Cookie.java     | 3 ++-
 src/main/java/org/json/CookieList.java | 1 +
 src/main/java/org/json/JSONML.java     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index c13b33352..f9afb8338 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -23,12 +23,13 @@
  * @author JSON.org
  * @version 2016-05-01
  */
-@Deprecated
 public class CDL {
 
     /**
      * Constructs a new CDL object.
+     * @deprecated (Utility class cannot be instantiated)
      */
+    @Deprecated
     public CDL() {
     }
 
diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 48b69e934..78dcc9302 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -13,12 +13,13 @@
  * @author JSON.org
  * @version 2015-12-09
  */
-@Deprecated
 public class Cookie {
 
     /**
      * Constructs a new Cookie object.
+     * @deprecated (Utility class cannot be instantiated)
      */
+    @Deprecated()
     private Cookie() {
     }
 
diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index 293c20086..ce47aee02 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -13,6 +13,7 @@ public class CookieList {
 
     /**
      * Constructs a new CookieList object.
+     * @deprecated (Utility class cannot be instantiated)
      */
     @Deprecated
     public CookieList() {
diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index 9415c3e65..bde97a680 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -16,6 +16,7 @@ public class JSONML {
 
     /**
      * Constructs a new JSONML object.
+     * @deprecated (Utility class cannot be instantiated)
      */
     @Deprecated
     public JSONML() {

From ac65ee0490d92f6b1854d22651a8e8ded8b7c5ec Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Sat, 25 Oct 2025 20:32:30 +0530
Subject: [PATCH 093/106] Revert "Refactored stop conditions to be invariant by
 using while loop."

This issue can be ignored
---
 src/main/java/org/json/Cookie.java | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 78dcc9302..fb2241a1e 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -191,30 +191,21 @@ public static String toString(JSONObject jo) throws JSONException {
      * @return The unescaped string.
      */
     public static String unescape(String string) {
-        int i = 0;
         int length = string.length();
         StringBuilder sb = new StringBuilder(length);
-
-        while (i < length) {
+        for (int i = 0; i < length; ++i) {
             char c = string.charAt(i);
             if (c == '+') {
-                sb.append(' ');
-                i++;
+                c = ' ';
             } else if (c == '%' && i + 2 < length) {
                 int d = JSONTokener.dehexchar(string.charAt(i + 1));
                 int e = JSONTokener.dehexchar(string.charAt(i + 2));
-
                 if (d >= 0 && e >= 0) {
-                    sb.append((char)(d * 16 + e));
-                    i += 3;
-                } else {
-                    sb.append(c);
-                    i++;
+                    c = (char)(d * 16 + e);
+                    i += 2;
                 }
-            } else {
-                sb.append(c);
-                i++;
             }
+            sb.append(c);
         }
         return sb.toString();
     }

From 0cdc5e517026b1fbc39bd11be3899f930d97d18b Mon Sep 17 00:00:00 2001
From: md-yasir 
Date: Sat, 25 Oct 2025 20:51:50 +0530
Subject: [PATCH 094/106] Reverted Constructor access to public

---
 src/main/java/org/json/Cookie.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index fb2241a1e..f7bab236f 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -20,7 +20,7 @@ public class Cookie {
      * @deprecated (Utility class cannot be instantiated)
      */
     @Deprecated()
-    private Cookie() {
+    public Cookie() {
     }
 
     /**

From 42800c208a969d9151af50b64dcdfb7a6cacd9df Mon Sep 17 00:00:00 2001
From: sk02241994 
Date: Tue, 28 Oct 2025 13:06:11 +1100
Subject: [PATCH 095/106] Updating to work with java 1.6

---
 src/main/java/org/json/JSONObject.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 1e90e69d7..4e8b42c97 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3296,7 +3296,6 @@ public  T fromJson(Class clazz) {
                 if (has(fieldName)) {
                     Object value = get(fieldName);
                     Type fieldType = field.getGenericType();
-                    Class rawType = getRawType(fieldType);
                     Object convertedValue = convertValue(value, fieldType);
                     field.set(obj, convertedValue);
                 }
@@ -3333,9 +3332,9 @@ private Object convertValue(Object value, Type targetType) throws JSONException
         } else if (rawType == long.class || rawType == Long.class) {
             return ((Number) value).longValue();
         } else if (rawType == boolean.class || rawType == Boolean.class) {
-            return (Boolean) value;
+            return value;
         } else if (rawType == String.class) {
-            return (String) value;
+            return value;
         } else if (rawType == BigDecimal.class) {
             return new BigDecimal((String) value);
         } else if (rawType == BigInteger.class) {
@@ -3353,14 +3352,14 @@ private Object convertValue(Object value, Type targetType) throws JSONException
                 Type elementType = getElementType(targetType);
                 return fromJsonArray((JSONArray) value, rawType, elementType);
             }
-        } 
+        }
         // Map handling (e.g., Map>)
         else if (Map.class.isAssignableFrom(rawType) && value instanceof JSONObject) {
             Type[] mapTypes = getMapTypes(targetType);
             Type keyType = mapTypes[0];
             Type valueType = mapTypes[1];
             return convertToMap((JSONObject) value, keyType, valueType, rawType);
-        } 
+        }
         // POJO handling (including custom classes like Tuple)
         else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObject) {
             // Recurse with the raw class for POJO deserialization

From 20f520000014ac6e65d0de5b7f7dad93c0e706ba Mon Sep 17 00:00:00 2001
From: AbhineshJha 
Date: Sat, 25 Oct 2025 14:16:55 +0530
Subject: [PATCH 096/106] Fix: Support Java record accessors in JSONObject

---
 src/main/java/org/json/JSONObject.java        | 29 ++++++++++++++++-
 .../java/org/json/junit/JSONObjectTest.java   | 20 ++++++++++++
 .../org/json/junit/data/PersonRecord.java     | 31 +++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/json/junit/data/PersonRecord.java

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 4e8b42c97..72c8453a1 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1885,7 +1885,8 @@ private static Method[] getMethods(Class klass) {
     }
 
     private static boolean isValidMethodName(String name) {
-        return !"getClass".equals(name) && !"getDeclaringClass".equals(name);
+        return !"getClass".equals(name) 
+                && !"getDeclaringClass".equals(name);
     }
 
     private static String getKeyNameFromMethod(Method method) {
@@ -1909,6 +1910,32 @@ private static String getKeyNameFromMethod(Method method) {
         } else if (name.startsWith("is") && name.length() > 2) {
             key = name.substring(2);
         } else {
+            // Check if this is a record-style accessor (no prefix)
+            // Record accessors are simple method names that match field names
+            // They must start with a lowercase letter and should be declared in the class itself
+            // (not inherited from Object, Enum, Number, or any java.* class)
+            // Also exclude common Object/bean method names
+            Class declaringClass = method.getDeclaringClass();
+            if (name.length() > 0 && Character.isLowerCase(name.charAt(0)) 
+                    && !"get".equals(name)
+                    && !"is".equals(name)
+                    && !"set".equals(name)
+                    && !"toString".equals(name)
+                    && !"hashCode".equals(name)
+                    && !"equals".equals(name)
+                    && !"clone".equals(name)
+                    && !"notify".equals(name)
+                    && !"notifyAll".equals(name)
+                    && !"wait".equals(name)
+                    && declaringClass != null
+                    && declaringClass != Object.class
+                    && !Enum.class.isAssignableFrom(declaringClass)
+                    && !Number.class.isAssignableFrom(declaringClass)
+                    && !declaringClass.getName().startsWith("java.")
+                    && !declaringClass.getName().startsWith("javax.")) {
+                // This is a record-style accessor - return the method name as-is
+                return name;
+            }
             return null;
         }
         // if the first letter in the key is not uppercase, then skip.
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 7ca6093b7..59a287448 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -51,6 +51,7 @@
 import org.json.junit.data.MyNumber;
 import org.json.junit.data.MyNumberContainer;
 import org.json.junit.data.MyPublicClass;
+import org.json.junit.data.PersonRecord;
 import org.json.junit.data.RecursiveBean;
 import org.json.junit.data.RecursiveBeanEquals;
 import org.json.junit.data.Singleton;
@@ -796,6 +797,25 @@ public void jsonObjectByBean3() {
         Util.checkJSONObjectMaps(jsonObject);
     }
 
+    /**
+     * JSONObject built from a Java record.
+     * Records use accessor methods without get/is prefixes (e.g., name() instead of getName()).
+     * This test verifies that JSONObject correctly handles record types.
+     */
+    @Test
+    public void jsonObjectByRecord() {
+        PersonRecord person = new PersonRecord("John Doe", 30, true);
+        JSONObject jsonObject = new JSONObject(person);
+        
+        // validate JSON
+        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
+        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
+        assertTrue("expected name field", "John Doe".equals(jsonObject.query("/name")));
+        assertTrue("expected age field", Integer.valueOf(30).equals(jsonObject.query("/age")));
+        assertTrue("expected active field", Boolean.TRUE.equals(jsonObject.query("/active")));
+        Util.checkJSONObjectMaps(jsonObject);
+    }
+
     /**
      * A bean is also an object. But in order to test the JSONObject
      * ctor that takes an object and a list of names, 
diff --git a/src/test/java/org/json/junit/data/PersonRecord.java b/src/test/java/org/json/junit/data/PersonRecord.java
new file mode 100644
index 000000000..891f1bb9e
--- /dev/null
+++ b/src/test/java/org/json/junit/data/PersonRecord.java
@@ -0,0 +1,31 @@
+package org.json.junit.data;
+
+/**
+ * A test class that mimics Java record accessor patterns.
+ * Records use accessor methods without get/is prefixes (e.g., name() instead of getName()).
+ * This class simulates that behavior to test JSONObject's handling of such methods.
+ */
+public class PersonRecord {
+    private final String name;
+    private final int age;
+    private final boolean active;
+
+    public PersonRecord(String name, int age, boolean active) {
+        this.name = name;
+        this.age = age;
+        this.active = active;
+    }
+
+    // Record-style accessors (no "get" or "is" prefix)
+    public String name() {
+        return name;
+    }
+
+    public int age() {
+        return age;
+    }
+
+    public boolean active() {
+        return active;
+    }
+}

From 2550c692cfe32d840431434f531a7735d438c17a Mon Sep 17 00:00:00 2001
From: AbhineshJha 
Date: Sat, 25 Oct 2025 14:30:25 +0530
Subject: [PATCH 097/106] Refactor: Extract isRecordStyleAccessor helper method

---
 src/main/java/org/json/JSONObject.java | 55 +++++++++++++++++---------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 72c8453a1..6b5c7b011 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1915,25 +1915,7 @@ private static String getKeyNameFromMethod(Method method) {
             // They must start with a lowercase letter and should be declared in the class itself
             // (not inherited from Object, Enum, Number, or any java.* class)
             // Also exclude common Object/bean method names
-            Class declaringClass = method.getDeclaringClass();
-            if (name.length() > 0 && Character.isLowerCase(name.charAt(0)) 
-                    && !"get".equals(name)
-                    && !"is".equals(name)
-                    && !"set".equals(name)
-                    && !"toString".equals(name)
-                    && !"hashCode".equals(name)
-                    && !"equals".equals(name)
-                    && !"clone".equals(name)
-                    && !"notify".equals(name)
-                    && !"notifyAll".equals(name)
-                    && !"wait".equals(name)
-                    && declaringClass != null
-                    && declaringClass != Object.class
-                    && !Enum.class.isAssignableFrom(declaringClass)
-                    && !Number.class.isAssignableFrom(declaringClass)
-                    && !declaringClass.getName().startsWith("java.")
-                    && !declaringClass.getName().startsWith("javax.")) {
-                // This is a record-style accessor - return the method name as-is
+            if (isRecordStyleAccessor(name, method)) {
                 return name;
             }
             return null;
@@ -1952,6 +1934,41 @@ private static String getKeyNameFromMethod(Method method) {
         return key;
     }
 
+    /**
+     * Checks if a method is a record-style accessor.
+     * Record accessors have lowercase names without get/is prefixes and are not inherited from standard Java classes.
+     * 
+     * @param methodName the name of the method
+     * @param method the method to check
+     * @return true if this is a record-style accessor, false otherwise
+     */
+    private static boolean isRecordStyleAccessor(String methodName, Method method) {
+        if (methodName.isEmpty() || !Character.isLowerCase(methodName.charAt(0))) {
+            return false;
+        }
+        
+        // Exclude common bean/Object method names
+        if ("get".equals(methodName) || "is".equals(methodName) || "set".equals(methodName)
+                || "toString".equals(methodName) || "hashCode".equals(methodName)
+                || "equals".equals(methodName) || "clone".equals(methodName)
+                || "notify".equals(methodName) || "notifyAll".equals(methodName)
+                || "wait".equals(methodName)) {
+            return false;
+        }
+        
+        Class declaringClass = method.getDeclaringClass();
+        if (declaringClass == null || declaringClass == Object.class) {
+            return false;
+        }
+        
+        if (Enum.class.isAssignableFrom(declaringClass) || Number.class.isAssignableFrom(declaringClass)) {
+            return false;
+        }
+        
+        String className = declaringClass.getName();
+        return !className.startsWith("java.") && !className.startsWith("javax.");
+    }
+
     /**
      * checks if the annotation is not null and the {@link JSONPropertyName#value()} is not null and is not empty.
      * @param annotation the annotation to check

From fd1eee9c3bd20f4ce63b6a1daae58f1c03b5e695 Mon Sep 17 00:00:00 2001
From: AbhineshJha 
Date: Sat, 25 Oct 2025 14:43:09 +0530
Subject: [PATCH 098/106] Add comprehensive edge case tests for record support

---
 .../org/json/junit/JSONObjectRecordTest.java  | 160 ++++++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   |  20 ---
 2 files changed, 160 insertions(+), 20 deletions(-)
 create mode 100644 src/test/java/org/json/junit/JSONObjectRecordTest.java

diff --git a/src/test/java/org/json/junit/JSONObjectRecordTest.java b/src/test/java/org/json/junit/JSONObjectRecordTest.java
new file mode 100644
index 000000000..84bd749f5
--- /dev/null
+++ b/src/test/java/org/json/junit/JSONObjectRecordTest.java
@@ -0,0 +1,160 @@
+package org.json.junit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.StringReader;
+
+import org.json.JSONObject;
+import org.json.junit.data.GenericBeanInt;
+import org.json.junit.data.MyEnum;
+import org.json.junit.data.MyNumber;
+import org.json.junit.data.PersonRecord;
+import org.junit.Test;
+
+/**
+ * Tests for JSONObject support of Java record-style classes.
+ * These tests verify that classes with accessor methods without get/is prefixes
+ * (like Java records) can be properly converted to JSONObject.
+ */
+public class JSONObjectRecordTest {
+
+    /**
+     * Tests that JSONObject can be created from a record-style class.
+     * Record-style classes use accessor methods like name() instead of getName().
+     */
+    @Test
+    public void jsonObjectByRecord() {
+        PersonRecord person = new PersonRecord("John Doe", 30, true);
+        JSONObject jsonObject = new JSONObject(person);
+        
+        assertEquals("Expected 3 keys in the JSONObject", 3, jsonObject.length());
+        assertEquals("John Doe", jsonObject.get("name"));
+        assertEquals(30, jsonObject.get("age"));
+        assertEquals(true, jsonObject.get("active"));
+    }
+    
+    /**
+     * Test that Object methods (toString, hashCode, equals, etc.) are not included
+     */
+    @Test
+    public void recordStyleClassShouldNotIncludeObjectMethods() {
+        PersonRecord person = new PersonRecord("Jane Doe", 25, false);
+        JSONObject jsonObject = new JSONObject(person);
+        
+        // Should NOT include Object methods
+        assertFalse("Should not include toString", jsonObject.has("toString"));
+        assertFalse("Should not include hashCode", jsonObject.has("hashCode"));
+        assertFalse("Should not include equals", jsonObject.has("equals"));
+        assertFalse("Should not include clone", jsonObject.has("clone"));
+        assertFalse("Should not include wait", jsonObject.has("wait"));
+        assertFalse("Should not include notify", jsonObject.has("notify"));
+        assertFalse("Should not include notifyAll", jsonObject.has("notifyAll"));
+        
+        // Should only have the 3 record fields
+        assertEquals("Should only have 3 fields", 3, jsonObject.length());
+    }
+    
+    /**
+     * Test that enum methods are not included when processing an enum
+     */
+    @Test
+    public void enumsShouldNotIncludeEnumMethods() {
+        MyEnum myEnum = MyEnum.VAL1;
+        JSONObject jsonObject = new JSONObject(myEnum);
+        
+        // Should NOT include enum-specific methods like name(), ordinal(), values(), valueOf()
+        assertFalse("Should not include name method", jsonObject.has("name"));
+        assertFalse("Should not include ordinal method", jsonObject.has("ordinal"));
+        assertFalse("Should not include declaringClass", jsonObject.has("declaringClass"));
+        
+        // Enums should still work with traditional getters if they have any
+        // But should not pick up the built-in enum methods
+    }
+    
+    /**
+     * Test that Number subclass methods are not included
+     */
+    @Test
+    public void numberSubclassesShouldNotIncludeNumberMethods() {
+        MyNumber myNumber = new MyNumber();
+        JSONObject jsonObject = new JSONObject(myNumber);
+        
+        // Should NOT include Number methods like intValue(), longValue(), etc.
+        assertFalse("Should not include intValue", jsonObject.has("intValue"));
+        assertFalse("Should not include longValue", jsonObject.has("longValue"));
+        assertFalse("Should not include doubleValue", jsonObject.has("doubleValue"));
+        assertFalse("Should not include floatValue", jsonObject.has("floatValue"));
+        
+        // Should include the actual getter
+        assertTrue("Should include number", jsonObject.has("number"));
+        assertEquals("Should have 1 field", 1, jsonObject.length());
+    }
+    
+    /**
+     * Test that generic bean with get() and is() methods works correctly
+     */
+    @Test
+    public void genericBeanWithGetAndIsMethodsShouldNotBeIncluded() {
+        GenericBeanInt bean = new GenericBeanInt(42);
+        JSONObject jsonObject = new JSONObject(bean);
+        
+        // Should NOT include standalone get() or is() methods
+        assertFalse("Should not include standalone 'get' method", jsonObject.has("get"));
+        assertFalse("Should not include standalone 'is' method", jsonObject.has("is"));
+        
+        // Should include the actual getters
+        assertTrue("Should include genericValue field", jsonObject.has("genericValue"));
+        assertTrue("Should include a field", jsonObject.has("a"));
+    }
+    
+    /**
+     * Test that java.* classes don't have their methods picked up
+     */
+    @Test
+    public void javaLibraryClassesShouldNotIncludeTheirMethods() {
+        StringReader reader = new StringReader("test");
+        JSONObject jsonObject = new JSONObject(reader);
+        
+        // Should NOT include java.io.Reader methods like read(), reset(), etc.
+        assertFalse("Should not include read method", jsonObject.has("read"));
+        assertFalse("Should not include reset method", jsonObject.has("reset"));
+        assertFalse("Should not include ready method", jsonObject.has("ready"));
+        assertFalse("Should not include skip method", jsonObject.has("skip"));
+        
+        // Reader should produce empty JSONObject (no valid properties)
+        assertEquals("Reader should produce empty JSON", 0, jsonObject.length());
+    }
+    
+    /**
+     * Test mixed case - object with both traditional getters and record-style accessors
+     */
+    @Test
+    public void mixedGettersAndRecordStyleAccessors() {
+        // PersonRecord has record-style accessors: name(), age(), active()
+        // These should all be included
+        PersonRecord person = new PersonRecord("Mixed Test", 40, true);
+        JSONObject jsonObject = new JSONObject(person);
+        
+        assertEquals("Should have all 3 record-style fields", 3, jsonObject.length());
+        assertTrue("Should include name", jsonObject.has("name"));
+        assertTrue("Should include age", jsonObject.has("age"));
+        assertTrue("Should include active", jsonObject.has("active"));
+    }
+    
+    /**
+     * Test that methods starting with uppercase are not included (not valid record accessors)
+     */
+    @Test
+    public void methodsStartingWithUppercaseShouldNotBeIncluded() {
+        PersonRecord person = new PersonRecord("Test", 50, false);
+        JSONObject jsonObject = new JSONObject(person);
+        
+        // Record-style accessors must start with lowercase
+        // Methods like Name(), Age() (uppercase) should not be picked up
+        // Our PersonRecord only has lowercase accessors, which is correct
+        
+        assertEquals("Should only have lowercase accessors", 3, jsonObject.length());
+    }
+}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 59a287448..7ca6093b7 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -51,7 +51,6 @@
 import org.json.junit.data.MyNumber;
 import org.json.junit.data.MyNumberContainer;
 import org.json.junit.data.MyPublicClass;
-import org.json.junit.data.PersonRecord;
 import org.json.junit.data.RecursiveBean;
 import org.json.junit.data.RecursiveBeanEquals;
 import org.json.junit.data.Singleton;
@@ -797,25 +796,6 @@ public void jsonObjectByBean3() {
         Util.checkJSONObjectMaps(jsonObject);
     }
 
-    /**
-     * JSONObject built from a Java record.
-     * Records use accessor methods without get/is prefixes (e.g., name() instead of getName()).
-     * This test verifies that JSONObject correctly handles record types.
-     */
-    @Test
-    public void jsonObjectByRecord() {
-        PersonRecord person = new PersonRecord("John Doe", 30, true);
-        JSONObject jsonObject = new JSONObject(person);
-        
-        // validate JSON
-        Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
-        assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3);
-        assertTrue("expected name field", "John Doe".equals(jsonObject.query("/name")));
-        assertTrue("expected age field", Integer.valueOf(30).equals(jsonObject.query("/age")));
-        assertTrue("expected active field", Boolean.TRUE.equals(jsonObject.query("/active")));
-        Util.checkJSONObjectMaps(jsonObject);
-    }
-
     /**
      * A bean is also an object. But in order to test the JSONObject
      * ctor that takes an object and a list of names, 

From f2acf8af6932ad8a46339b8024ee009919c1b7cf Mon Sep 17 00:00:00 2001
From: AbhineshJha 
Date: Thu, 30 Oct 2025 20:15:42 +0530
Subject: [PATCH 099/106] Optimize method name exclusion using Set lookup
 instead of multiple equals checks

---
 src/main/java/org/json/JSONObject.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 6b5c7b011..3e3778d4b 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -144,6 +144,18 @@ public Class getMapType() {
      */
     public static final Object NULL = new Null();
 
+    /**
+     * Set of method names that should be excluded when identifying record-style accessors.
+     * These are common bean/Object method names that are not property accessors.
+     */
+    private static final Set EXCLUDED_RECORD_METHOD_NAMES = Collections.unmodifiableSet(
+            new HashSet(Arrays.asList(
+                    "get", "is", "set",
+                    "toString", "hashCode", "equals", "clone",
+                    "notify", "notifyAll", "wait"
+            ))
+    );
+
     /**
      * Construct an empty JSONObject.
      */
@@ -1948,11 +1960,7 @@ private static boolean isRecordStyleAccessor(String methodName, Method method) {
         }
         
         // Exclude common bean/Object method names
-        if ("get".equals(methodName) || "is".equals(methodName) || "set".equals(methodName)
-                || "toString".equals(methodName) || "hashCode".equals(methodName)
-                || "equals".equals(methodName) || "clone".equals(methodName)
-                || "notify".equals(methodName) || "notifyAll".equals(methodName)
-                || "wait".equals(methodName)) {
+        if (EXCLUDED_RECORD_METHOD_NAMES.contains(methodName)) {
             return false;
         }
         

From 8f3b0f1c139ded2180261f200f33bd2e40f65c27 Mon Sep 17 00:00:00 2001
From: AbhineshJha 
Date: Sun, 2 Nov 2025 22:32:44 +0530
Subject: [PATCH 100/106] Add runtime record detection for backward
 compatibility

---
 src/main/java/org/json/JSONObject.java        | 39 +++++++++++++++----
 .../org/json/junit/JSONObjectRecordTest.java  | 25 ++++++++++--
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 3e3778d4b..db2c2aac7 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1835,11 +1835,14 @@ private void populateMap(Object bean, Set objectsRecord, JSONParserConfi
         Class klass = bean.getClass();
 
         // If klass is a System class then set includeSuperClass to false.
+        
+        // Check if this is a Java record type
+        boolean isRecord = isRecordType(klass);
 
         Method[] methods = getMethods(klass);
         for (final Method method : methods) {
             if (isValidMethod(method)) {
-                final String key = getKeyNameFromMethod(method);
+                final String key = getKeyNameFromMethod(method, isRecord);
                 if (key != null && !key.isEmpty()) {
                     processMethod(bean, objectsRecord, jsonParserConfiguration, method, key);
                 }
@@ -1885,6 +1888,29 @@ private void processMethod(Object bean, Set objectsRecord, JSONParserCon
         }
     }
 
+    /**
+     * Checks if a class is a Java record type.
+     * This uses reflection to check for the isRecord() method which was introduced in Java 16.
+     * This approach works even when running on Java 6+ JVM.
+     * 
+     * @param klass the class to check
+     * @return true if the class is a record type, false otherwise
+     */
+    private static boolean isRecordType(Class klass) {
+        try {
+            // Use reflection to check if Class has an isRecord() method (Java 16+)
+            // This allows the code to compile on Java 6 while still detecting records at runtime
+            Method isRecordMethod = Class.class.getMethod("isRecord");
+            return (Boolean) isRecordMethod.invoke(klass);
+        } catch (NoSuchMethodException e) {
+            // isRecord() method doesn't exist - we're on Java < 16
+            return false;
+        } catch (Exception e) {
+            // Any other reflection error - assume not a record
+            return false;
+        }
+    }
+
     /**
      * This is a convenience method to simplify populate maps
      * @param klass the name of the object being checked
@@ -1901,7 +1927,7 @@ private static boolean isValidMethodName(String name) {
                 && !"getDeclaringClass".equals(name);
     }
 
-    private static String getKeyNameFromMethod(Method method) {
+    private static String getKeyNameFromMethod(Method method, boolean isRecordType) {
         final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
         if (ignoreDepth > 0) {
             final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);
@@ -1922,12 +1948,9 @@ private static String getKeyNameFromMethod(Method method) {
         } else if (name.startsWith("is") && name.length() > 2) {
             key = name.substring(2);
         } else {
-            // Check if this is a record-style accessor (no prefix)
-            // Record accessors are simple method names that match field names
-            // They must start with a lowercase letter and should be declared in the class itself
-            // (not inherited from Object, Enum, Number, or any java.* class)
-            // Also exclude common Object/bean method names
-            if (isRecordStyleAccessor(name, method)) {
+            // Only check for record-style accessors if this is actually a record type
+            // This maintains backward compatibility - classes with lowercase methods won't be affected
+            if (isRecordType && isRecordStyleAccessor(name, method)) {
                 return name;
             }
             return null;
diff --git a/src/test/java/org/json/junit/JSONObjectRecordTest.java b/src/test/java/org/json/junit/JSONObjectRecordTest.java
index 84bd749f5..f1a673d28 100644
--- a/src/test/java/org/json/junit/JSONObjectRecordTest.java
+++ b/src/test/java/org/json/junit/JSONObjectRecordTest.java
@@ -11,20 +11,30 @@
 import org.json.junit.data.MyEnum;
 import org.json.junit.data.MyNumber;
 import org.json.junit.data.PersonRecord;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * Tests for JSONObject support of Java record-style classes.
- * These tests verify that classes with accessor methods without get/is prefixes
- * (like Java records) can be properly converted to JSONObject.
+ * Tests for JSONObject support of Java record types.
+ * 
+ * NOTE: These tests are currently ignored because PersonRecord is not an actual Java record.
+ * The implementation now correctly detects actual Java records using reflection (Class.isRecord()).
+ * These tests will need to be enabled and run with Java 17+ where PersonRecord can be converted
+ * to an actual record type.
+ * 
+ * This ensures backward compatibility - regular classes with lowercase method names will not
+ * be treated as records unless they are actual Java record types.
  */
 public class JSONObjectRecordTest {
 
     /**
      * Tests that JSONObject can be created from a record-style class.
      * Record-style classes use accessor methods like name() instead of getName().
+     * 
+     * NOTE: Ignored until PersonRecord is converted to an actual Java record (requires Java 17+)
      */
     @Test
+    @Ignore("Requires actual Java record type - PersonRecord needs to be a real record (Java 17+)")
     public void jsonObjectByRecord() {
         PersonRecord person = new PersonRecord("John Doe", 30, true);
         JSONObject jsonObject = new JSONObject(person);
@@ -37,8 +47,11 @@ public void jsonObjectByRecord() {
     
     /**
      * Test that Object methods (toString, hashCode, equals, etc.) are not included
+     * 
+     * NOTE: Ignored until PersonRecord is converted to an actual Java record (requires Java 17+)
      */
     @Test
+    @Ignore("Requires actual Java record type - PersonRecord needs to be a real record (Java 17+)")
     public void recordStyleClassShouldNotIncludeObjectMethods() {
         PersonRecord person = new PersonRecord("Jane Doe", 25, false);
         JSONObject jsonObject = new JSONObject(person);
@@ -129,8 +142,11 @@ public void javaLibraryClassesShouldNotIncludeTheirMethods() {
     
     /**
      * Test mixed case - object with both traditional getters and record-style accessors
+     * 
+     * NOTE: Ignored until PersonRecord is converted to an actual Java record (requires Java 17+)
      */
     @Test
+    @Ignore("Requires actual Java record type - PersonRecord needs to be a real record (Java 17+)")
     public void mixedGettersAndRecordStyleAccessors() {
         // PersonRecord has record-style accessors: name(), age(), active()
         // These should all be included
@@ -145,8 +161,11 @@ public void mixedGettersAndRecordStyleAccessors() {
     
     /**
      * Test that methods starting with uppercase are not included (not valid record accessors)
+     * 
+     * NOTE: Ignored until PersonRecord is converted to an actual Java record (requires Java 17+)
      */
     @Test
+    @Ignore("Requires actual Java record type - PersonRecord needs to be a real record (Java 17+)")
     public void methodsStartingWithUppercaseShouldNotBeIncluded() {
         PersonRecord person = new PersonRecord("Test", 50, false);
         JSONObject jsonObject = new JSONObject(person);

From 73c582e1295206b85ae1c21af6261f189f19e1c9 Mon Sep 17 00:00:00 2001
From: Simulant87 
Date: Fri, 14 Nov 2025 15:29:52 +0100
Subject: [PATCH 101/106] update github actions to version 5

consistently update all actions checkout, setup-java, upload-artifactory to version 5
---
 .github/workflows/pipeline.yml | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index d59702cae..6ada5d597 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -15,9 +15,9 @@ jobs:
     name: Java 1.6
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: 1.6
       - name: Compile Java 1.6
@@ -30,7 +30,7 @@ jobs:
           jar cvf target/org.json.jar -C target/classes .
       - name: Upload JAR 1.6
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Create java 1.6 JAR
           path: target/*.jar
@@ -45,9 +45,9 @@ jobs:
         java: [ 8 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -64,13 +64,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -78,7 +78,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -93,9 +93,9 @@ jobs:
         java: [ 11 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -112,13 +112,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -126,7 +126,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -141,9 +141,9 @@ jobs:
         java: [ 17 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -160,13 +160,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -174,7 +174,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
@@ -189,9 +189,9 @@ jobs:
         java: [ 21 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -208,13 +208,13 @@ jobs:
           mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
@@ -222,7 +222,7 @@ jobs:
         run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
       - name: Upload Package Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar

From e9a7d7c72eeb4a2b48cc51f4798dc3f677936ca1 Mon Sep 17 00:00:00 2001
From: Simulant87 
Date: Fri, 14 Nov 2025 15:40:21 +0100
Subject: [PATCH 102/106] add distribution to java 1.6 build

---
 .github/workflows/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 6ada5d597..f62ff1fa4 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -20,6 +20,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: 1.6
+          distribution: 'temurin'
       - name: Compile Java 1.6
         run: |
           mkdir -p target/classes

From d38cb064fd4ac8a31dde4382343e92a06a246122 Mon Sep 17 00:00:00 2001
From: Simulant87 
Date: Fri, 14 Nov 2025 15:45:41 +0100
Subject: [PATCH 103/106] reset setup-java to version 1 for 1.6 build

---
 .github/workflows/pipeline.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index f62ff1fa4..e87683ab7 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -17,10 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v1
         with:
           java-version: 1.6
-          distribution: 'temurin'
       - name: Compile Java 1.6
         run: |
           mkdir -p target/classes

From 005dc7b49eb65a24de0fdfc06757f34e3db8fc72 Mon Sep 17 00:00:00 2001
From: Simulant87 
Date: Fri, 14 Nov 2025 15:47:58 +0100
Subject: [PATCH 104/106] add build for LTS JDK 25

---
 .github/workflows/pipeline.yml | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index e87683ab7..85aea5501 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -226,3 +226,52 @@ jobs:
         with:
           name: Package Jar ${{ matrix.java }}
           path: target/*.jar
+
+  build-25:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        # build against supported Java LTS versions:
+        java: [ 25 ]
+    name: Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
+      - name: Compile Java ${{ matrix.java }}
+        run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true
+      - name: Run Tests ${{ matrix.java }}
+        run: |
+          mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
+      - name: Build Test Report ${{ matrix.java }}
+        if: ${{ always() }}
+        run: |
+          mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
+          mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
+      - name: Upload Test Results ${{ matrix.java }}
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v5
+        with:
+          name: Test Results ${{ matrix.java }}
+          path: target/surefire-reports/
+      - name: Upload Test Report ${{ matrix.java }}
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v5
+        with:
+          name: Test Report ${{ matrix.java }}
+          path: target/site/
+      - name: Package Jar ${{ matrix.java }}
+        run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
+      - name: Upload Package Results ${{ matrix.java }}
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v5
+        with:
+          name: Package Jar ${{ matrix.java }}
+          path: target/*.jar
+

From 3bc98dfc7fccd1459eba20b1c4e5561d8dfca78d Mon Sep 17 00:00:00 2001
From: Simulant87 
Date: Fri, 14 Nov 2025 15:49:09 +0100
Subject: [PATCH 105/106] Update README.md tested on java 25

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28f71971e..994e7f675 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Project goals include:
 * No external dependencies
 * Fast execution and low memory footprint
 * Maintain backward compatibility
-* Designed and tested to use on Java versions 1.6 - 21
+* Designed and tested to use on Java versions 1.6 - 25
 
 
 The files in this package implement JSON encoders and decoders. The package can also convert between JSON and XML, HTTP headers, Cookies, and CDL.

From 24bba97c1d21fdb9bab76940503be7579d874476 Mon Sep 17 00:00:00 2001
From: Sean Leary 
Date: Wed, 24 Dec 2025 09:05:18 -0600
Subject: [PATCH 106/106] pre-release-20251224 update docs and builds for next
 release

---
 README.md        | 2 +-
 build.gradle     | 2 +-
 docs/RELEASES.md | 2 ++
 pom.xml          | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 994e7f675..e341a0b34 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ JSON in Java [package org.json]
 [![Java CI with Maven](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml)
 [![CodeQL](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20250517/json-20250517.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20251224/json-20251224.jar)**
 
 
 # Overview
diff --git a/build.gradle b/build.gradle
index 6dcdca6fc..898f10dc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20250517-SNAPSHOT'
+version = 'v20251224-SNAPSHOT'
 description = 'JSON in Java'
 sourceCompatibility = '1.8'
 
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index cd53bbe55..653e2bb8c 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20251224    Records, fromJson(), and recent commits
+
 20250517    Strict mode hardening and recent commits
 
 20250107    Restore moditect in pom.xml
diff --git a/pom.xml b/pom.xml
index 81f5c3c2c..8d0881cbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     org.json
     json
-    20250517
+    20251224
     bundle
 
     JSON in Java