Merge pull request #1001 from marilynel/master

addressing sonarqube concerns in JSONObject

.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

.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

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/20240205/json-20240303.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
@@ -97,6 +97,18 @@ Execute the test suite with Gradlew:
 gradlew clean build test
 ```
 
+*Optional* Execute the test suite in strict mode with Gradlew:
+
+```shell
+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)

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,9 +20,20 @@ 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.4.0'
+    testImplementation 'com.jayway.jsonpath:json-path:2.9.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
 }
 
@@ -30,7 +42,7 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20230618-SNAPSHOT'
+version = 'v20250517-SNAPSHOT'
 description = 'JSON in Java'
 sourceCompatibility = '1.8'
 
@@ -53,3 +65,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
+
+// Your existing build configurations...
+
+// Add a new task to modify the file
+task modifyStrictMode {
+    doLast {
+        println "Modifying JSONParserConfiguration.java to enable strictMode..."
+
+        def filePath = project.file('src/main/java/org/json/JSONParserConfiguration.java')
+
+        if (!filePath.exists()) {
+            throw new GradleException("Could not find file: ${filePath.absolutePath}")
+        }
+
+        // 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}"
+    }
+}
+
+// Add a task to restore the original file
+task restoreStrictMode {
+    doLast {
+        println "Restoring original JSONParserConfiguration.java..."
+
+        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."
+        }
+    }
+}
+
+// Create a task to run the workflow
+task testWithStrictMode {
+    dependsOn modifyStrictMode
+    finalizedBy restoreStrictMode
+
+    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'
+            }
+        }
+    }
+}

docs/RELEASES.md

@@ -5,6 +5,13 @@ 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)
 
 ~~~
+20250517    Strict mode hardening 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.
 
 20240205    Recent commits.

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20240303</version>
+    <version>20250517</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -200,4 +200,55 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>test-strict-mode</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                        <artifactId>replacer</artifactId>
+                        <version>1.5.3</version>
+                        <executions>
+                            <!-- Enable strict mode -->
+                            <execution>
+                                <id>enable-strict-mode</id>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                                <configuration>
+                                    <file>src/main/java/org/json/JSONParserConfiguration.java</file>
+                                    <replacements>
+                                        <replacement>
+                                            <token>// this.strictMode = true;</token>
+                                            <value>this.strictMode = true;</value>
+                                        </replacement>
+                                    </replacements>
+                                </configuration>
+                            </execution>
+                            <!-- Restore original code after tests -->
+                            <execution>
+                                <id>restore-original</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                                <configuration>
+                                    <file>src/main/java/org/json/JSONParserConfiguration.java</file>
+                                    <replacements>
+                                        <replacement>
+                                            <token>this.strictMode = true;</token>
+                                            <value>// this.strictMode = true;</value>
+                                        </replacement>
+                                    </replacements>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

src/main/java/org/json/CDL.java

@@ -100,11 +100,15 @@ public class CDL {
         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 class CDL {
         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;
     }
 

src/main/java/org/json/JSONArray.java

@@ -5,7 +5,6 @@ Public Domain.
  */
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
@@ -84,11 +83,24 @@ public class JSONArray implements Iterable<Object> {
      *             If there is a syntax error.
      */
     public JSONArray(JSONTokener x) throws JSONException {
+        this(x, x.getJsonParserConfiguration());
+    }
+
+    /**
+     * 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();
+
+        boolean isInitial = x.getPrevious() == 0;
         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
@@ -115,16 +127,35 @@ public class JSONArray implements Iterable<Object> {
                         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 ']'");
                 }
             }
+        } else {
+            if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) {
+                throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+            }
         }
     }
 
@@ -139,7 +170,22 @@ public class JSONArray implements Iterable<Object> {
      *             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 <code>[</code>&nbsp;<small>(left
+     *            bracket)</small> and ends with <code>]</code>
+     *            &nbsp;<small>(right bracket)</small>.
+     * @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), jsonParserConfiguration);
     }
 
     /**
@@ -288,13 +334,11 @@ public class JSONArray implements Iterable<Object> {
      */
     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);
@@ -1695,7 +1739,10 @@ public class JSONArray implements Iterable<Object> {
      */
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
-        StringWriter sw = new StringWriter();
+        // each value requires a comma, so multiply the count by 2
+        // We don't want to oversize the initial capacity
+        int initialSize = myArrayList.size() * 2;
+        Writer sw = new StringBuilderWriter(Math.max(initialSize, 16));
         return this.write(sw, indentFactor, 0).toString();
     }
 
@@ -1937,7 +1984,7 @@ public class JSONArray implements Iterable<Object> {
             // 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 {

src/main/java/org/json/JSONML.java

@@ -111,7 +111,7 @@ public class JSONML {
                             }
                         } else if (c == '[') {
                             token = x.nextToken();
-                            if (token.equals("CDATA") && x.next() == '[') {
+                            if ("CDATA".equals(token) && x.next() == '[') {
                                 if (ja != null) {
                                     ja.put(x.nextCDATA());
                                 }

src/main/java/org/json/JSONObject.java

@@ -6,7 +6,6 @@ Public Domain.
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -15,17 +14,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.ResourceBundle;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -89,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.
          *
@@ -190,7 +169,7 @@ public class JSONObject {
         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
             }
         }
     }
@@ -205,63 +184,150 @@ public class JSONObject {
      *             duplicated key.
      */
     public JSONObject(JSONTokener x) throws JSONException {
+        this(x, x.getJsonParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONObject from a JSONTokener with custom json parse configurations.
+     *
+     * @param x
+     *            A JSONTokener object containing the source string.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     * @throws JSONException
+     *             If there is a syntax error in the source string or a
+     *             duplicated key.
+     */
+    public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
-        char c;
-        String key;
+        boolean isInitial = x.getPrevious() == 0;
 
         if (x.nextClean() != '{') {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
-            c = x.nextClean();
-            switch (c) {
-            case 0:
-                throw x.syntaxError("A JSONObject text must end with '}'");
-            case '}':
+            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;
+        boolean doneParsing = false;
+        char c = jsonTokener.nextClean();
+
+        switch (c) {
+            case 0:
+                throw jsonTokener.syntaxError("A JSONObject text must end with '}'");
+            case '}':
+                if (isInitial && jsonParserConfiguration.isStrictMode() && jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                }
+                return true;
             default:
-                key = x.nextSimpleValue(c).toString();
+                obj = jsonTokener.nextSimpleValue(c);
+                key = obj.toString();
+        }
+
+        checkKeyForStrictMode(jsonTokener, jsonParserConfiguration, obj);
+
+        // The key is followed by ':'.
+        c = jsonTokener.nextClean();
+        if (c != ':') {
+            throw jsonTokener.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 + "\"");
             }
 
-            // The key is followed by ':'.
-
-            c = x.nextClean();
-            if (c != ':') {
-                throw x.syntaxError("Expected a ':' after a key");
+            Object value = jsonTokener.nextValue();
+            // Only add value if non-null
+            if (value != null) {
+                this.put(key, value);
             }
+        }
 
-            // Use syntaxError(..) to include error location
+        // Pairs are separated by ','.
+        if (parseEndOfKeyValuePair(jsonTokener, jsonParserConfiguration, isInitial)) {
+            doneParsing = true;
+        }
 
-            if (key != null) {
-                // Check if key exists
-                if (this.opt(key) != null) {
-                    // key already exists
-                    throw x.syntaxError("Duplicate key \"" + key + "\"");
-                }
-                // Only add value if non-null
-                Object value = x.nextValue();
-                if (value!=null) {
-                    this.put(key, value);
-                }
-            }
+        return doneParsing;
+    }
 
-            // Pairs are separated by ','.
-
-            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 jsonTokener.syntaxError("Strict mode error: Invalid character ';' found");
+                }
+                break;
             case ',':
-                if (x.nextClean() == '}') {
-                    return;
+                if (jsonTokener.nextClean() == '}') {
+                    // trailing commas are not allowed in strict mode
+                    if (jsonParserConfiguration.isStrictMode()) {
+                        throw jsonTokener.syntaxError("Strict mode error: Expected another object element");
+                    }
+                    // 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 '}':
-                return;
+                if (isInitial && jsonParserConfiguration.isStrictMode() && jsonTokener.nextClean() != 0) {
+                    throw jsonTokener.syntaxError("Strict mode error: Unparsed characters found at end of input text");
+                }
+                // 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()));
             }
         }
     }
@@ -296,7 +362,6 @@ public class JSONObject {
 
     /**
      * Construct a JSONObject from a map with recursion depth.
-     *
      */
     private JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
@@ -311,7 +376,7 @@ public class JSONObject {
         	        throw new NullPointerException("Null key.");
         	    }
                 final Object value = e.getValue();
-                if (value != null) {
+                if (value != null || jsonParserConfiguration.isUseNativeNulls()) {
                     testValidity(value);
                     this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
@@ -380,12 +445,17 @@ public class JSONObject {
      */
     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<Object> objectsRecord) {
         this();
-        this.populateMap(bean, objectsRecord);
+        this.populateMap(bean, objectsRecord, new JSONParserConfiguration());
     }
 
     /**
@@ -427,7 +497,25 @@ public class JSONObject {
      *                duplicated key.
      */
     public JSONObject(String source) throws JSONException {
-        this(new JSONTokener(source));
+        this(source, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONObject from a source JSON text string with custom json parse configurations.
+     * This is the most commonly used JSONObject constructor.
+     *
+     * @param source
+     *            A string beginning with <code>{</code>&nbsp;<small>(left
+     *            brace)</small> and ending with <code>}</code>
+     *            &nbsp;<small>(right brace)</small>.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     * @exception JSONException
+     *                If there is a syntax error in the source string or a
+     *                duplicated key.
+     */
+    public JSONObject(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        this(new JSONTokener(source, jsonParserConfiguration), jsonParserConfiguration);
     }
 
     /**
@@ -635,13 +723,11 @@ public class JSONObject {
      */
     public boolean getBoolean(String key) throws JSONException {
         Object object = this.get(key);
-        if (object.equals(Boolean.FALSE)
-                || (object instanceof String && ((String) object)
-                        .equalsIgnoreCase("false"))) {
+        if (Boolean.FALSE.equals(object)
+                || (object instanceof String && "false".equalsIgnoreCase((String) object))) {
             return false;
-        } else if (object.equals(Boolean.TRUE)
-                || (object instanceof String && ((String) object)
-                        .equalsIgnoreCase("true"))) {
+        } else if (Boolean.TRUE.equals(object)
+                || (object instanceof String && "true".equalsIgnoreCase((String) object))) {
             return true;
         }
         throw wrongValueFormatException(key, "Boolean", object, null);
@@ -1224,7 +1310,7 @@ public class JSONObject {
     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.
@@ -1725,64 +1811,81 @@ public class JSONObject {
      * @throws JSONException
      *            If a getter returned a non-finite number.
      */
-    private void populateMap(Object bean) {
-        populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()));
+    private void populateMap(Object bean, JSONParserConfiguration jsonParserConfiguration) {
+        populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()), jsonParserConfiguration);
     }
 
-    private void populateMap(Object bean, Set<Object> objectsRecord) {
+    /**
+     * 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<Object> 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) {
-            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())) {
+            if (isValidMethod(method)) {
                 final String key = getKeyNameFromMethod(method);
                 if (key != null && !key.isEmpty()) {
-                    try {
-                        final Object result = method.invoke(bean);
-                        if (result != null) {
-                            // 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) {
-                                }
-                            }
-                        }
-                    } catch (IllegalAccessException ignore) {
-                    } catch (IllegalArgumentException ignore) {
-                    } catch (InvocationTargetException ignore) {
-                    }
+                    processMethod(bean, objectsRecord, jsonParserConfiguration, method, key);
                 }
             }
         }
     }
 
+    /**
+     * 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<Object> 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);
+                }
+
+                objectsRecord.add(result);
+
+                testValidity(result);
+                this.map.put(key, wrap(result, objectsRecord));
+
+                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;
+
+        return includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+    }
+
     private static boolean isValidMethodName(String name) {
         return !"getClass".equals(name) && !"getDeclaringClass".equals(name);
     }
@@ -1798,7 +1901,7 @@ public class JSONObject {
             }
         }
         JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class);
-        if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) {
+        if (annotationValueNotEmpty(annotation)) {
             return annotation.value();
         }
         String key;
@@ -1824,6 +1927,46 @@ public class JSONObject {
         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
+     * @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.
@@ -1867,7 +2010,7 @@ public class JSONObject {
         }
 
         //If the superclass is Object, no annotations will be found any more
-        if (c.getSuperclass().equals(Object.class))
+        if (Object.class.equals(c.getSuperclass()))
             return null;
 
         try {
@@ -1925,7 +2068,7 @@ public class JSONObject {
         }
 
         //If the superclass is Object, no annotations will be found any more
-        if (c.getSuperclass().equals(Object.class))
+        if (Object.class.equals(c.getSuperclass()))
             return -1;
 
         try {
@@ -2224,7 +2367,10 @@ public class JSONObject {
      */
     @SuppressWarnings("resource")
     public static String quote(String string) {
-        StringWriter sw = new StringWriter();
+        if (string == null || string.isEmpty()) {
+            return "\"\"";
+        }
+        Writer sw = new StringBuilderWriter(string.length() + 2);
         try {
             return quote(string, sw).toString();
         } catch (IOException ignored) {
@@ -2623,7 +2769,10 @@ public class JSONObject {
      */
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
-        StringWriter w = new StringWriter();
+        // 6 characters are the minimum to serialise a key value pair e.g.: "k":1,
+        // and we don't want to oversize the initial capacity
+        int initialSize = map.size() * 6;
+        Writer w = new StringBuilderWriter(Math.max(initialSize, 16));
         return this.write(w, indentFactor, 0).toString();
     }
 
@@ -2705,13 +2854,13 @@ public class JSONObject {
                 return NULL;
             }
             if (object instanceof JSONObject || object instanceof JSONArray
-                    || NULL.equals(object) || object instanceof JSONString
+                    || 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;
             }
 
@@ -2766,6 +2915,7 @@ public class JSONObject {
         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();
@@ -2773,6 +2923,10 @@ public class JSONObject {
                 throw new JSONException(e);
             }
             writer.write(o != null ? o.toString() : quote(value.toString()));
+        } 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);
@@ -2960,24 +3114,4 @@ public class JSONObject {
             "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 (value.equals("-")){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";
-    }
 }

src/main/java/org/json/JSONParserConfiguration.java

@@ -4,23 +4,149 @@ package org.json;
  * Configuration object for the JSON parser. The configuration is immutable.
  */
 public class JSONParserConfiguration extends ParserConfiguration {
+    /**
+     * Used to indicate whether to overwrite duplicate key or not.
+     */
+    private boolean overwriteDuplicateKey;
+    
+    /**
+     * Used to indicate whether to convert java null values to JSONObject.NULL or ignoring the entry when converting java maps.
+     */
+    private boolean useNativeNulls;
 
-  /**
-   * Configuration with the default values.
-   */
-  public JSONParserConfiguration() {
-    super();
-  }
+    /**
+     * Configuration with the default values.
+     */
+    public JSONParserConfiguration() {
+        super();
+        this.overwriteDuplicateKey = false;
+        // DO NOT DELETE THE FOLLOWING LINE -- it is used for strictMode testing
+        // this.strictMode = true;
+    }
 
-  @Override
-  protected JSONParserConfiguration clone() {
-    return new JSONParserConfiguration();
-  }
+    /**
+     * 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;
 
-  @SuppressWarnings("unchecked")
-  @Override
-  public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
-    return super.withMaxNestingDepth(maxNestingDepth);
-  }
+    @Override
+    protected JSONParserConfiguration clone() {
+        JSONParserConfiguration clone = new JSONParserConfiguration();
+        clone.overwriteDuplicateKey = overwriteDuplicateKey;
+        clone.strictMode = strictMode;
+        clone.maxNestingDepth = maxNestingDepth;
+        clone.keepStrings = keepStrings;
+        clone.useNativeNulls = useNativeNulls;
+        return clone;
+    }
 
+    /**
+     * Defines the maximum nesting depth that the parser will descend before throwing an exception
+     * when parsing a map into JSONObject or parsing a {@link java.util.Collection} instance into
+     * JSONArray. The default max nesting depth is 512, which means the parser will throw a JsonException
+     * if the maximum depth is reached.
+     *
+     * @param maxNestingDepth the maximum nesting depth allowed to the JSON parser
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
+        JSONParserConfiguration clone = this.clone();
+        clone.maxNestingDepth = maxNestingDepth;
+
+        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 overwriteDuplicateKey defines should the parser overwrite duplicate keys.
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwriteDuplicateKey) {
+        JSONParserConfiguration clone = this.clone();
+        clone.overwriteDuplicateKey = overwriteDuplicateKey;
+
+        return clone;
+    }
+    
+    /**
+     * 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 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 withUseNativeNulls(final boolean useNativeNulls) {
+        JSONParserConfiguration clone = this.clone();
+        clone.useNativeNulls = useNativeNulls;
+
+        return clone;
+    }
+
+    /**
+     * Sets the strict mode configuration for the JSON parser with default true value
+     * <p>
+     * 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.
+     * <p>
+     * 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.
+     *
+     * @return The <code>overwriteDuplicateKey</code> configuration value.
+     */
+    public boolean isOverwriteDuplicateKey() {
+        return this.overwriteDuplicateKey;
+    }
+    
+    /**
+     * 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 (<code>isUseNativeNulls() == true</code>) 
+     * or ignore that map entry (<code>isUseNativeNulls() == false</code>).
+     *
+     * @return The <code>useNativeNulls</code> configuration value.
+     */
+    public boolean isUseNativeNulls() {
+        return this.useNativeNulls;
+    }
+    
+
+    /**
+     * 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() {
+        return this.strictMode;
+    }
 }

src/main/java/org/json/JSONPointer.java

@@ -127,7 +127,7 @@ public class JSONPointer {
         if (pointer == null) {
             throw new NullPointerException("pointer cannot be null");
         }
-        if (pointer.isEmpty() || pointer.equals("#")) {
+        if (pointer.isEmpty() || "#".equals(pointer)) {
             this.refTokens = Collections.emptyList();
             return;
         }
@@ -246,7 +246,7 @@ public class JSONPointer {
      */
     @Override
     public String toString() {
-        StringBuilder rval = new StringBuilder("");
+        StringBuilder rval = new StringBuilder();
         for (String token: this.refTokens) {
             rval.append('/').append(escape(token));
         }

src/main/java/org/json/JSONTokener.java

@@ -32,13 +32,27 @@ 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;
 
     /**
      * 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;
         this.reader = reader.markSupported()
                 ? reader
                         : new BufferedReader(reader);
@@ -51,25 +65,60 @@ public class JSONTokener {
         this.line = 1;
     }
 
-
     /**
      * 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.
+     * @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);
     }
 
 
     /**
      * 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));
     }
 
+    /**
+     * 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);
+    }
+
+    /**
+     * Getter
+     * @return jsonParserConfiguration
+     */
+    public JSONParserConfiguration getJsonParserConfiguration() {
+        return jsonParserConfiguration;
+    }
+
+    /**
+     * Setter
+     * @param jsonParserConfiguration new value for jsonParserConfiguration
+     *
+     * @deprecated method should not be used
+     */
+    @Deprecated
+    public void setJsonParserConfiguration(JSONParserConfiguration jsonParserConfiguration) {
+        this.jsonParserConfiguration = jsonParserConfiguration;
+    }
 
     /**
      * Back up one character. This provides a sort of lookahead capability,
@@ -299,7 +348,8 @@ public class JSONTokener {
             case 0:
             case '\n':
             case '\r':
-                throw this.syntaxError("Unterminated string");
+                throw this.syntaxError("Unterminated string. " +
+                        "Character with int code " + (int) c + " is not allowed within a quoted string.");
             case '\\':
                 c = this.next();
                 switch (c) {
@@ -319,10 +369,12 @@ public class JSONTokener {
                     sb.append('\r');
                     break;
                 case 'u':
+                    String next = this.next(4);
                     try {
-                        sb.append((char)Integer.parseInt(this.next(4), 16));
+                        sb.append((char)Integer.parseInt(next, 16));
                     } catch (NumberFormatException e) {
-                        throw this.syntaxError("Illegal escape.", e);
+                        throw this.syntaxError("Illegal escape. " +
+                                "\\u must be followed by a 4 digit hexadecimal number. \\" + next + " is not valid.", e);
                     }
                     break;
                 case '"':
@@ -332,7 +384,7 @@ public class JSONTokener {
                     sb.append(c);
                     break;
                 default:
-                    throw this.syntaxError("Illegal escape.");
+                    throw this.syntaxError("Illegal escape. Escape sequence  \\" + c + " is not valid.");
                 }
                 break;
             default:
@@ -406,14 +458,14 @@ public class JSONTokener {
         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);
             }
@@ -424,6 +476,12 @@ public class JSONTokener {
     Object nextSimpleValue(char c) {
         String string;
 
+        // Strict mode only allows strings with explicit double quotes
+        if (jsonParserConfiguration != null &&
+                jsonParserConfiguration.isStrictMode() &&
+                c == '\'') {
+            throw this.syntaxError("Strict mode error: Single quoted strings are not allowed");
+        }
         switch (c) {
         case '"':
         case '\'':
@@ -452,7 +510,24 @@ public class JSONTokener {
         if ("".equals(string)) {
             throw this.syntaxError("Missing value");
         }
-        return JSONObject.stringToValue(string);
+        Object obj = JSONObject.stringToValue(string);
+        // if obj is a boolean, look at string
+        if (jsonParserConfiguration != null &&
+                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));
+            }
+            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;
     }
 
 

src/main/java/org/json/ParserConfiguration.java

@@ -20,12 +20,12 @@ public class ParserConfiguration {
 
     /**
      * Specifies if values should be kept as strings (<code>true</code>), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string)
+     * they should try to be guessed into JSON values (numeric, boolean, string).
      */
     protected boolean keepStrings;
 
     /**
-     * The maximum nesting depth when parsing a document.
+     * The maximum nesting depth when parsing an object.
      */
     protected int maxNestingDepth;
 
@@ -59,14 +59,14 @@ public class ParserConfiguration {
         // map should be cloned as well. If the values of the map are known to also
         // be immutable, then a shallow clone of the map is acceptable.
         return new ParserConfiguration(
-            this.keepStrings,
-            this.maxNestingDepth
+                this.keepStrings,
+                this.maxNestingDepth
         );
     }
 
     /**
      * When parsing the XML into JSONML, specifies if values should be kept as strings (<code>true</code>), or if
-     * they should try to be guessed into JSON values (numeric, boolean, string)
+     * they should try to be guessed into JSON values (numeric, boolean, string).
      *
      * @return The <code>keepStrings</code> configuration value.
      */
@@ -78,22 +78,21 @@ public class ParserConfiguration {
      * When parsing the XML into JSONML, specifies if values should be kept as strings (<code>true</code>), or if
      * they should try to be guessed into JSON values (numeric, boolean, string)
      *
-     * @param newVal
-     *      new value to use for the <code>keepStrings</code> configuration option.
-     * @param <T> the type of the configuration object
-     * 
+     * @param newVal new value to use for the <code>keepStrings</code> configuration option.
+     * @param <T>    the type of the configuration object
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     @SuppressWarnings("unchecked")
     public <T extends ParserConfiguration> T withKeepStrings(final boolean newVal) {
-        T newConfig = (T)this.clone();
+        T newConfig = (T) this.clone();
         newConfig.keepStrings = newVal;
         return newConfig;
     }
 
     /**
      * The maximum nesting depth that the parser will descend before throwing an exception
-     * when parsing the XML into JSONML.
+     * when parsing an object (e.g. Map, Collection) into JSON-related objects.
+     *
      * @return the maximum nesting depth set for this configuration
      */
     public int getMaxNestingDepth() {
@@ -102,18 +101,19 @@ public class ParserConfiguration {
 
     /**
      * Defines the maximum nesting depth that the parser will descend before throwing an exception
-     * when parsing the XML into JSONML. The default max nesting depth is 512, which means the parser
-     * will throw a JsonException if the maximum depth is reached.
+     * when parsing an object (e.g. Map, Collection) into JSON-related objects.
+     * The default max nesting depth is 512, which means the parser will throw a JsonException if
+     * the maximum depth is reached.
      * Using any negative value as a parameter is equivalent to setting no limit to the nesting depth,
      * which means the parses will go as deep as the maximum call stack size allows.
+     *
      * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
-     * @param <T> the type of the configuration object
-     * 
+     * @param <T>             the type of the configuration object
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     @SuppressWarnings("unchecked")
     public <T extends ParserConfiguration> T withMaxNestingDepth(int maxNestingDepth) {
-        T newConfig = (T)this.clone();
+        T newConfig = (T) this.clone();
 
         if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
             newConfig.maxNestingDepth = maxNestingDepth;

src/main/java/org/json/StringBuilderWriter.java

@@ -0,0 +1,92 @@
+package org.json;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Performance optimised alternative for {@link java.io.StringWriter}
+ * using internally a {@link StringBuilder} instead of a {@link StringBuffer}.
+ */
+public class StringBuilderWriter extends Writer {
+    private final StringBuilder builder;
+
+    /**
+     * Create a new string builder writer using the default initial string-builder buffer size.
+     */
+    public StringBuilderWriter() {
+        builder = new StringBuilder();
+        lock = builder;
+    }
+
+    /**
+     * Create a new string builder writer using the specified initial string-builder buffer size.
+     *
+     * @param initialSize The number of {@code char} values that will fit into this buffer
+     *                    before it is automatically expanded
+     *
+     * @throws IllegalArgumentException If {@code initialSize} is negative
+     */
+    public StringBuilderWriter(int initialSize) {
+        builder = new StringBuilder(initialSize);
+        lock = builder;
+    }
+
+    @Override
+    public void write(int c) {
+        builder.append((char) c);
+    }
+
+    @Override
+    public void write(char[] cbuf, int offset, int length) {
+        if ((offset < 0) || (offset > cbuf.length) || (length < 0) ||
+                ((offset + length) > cbuf.length) || ((offset + length) < 0)) {
+            throw new IndexOutOfBoundsException();
+        } else if (length == 0) {
+            return;
+        }
+        builder.append(cbuf, offset, length);
+    }
+
+    @Override
+    public void write(String str) {
+        builder.append(str);
+    }
+
+    @Override
+    public void write(String str, int offset, int length) {
+        builder.append(str, offset, offset + length);
+    }
+
+    @Override
+    public StringBuilderWriter append(CharSequence csq) {
+        write(String.valueOf(csq));
+        return this;
+    }
+
+    @Override
+    public StringBuilderWriter append(CharSequence csq, int start, int end) {
+        if (csq == null) {
+            csq = "null";
+        }
+        return append(csq.subSequence(start, end));
+    }
+
+    @Override
+    public StringBuilderWriter append(char c) {
+        write(c);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return builder.toString();
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() throws IOException {
+    }
+}

src/main/java/org/json/XML.java

@@ -355,10 +355,20 @@ public class XML {
                                 && 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,23 @@ public class XML {
                                     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 if (obj == JSONObject.NULL) {
+                                        jsonObject.accumulate(config.getcDataTagName(),
+                                                config.isKeepStrings() ? ((String) token) : obj);
+                                    } else {
+                                        jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
+                                    }
                                 }
                             }
 
@@ -688,6 +713,44 @@ public class XML {
         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 <pre>{@code
+     * &lt;[ [ ]]>}</pre>
+     * 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 +809,38 @@ public class XML {
         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 <pre>{@code
+     * &lt;[ [ ]]>}</pre>
+     * 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

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 class XMLParserConfiguration extends ParserConfiguration {
      */
     @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 class XMLParserConfiguration extends ParserConfiguration {
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
             final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> 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 @@ public class XMLParserConfiguration extends ParserConfiguration {
                 this.xsiTypeMap,
                 this.forceList,
                 this.maxNestingDepth,
-                this.closeEmptyTag
+                this.closeEmptyTag,
+                this.keepNumberAsString,
+                this.keepBooleanAsString
         );
         config.shouldTrimWhiteSpace = this.shouldTrimWhiteSpace;
         return config;
@@ -207,7 +223,43 @@ public class XMLParserConfiguration extends ParserConfiguration {
     @SuppressWarnings("unchecked")
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
-        return super.withKeepStrings(newVal);
+        XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepStrings = newVal;
+        newConfig.keepNumberAsString = newVal;
+        newConfig.keepBooleanAsString = newVal;
+        return newConfig;
+    }
+
+    /**
+     * When parsing the XML into JSON, specifies if numbers should be kept as strings (<code>1</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @param newVal
+     *      new value to use for the <code>keepNumberAsString</code> 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;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
+        return newConfig;
+    }
+
+    /**
+     * When parsing the XML into JSON, specifies if booleans should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string)
+     *
+     * @param newVal
+     *      new value to use for the <code>withKeepBooleanAsString</code> 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;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
+        return newConfig;
     }
 
     /**
@@ -221,6 +273,26 @@ public class XMLParserConfiguration extends ParserConfiguration {
         return this.cDataTagName;
     }
 
+    /**
+     * When parsing the XML into JSONML, specifies if numbers should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string).
+     *
+     * @return The <code>keepStrings</code> configuration value.
+     */
+    public boolean isKeepNumberAsString() {
+        return this.keepNumberAsString;
+    }
+
+    /**
+     * When parsing the XML into JSONML, specifies if booleans should be kept as strings (<code>true</code>), or if
+     * they should try to be guessed into JSON values (numeric, boolean, string).
+     *
+     * @return The <code>keepStrings</code> 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 <code>null</code> to indicate no CDATA

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.
@@ -125,6 +168,33 @@ public class CDLTest {
            }
     }
 
+    /**
+     * 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.
      */
@@ -283,11 +353,11 @@ public class CDLTest {
      */
     @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);
     }
 

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);
+    }
+
+}

src/test/java/org/json/junit/JSONArrayTest.java

@@ -8,6 +8,7 @@ import static org.junit.Assert.assertEquals;
 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;
 
@@ -227,6 +228,19 @@ public class JSONArrayTest {
         Util.checkJSONArrayMaps(jaRaw);
         Util.checkJSONArrayMaps(jaInt);
     }
+    
+    @Test
+    public void jsonArrayByListWithNestedNullValue() {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        Map<String, Object> sub = new HashMap<String, Object>();
+        sub.put("nullKey", null);	
+        list.add(sub);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(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.
@@ -259,6 +273,11 @@ public class JSONArrayTest {
                      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),
@@ -472,9 +491,19 @@ public class JSONArrayTest {
     @Test
     public void unquotedText() {
         String str = "[value1, something!, (parens), foo@bar.com, 23, 23+45]";
-        JSONArray jsonArray = new JSONArray(str);
         List<Object> expected = Arrays.asList("value1", "something!", "(parens)", "foo@bar.com", 23, "23+45");
-        assertEquals(expected, jsonArray.toList());
+
+        // Test should fail if default strictMode is true, pass if false
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            try {
+                JSONArray jsonArray = new JSONArray(str);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            JSONArray jsonArray = new JSONArray(str);
+            assertEquals(expected, jsonArray.toList());
+        }
     }
 
     /**
@@ -685,8 +714,8 @@ public class JSONArrayTest {
 
         String jsonArrayStr =
             "["+
-                "hello,"+
-                "world"+
+                "\"hello\","+
+                "\"world\""+
             "]";
         // 2
         jsonArray.put(new JSONArray(jsonArrayStr));
@@ -763,8 +792,8 @@ public class JSONArrayTest {
 
         String jsonArrayStr =
             "["+
-                "hello,"+
-                "world"+
+                "\"hello\","+
+                "\"world\""+
             "]";
         // 2
         jsonArray.put(2, new JSONArray(jsonArrayStr));
@@ -1499,6 +1528,14 @@ public class JSONArrayTest {
         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<Object> buildNestedArray(int maxDepth) {
         if (maxDepth <= 0) {
             return new ArrayList<>();

src/test/java/org/json/junit/JSONMLTest.java

@@ -625,7 +625,7 @@ public class JSONMLTest {
                                 "\"subValue\","+
                                 "{\"svAttr\":\"svValue\"},"+
                                 "\"abc\""+
-                            "],"+
+                            "]"+
                         "],"+
                         "[\"value\",3],"+
                         "[\"value\",4.1],"+

src/test/java/org/json/junit/JSONObjectNumberTest.java

@@ -23,18 +23,18 @@ public class JSONObjectNumberTest {
     @Parameters(name = "{index}: {0}")
     public static Collection<Object[]> 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

src/test/java/org/json/junit/JSONObjectTest.java

@@ -56,6 +56,7 @@ import org.json.junit.data.RecursiveBeanEquals;
 import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
+import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -75,6 +76,14 @@ public class JSONObjectTest {
      */
     static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
 
+    @After
+    public void tearDown() {
+        SingletonEnum.getInstance().setSomeInt(0);
+        SingletonEnum.getInstance().setSomeString(null);
+        Singleton.getInstance().setSomeInt(0);
+        Singleton.getInstance().setSomeString(null);
+    }
+
     /**
      * Tests that the similar method is working as expected.
      */
@@ -210,17 +219,27 @@ public class JSONObjectTest {
     @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);
+
+        // Test should fail if default strictMode is true, pass if false
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        if (jsonParserConfiguration.isStrictMode()) {
+            try {
+                JSONObject jsonObject = new JSONObject(str);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            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
@@ -597,6 +616,46 @@ public class JSONObjectTest {
         assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
         Util.checkJSONObjectMaps(jsonObject);
     }
+    
+    @Test
+    public void jsonObjectByMapWithNullValueAndParserConfiguration() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        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().withUseNativeNulls(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<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> nestedMap = new HashMap<String, Object>();
+        nestedMap.put("nullKey", null);
+        map.put("nestedMap", nestedMap);
+        List<Map<String, Object>> nestedList = new ArrayList<Map<String,Object>>();
+        nestedList.add(nestedMap);        
+        map.put("nestedList", nestedList);
+        
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withUseNativeNulls(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 
@@ -1060,48 +1119,58 @@ public class JSONObjectTest {
      */
     @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"+
-            "}";
-        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);
+        // 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()) {
+            try {
+                JSONObject jsonObject = new JSONObject(str);
+                assertEquals("Expected to throw exception due to invalid string", true, false);
+            } catch (JSONException e) { }
+        } else {
+            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);
+        }
     }
 
     /**
@@ -1519,7 +1588,7 @@ public class JSONObjectTest {
             "{"+
                 "\"trueKey\":true,"+
                 "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\","+
+                "\"stringKey\":\"hello world!\""+
             "}";
         JSONObject jsonObject2 = new JSONObject(str);
         names = JSONObject.getNames(jsonObject2);
@@ -1614,7 +1683,7 @@ public class JSONObjectTest {
             "{"+
                 "\"trueKey\":true,"+
                 "\"falseKey\":false,"+
-                "\"stringKey\":\"hello world!\","+
+                "\"stringKey\":\"hello world!\""+
             "}";
 
         JSONObject jsonObject = new JSONObject(str);
@@ -2193,167 +2262,279 @@ public class JSONObjectTest {
         }
     }
 
-    /**
-     * Explore how JSONObject handles parsing errors.
-     */
-    @SuppressWarnings({"boxing", "unused"})
     @Test
-    public void jsonObjectParsingErrors() {
+    public void jsonObjectParseControlCharacterEOFAssertExceptionMessage(){
+        char c = '\0';
+        final String source = "{\"key\":\"" + c + "\"}";
         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());
+            JSONObject jo = new JSONObject(source);
+            fail("JSONException should be thrown");
+        } catch (JSONException ex) {
+            assertEquals("Unterminated string. " + "Character with int code 0" +
+                    " is not allowed within a quoted string. at 8 [character 9 line 1]", ex.getMessage());
         }
+    }
+
+    @Test
+    public void jsonObjectParseControlCharacterNewLineAssertExceptionMessage(){
+        char[] chars = {'\n', '\r'};
+        for( char c : chars) {
+            final String source = "{\"key\":\"" + c + "\"}";
+            try {
+                JSONObject jo = new JSONObject(source);
+                fail("JSONException should be thrown");
+            } catch (JSONException ex) {
+                assertEquals("Unterminated string. " + "Character with int code " + (int) c +
+                        " is not allowed within a quoted string. at 9 [character 0 line 2]", ex.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void jsonObjectParseUTF8EncodingAssertExceptionMessage(){
+        String c = "\\u123x";
+        final String source = "{\"key\":\"" + c + "\"}";
+        try {
+            JSONObject jo = new JSONObject(source);
+            fail("JSONException should be thrown");
+        } catch (JSONException ex) {
+            assertEquals("Illegal escape. \\u must be followed by a 4 digit hexadecimal number. " +
+                    "\\123x is not valid. at 14 [character 15 line 1]", ex.getMessage());
+        }
+    }
+
+    @Test
+    public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
+        String c = "\\x";
+        final String source = "{\"key\":\"" + c + "\"}";
+        try {
+            JSONObject jo = new JSONObject(source);
+            fail("JSONException should be thrown");
+        } catch (JSONException ex) {
+            assertEquals("Illegal escape. Escape sequence  " + c + " is not valid." +
+                    " at 10 [character 11 line 1]", ex.getMessage());
+        }
+    }
+
+    @Test
+    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", 
+            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());
         }
+    }
+
+    @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", 
+            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", 
+            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));
+            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());
+                    "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));
+            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());
+                    "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));
+            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());
+//            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));
+            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());
+//            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));
+            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 key
+            // 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) { 
+        } catch (JSONException e) {
             assertEquals("Expecting an exception message",
                     "JSONObject[\"myKey\"] is not a JSONArray (null).",
                     e.getMessage());
         }
+    }
+
+    @Test
+    public void parsingErrorIncrementWrongValue() {
         try {
-            // increment wrong key
+            // increment wrong value
             String str = "{\"myKey\":true, \"myOtherKey\":false}";
             JSONObject jsonObject = new JSONObject(str);
             jsonObject.increment("myKey");
             fail("Expected an exception");
-        } catch (JSONException e) { 
+        } 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) { 
+        } catch (JSONException e) {
             assertEquals("Expecting an exception message",
                     "Null key.",
                     e.getMessage());
         }
+    }
+
+    @Test
+    public void parsingErrorNumberToString() {
         try {
             // invalid numberToString()
-            JSONObject.numberToString((Number)null);
+            JSONObject.numberToString((Number) null);
             fail("Expected an exception");
-        } catch (JSONException e) { 
-            assertEquals("Expecting an exception message", 
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
                     "Null pointer",
                     e.getMessage());
         }
+    }
 
+    @Test
+    public void parsingErrorPutOnceDuplicateKey() {
         try {
-            // multiple putOnce key 
+            // multiple putOnce key
             JSONObject jsonObject = new JSONObject("{}");
             jsonObject.putOnce("hello", "world");
             jsonObject.putOnce("hello", "world!");
             fail("Expected an exception");
-        } catch (JSONException e) { 
+        } catch (JSONException e) {
             assertTrue("", true);
         }
+    }
+
+    @Test
+    public void parsingErrorInvalidDouble() {
         try {
-            // test validity of invalid double 
+            // test validity of invalid double
             JSONObject.testValidity(Double.NaN);
             fail("Expected an exception");
-        } catch (JSONException e) { 
+        } catch (JSONException e) {
             assertTrue("", true);
         }
+    }
+
+    @Test
+    public void parsingErrorInvalidFloat() {
         try {
-            // test validity of invalid float 
+            // test validity of invalid float
             JSONObject.testValidity(Float.NEGATIVE_INFINITY);
             fail("Expected an exception");
-        } catch (JSONException e) { 
+        } 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"
-                        + "}";
+                    + "    \"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) {
@@ -2361,18 +2542,22 @@ public class JSONObjectTest {
                     "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"
-                        + "}";
+                    + "    \"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) {
@@ -2380,20 +2565,24 @@ public class JSONObjectTest {
                     "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"
-                        + "}";
+                    + "    \"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) {
@@ -2401,19 +2590,23 @@ public class JSONObjectTest {
                     "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"
-                        + "}";
+                    + "    \"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) {
@@ -2421,23 +2614,28 @@ public class JSONObjectTest {
                     "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
+            // 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"
-                        + "}";
+                    + "    \"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) {
@@ -2445,25 +2643,30 @@ public class JSONObjectTest {
                     "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
+            // 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"
-                        + "}";
+                    + "    \"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) {
@@ -2471,18 +2674,23 @@ public class JSONObjectTest {
                     "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
+            // 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"
-                        + "]";
+                    + "    {\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) {
@@ -2490,24 +2698,29 @@ public class JSONObjectTest {
                     "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
+            // 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"
-                        + "]";
+                    + "    {\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) {
@@ -3752,21 +3965,21 @@ public class JSONObjectTest {
 
         // 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");
@@ -3775,6 +3988,65 @@ public class JSONObjectTest {
         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); });
+    }
+
+    @Test
+    public void test_strictModeWithMisCasedBooleanOrNullValue(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+        try{
+            new JSONObject("{\"a\":True}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+        try{
+            new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+        try{
+            new JSONObject("{\"a\":nUlL}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+    }
+
+    @Test
+    public void test_strictModeWithInappropriateKey(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
+
+        // Parsing the following objects should fail
+        try{
+            new JSONObject("{true : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+        try{
+            new JSONObject("{TRUE : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+        try{
+            new JSONObject("{1 : 3}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) {
+            // No action, expected outcome
+        }
+
+    }
+
+
     /**
      * Method to build nested map of max maxDepth
      *
@@ -3789,5 +4061,37 @@ public class JSONObjectTest {
         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.
+     * 
+     * <p>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.</p>
+     */
+    @Test
+    public void jsonObjectParseNullFieldsWithParserConfiguration() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration();
+        RecursiveBean bean = new RecursiveBean(null);
+        JSONObject jsonObject = new JSONObject(bean, jsonParserConfiguration.withUseNativeNulls(true));
+        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}.
+     * 
+     * <p>This test ensures that uninitialized fields in the bean are not serialized
+     * into the resulting JSON object, and the object remains empty.</p>
+     */
+    @Test
+    public void jsonObjectParseNullFieldsWithoutParserConfiguration() {
+        RecursiveBean bean = new RecursiveBean(null);
+        JSONObject jsonObject = new JSONObject(bean);
+        assertTrue("JSONObject should be empty", jsonObject.isEmpty());
+    }
 
 }

src/test/java/org/json/junit/JSONParserConfigurationTest.java

@@ -0,0 +1,624 @@
+package org.json.junit;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
+import org.json.JSONTokener;
+import org.junit.Test;
+
+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.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\"}";
+
+    @Test(expected = JSONException.class)
+    public void testThrowException() {
+        new JSONObject(TEST_SOURCE);
+    }
+
+    @Test
+    public void testOverwrite() {
+        JSONObject jsonObject = new JSONObject(TEST_SOURCE,
+                new JSONParserConfiguration().withOverwriteDuplicateKey(true));
+
+        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()
+                .<JSONParserConfiguration>withKeepStrings(true)
+                .withStrictMode(true);
+
+        assertTrue(jsonParserConfiguration.isKeepStrings());
+    }
+    
+    @Test
+    public void useNativeNullsIsCloned() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withUseNativeNulls(true)
+                .withStrictMode(true);
+        assertTrue(jsonParserConfiguration.isUseNativeNulls());
+    }
+
+    @Test
+    public void verifyDuplicateKeyThenMaxDepth() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withOverwriteDuplicateKey(true)
+                .withMaxNestingDepth(42);
+
+        assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
+        assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
+    }
+
+    @Test
+    public void verifyMaxDepthThenDuplicateKey() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withMaxNestingDepth(42)
+                .withOverwriteDuplicateKey(true);
+
+        assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
+        assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
+    }
+
+    @Test
+    public void givenInvalidInput_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        List<String> 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();
+                String msg = "Expected an exception, but got: " + s + " Noncompliant Array index: " + i;
+                fail(msg);
+            } catch (Exception e) {
+                // its all good
+            }
+        }
+    }
+
+    @Test
+    public void givenInvalidInputObjects_testStrictModeTrue_shouldThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+        List<String> 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 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);
+
+        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 givenValidNestedObject_testStrictModeTrue_shouldNotThrowJsonException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(true);
+
+        String testCase = "{\"a0\":[\"c\"], \"a1\":[10.2], \"a2\":[true, false, true]}";
+
+        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 givenValidEmptyArrayInsideObject_testStrictModeFalse_shouldNotThrowJsonException(){
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .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("Strict mode error: Value 'badString' is not surrounded by quotes at 10 [character 11 line 1]",
+                je.getMessage());
+    }
+
+    @Test
+    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("Strict mode error: 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]";
+        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
+        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<String> 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<String> 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
+    public void givenInvalidInputArrays_testStrictModeFalse_shouldNotThrowAnyException() {
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+                .withStrictMode(false);
+
+        List<String> 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);
+            } 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<String> 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));
+            }
+        }
+    }
+
+    @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("Strict mode error: Unparsed characters found at end of input text at 6 [character 7 line 1]",
+                je.getMessage());
+    }
+
+    @Test
+    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("Strict mode error: Invalid character ';' found 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("Strict mode error: Unparsed characters found at end of input text at 10 [character 11 line 1]",
+                je.getMessage());
+    }
+
+    @Test
+    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("Strict mode error: Invalid character ';' found 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("Strict mode error: 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("Strict mode error: 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 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);
+
+        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(
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
+                jeTwo.getMessage());
+        assertEquals(
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
+                jeThree.getMessage());
+        assertEquals(
+                "Strict mode error: Single quoted strings are not allowed at 3 [character 4 line 1]",
+                jeFour.getMessage());
+    }
+
+    @Test
+    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(
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
+                jeTwo.getMessage());
+        assertEquals(
+                "Strict mode error: Single quoted strings are not allowed at 6 [character 7 line 1]",
+                jeThree.getMessage());
+        assertEquals(
+                "Strict mode error: Single quoted strings are not allowed at 2 [character 3 line 1]",
+                jeFour.getMessage());
+    }
+
+    @Test
+    public void givenUnbalancedQuotesArray_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 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() {
+        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("Strict mode error: 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("Strict mode error: Value 'test' is not surrounded by quotes at 5 [character 6 line 1]",
+                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.
+     *
+     * @return List with JSON strings.
+     */
+    private List<String> getNonCompliantJSONArrayList() {
+        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\"}]");
+    }
+
+    /**
+     * 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<String> 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\"}}"
+        );
+    }
+
+}

src/test/java/org/json/junit/JSONPointerTest.java

@@ -384,8 +384,7 @@ public class JSONPointerTest {
     	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

src/test/java/org/json/junit/JSONStringTest.java

@@ -319,6 +319,22 @@ public class JSONStringTest {
         }
     }
 
+    @Test
+    public void testEnumJSONString() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("key", MyEnum.MY_ENUM);
+        assertEquals("{\"key\":\"myJsonString\"}", jsonObject.toString());
+    }
+
+    private enum MyEnum implements JSONString {
+        MY_ENUM;
+
+        @Override
+        public String toJSONString() {
+            return "\"myJsonString\"";
+        }
+    }
+
     /**
      * A JSONString that returns a valid JSON string value.
      */

src/test/java/org/json/junit/JSONTokenerTest.java

@@ -16,10 +16,7 @@ import java.io.InputStreamReader;
 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 class JSONTokenerTest {
         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
@@ -325,4 +332,42 @@ public class JSONTokenerTest {
            assertEquals("Stream closed", exception.getMessage());
        }
    }
+
+    @Test
+    public void testInvalidInput_JSONObject_withoutStrictModel_shouldParseInput() {
+        String input = "{\"invalidInput\": [],}";
+        JSONTokener tokener = new JSONTokener(input);
+
+        // 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);
+
+        // 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());
+        }
+    }
 }

src/test/java/org/json/junit/StringBuilderWriterTest.java

@@ -0,0 +1,60 @@
+package org.json.junit;
+
+import static org.junit.Assert.assertEquals;
+
+import org.json.StringBuilderWriter;
+import org.junit.Before;
+import org.junit.Test;
+
+public class StringBuilderWriterTest {
+    private StringBuilderWriter writer;
+
+    @Before
+    public void setUp() {
+        writer = new StringBuilderWriter();
+    }
+
+    @Test
+    public void testWriteChar() {
+        writer.write('a');
+        assertEquals("a", writer.toString());
+    }
+
+    @Test
+    public void testWriteCharArray() {
+        char[] chars = {'a', 'b', 'c'};
+        writer.write(chars, 0, 3);
+        assertEquals("abc", writer.toString());
+    }
+
+    @Test
+    public void testWriteString() {
+        writer.write("hello");
+        assertEquals("hello", writer.toString());
+    }
+
+    @Test
+    public void testWriteStringWithOffsetAndLength() {
+        writer.write("hello world", 6, 5);
+        assertEquals("world", writer.toString());
+    }
+
+    @Test
+    public void testAppendCharSequence() {
+        writer.append("hello");
+        assertEquals("hello", writer.toString());
+    }
+
+    @Test
+    public void testAppendCharSequenceWithStartAndEnd() {
+        CharSequence csq = "hello world";
+        writer.append(csq, 6, 11);
+        assertEquals("world", writer.toString());
+    }
+
+    @Test
+    public void testAppendChar() {
+        writer.append('a');
+        assertEquals("a", writer.toString());
+    }
+}

src/test/java/org/json/junit/XMLConfigurationTest.java

@@ -270,9 +270,9 @@ public class XMLConfigurationTest {
 
         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/"+
@@ -574,15 +574,18 @@ public class XMLConfigurationTest {
         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,67 @@ public class XMLConfigurationTest {
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
     }
 
+    /**
+     * JSON string lost leading zero and converted "True" to true.
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_withKeepNumberAsString() {
+        final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><id>null</id><item id=\"01\"/><title>True</title></root>";
+        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);
+    }
+
+    /**
+     * JSON string lost leading zero and converted "True" to true.
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
+        final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><id>null</id><item id=\"01\"/><title>True</title></root>";
+        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);
+    }
+
+    /**
+     * null is "null" when keepStrings == true
+     */
+    @Test
+    public void testToJSONArray_jsonOutput_null_withKeepString() {
+        final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>null</title></root>";
+        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
+     */
+    @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.
      */

src/test/java/org/json/junit/XMLTest.java

@@ -267,9 +267,9 @@ public class XMLTest {
 
         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 class XMLTest {
 
     @Test
     public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){
-        String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}";
+        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
         JSONObject jsonObject = new JSONObject(jsonString);
         String expectedXmlString = "<encloser><outer><innerOne></innerOne><innerTwo>two</innerTwo></outer></encloser>";
         String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(true));
@@ -1191,7 +1191,7 @@ public class XMLTest {
 
     @Test
     public void shouldNotCreateExplicitEndTagWithEmptyValueWhenNotConfigured(){
-        String jsonString = "{outer:{innerOne:\"\", innerTwo:\"two\"}}";
+        String jsonString = "{\"outer\":{\"innerOne\":\"\", \"innerTwo\":\"two\"}}";
         JSONObject jsonObject = new JSONObject(jsonString);
         String expectedXmlString = "<encloser><outer><innerOne/><innerTwo>two</innerTwo></outer></encloser>";
         String xmlForm = XML.toString(jsonObject,"encloser", new XMLParserConfiguration().withCloseEmptyTag(false));

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 <![CDATA[ some <CDATA> content ]]> after";
+        XMLTokener tokener = new XMLTokener(new StringReader(xml));
+        tokener.skipPast("<![CDATA[");
+        String cdata = tokener.nextCDATA();
+        assertEquals(" some <CDATA> content ", cdata);
+    }
+
+    /**
+     * Tests that nextContent() returns plain text content before a tag.
+     */
+    @Test
+    public void testNextContentWithText() {
+        String xml = "Some content<nextTag>";
+        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 = "<tag>";
+        XMLTokener tokener = new XMLTokener(xml);
+        Object content = tokener.nextContent();
+        assertEquals('<', content);
+    }
+
+    /**
+     * Tests that nextEntity() resolves a known entity like &amp; 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"
+    }
+
+}

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"
+  }
+]