From e77a77e841349baa35d960a12d706d0889e61ef2 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valery_yatsynovich@epam.com>
Date: Tue, 29 Dec 2020 14:16:46 +0300
Subject: [PATCH 001/212] Use built-in Gradle shorthand notation for Maven
 Central repository

---
 build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 77f9eee..3b403ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,13 +13,10 @@ apply plugin: 'maven-publish'
 
 repositories {
     mavenLocal()
+    mavenCentral()
     maven {
         url = uri('https://oss.sonatype.org/content/repositories/snapshots')
     }
-
-    maven {
-        url = uri('http://repo.maven.apache.org/maven2')
-    }
 }
 
 dependencies {

From 31ff8a229129d8450da236633aac8d320aba87ff Mon Sep 17 00:00:00 2001
From: Ehtesham <ehteshamkhan3014@gmail.com>
Date: Wed, 27 Jan 2021 11:35:38 +0530
Subject: [PATCH 002/212] Checked the length of key for checker framework

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index b60344b..8517feb 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1558,7 +1558,7 @@ public class JSONObject {
         // if the first letter in the key is not uppercase, then skip.
         // This is to maintain backwards compatibility before PR406
         // (https://github.com/stleary/JSON-java/pull/406/)
-        if (Character.isLowerCase(key.charAt(0))) {
+        if (key.length() > 0 && Character.isLowerCase(key.charAt(0))) {
             return null;
         }
         if (key.length() == 1) {

From 5b531faa49f7f8247511d7ea74043932de19e327 Mon Sep 17 00:00:00 2001
From: Ehtesham <ehteshamkhan3014@gmail.com>
Date: Thu, 28 Jan 2021 15:31:23 +0530
Subject: [PATCH 003/212] Improved the logic for checking the length of key

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 8517feb..8bbb874 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -151,10 +151,10 @@ public class JSONObject {
             return "null";
         }
     }
-    
+
     /**
      *  Regular Expression Pattern that matches JSON Numbers. This is primarily used for
-     *  output to guarantee that we are always writing valid JSON. 
+     *  output to guarantee that we are always writing valid JSON.
      */
     static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
 
@@ -175,10 +175,10 @@ public class JSONObject {
      * Construct an empty JSONObject.
      */
     public JSONObject() {
-        // HashMap is used on purpose to ensure that elements are unordered by 
+        // HashMap is used on purpose to ensure that elements are unordered by
         // the specification.
-        // JSON tends to be a portable transfer format to allows the container 
-        // implementations to rearrange their items for a faster element 
+        // JSON tends to be a portable transfer format to allows the container
+        // implementations to rearrange their items for a faster element
         // retrieval based on associative access.
         // Therefore, an implementation mustn't rely on the order of the item.
         this.map = new HashMap<String, Object>();
@@ -239,9 +239,9 @@ public class JSONObject {
             if (c != ':') {
                 throw x.syntaxError("Expected a ':' after a key");
             }
-            
+
             // Use syntaxError(..) to include error location
-            
+
             if (key != null) {
                 // Check if key exists
                 if (this.opt(key) != null) {
@@ -350,11 +350,11 @@ public class JSONObject {
      * method from being serialized:
      * <pre>
      * &#64;JSONPropertyName("FullName")
-     * &#64;JSONPropertyIgnore 
+     * &#64;JSONPropertyIgnore
      * public String getName() { return this.name; }
      * </pre>
      * <p>
-     * 
+     *
      * @param bean
      *            An object that has getter methods that should be used to make
      *            a JSONObject.
@@ -448,12 +448,12 @@ public class JSONObject {
             }
         }
     }
-    
+
     /**
-     * Constructor to specify an initial capacity of the internal map. Useful for library 
+     * Constructor to specify an initial capacity of the internal map. Useful for library
      * internal calls where we know, or at least can best guess, how big this JSONObject
      * will be.
-     * 
+     *
      * @param initialCapacity initial capacity of the internal map.
      */
     protected JSONObject(int initialCapacity){
@@ -576,7 +576,7 @@ public class JSONObject {
 
     /**
      * Get the enum value associated with a key.
-     * 
+     *
      * @param <E>
      *            Enum Type
      * @param clazz
@@ -630,7 +630,7 @@ public class JSONObject {
      *            A key string.
      * @return The numeric value.
      * @throws JSONException
-     *             if the key is not found or if the value cannot 
+     *             if the key is not found or if the value cannot
      *             be converted to BigInteger.
      */
     public BigInteger getBigInteger(String key) throws JSONException {
@@ -929,7 +929,7 @@ public class JSONObject {
      * modify the JSONObject. Use with caution.
      *
      * @see Set#iterator()
-     * 
+     *
      * @return An iterator of the keys.
      */
     public Iterator<String> keys() {
@@ -950,10 +950,10 @@ public class JSONObject {
 
     /**
      * Get a set of entries of the JSONObject. These are raw values and may not
-     * match what is returned by the JSONObject get* and opt* functions. Modifying 
+     * match what is returned by the JSONObject get* and opt* functions. Modifying
      * the returned EntrySet or the Entry objects contained therein will modify the
      * backing JSONObject. This does not return a clone or a read-only view.
-     * 
+     *
      * Use with caution.
      *
      * @see Map#entrySet()
@@ -1047,7 +1047,7 @@ public class JSONObject {
 
     /**
      * Get the enum value associated with a key.
-     * 
+     *
      * @param <E>
      *            Enum Type
      * @param clazz
@@ -1062,7 +1062,7 @@ public class JSONObject {
 
     /**
      * Get the enum value associated with a key.
-     * 
+     *
      * @param <E>
      *            Enum Type
      * @param clazz
@@ -1156,7 +1156,7 @@ public class JSONObject {
      * @param val value to convert
      * @param defaultValue default value to return is the conversion doesn't work or is null.
      * @return BigDecimal conversion of the original value, or the defaultValue if unable
-     *          to convert. 
+     *          to convert.
      */
     static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue) {
         if (NULL.equals(val)) {
@@ -1206,7 +1206,7 @@ public class JSONObject {
      * @param val value to convert
      * @param defaultValue default value to return is the conversion doesn't work or is null.
      * @return BigInteger conversion of the original value, or the defaultValue if unable
-     *          to convert. 
+     *          to convert.
      */
     static BigInteger objectToBigInteger(Object val, BigInteger defaultValue) {
         if (NULL.equals(val)) {
@@ -1230,7 +1230,7 @@ public class JSONObject {
         }
         // don't check if it's a string in case of unchecked Number subclasses
         try {
-            // the other opt functions handle implicit conversions, i.e. 
+            // the other opt functions handle implicit conversions, i.e.
             // jo.put("double",1.1d);
             // jo.optInt("double"); -- will return 1, not an error
             // this conversion to BigDecimal then to BigInteger is to maintain
@@ -1404,10 +1404,10 @@ public class JSONObject {
         if (val == null) {
             return defaultValue;
         }
-        
+
         return val.longValue();
     }
-    
+
     /**
      * Get an optional {@link Number} value associated with a key, or <code>null</code>
      * if there is no such key or if the value is not a number. If the value is a string,
@@ -1442,14 +1442,14 @@ public class JSONObject {
         if (val instanceof Number){
             return (Number) val;
         }
-        
+
         try {
             return stringToNumber(val.toString());
         } catch (Exception e) {
             return defaultValue;
         }
     }
-    
+
     /**
      * Get an optional string associated with a key. It returns an empty string
      * if there is no such key. If the value is not a string and is not null,
@@ -1558,7 +1558,7 @@ public class JSONObject {
         // if the first letter in the key is not uppercase, then skip.
         // This is to maintain backwards compatibility before PR406
         // (https://github.com/stleary/JSON-java/pull/406/)
-        if (key.length() > 0 && Character.isLowerCase(key.charAt(0))) {
+        if (key.length() == 0 || Character.isLowerCase(key.charAt(0))) {
             return null;
         }
         if (key.length() == 1) {
@@ -1735,7 +1735,7 @@ public class JSONObject {
     public JSONObject put(String key, double value) throws JSONException {
         return this.put(key, Double.valueOf(value));
     }
-    
+
     /**
      * Put a key/float pair in the JSONObject.
      *
@@ -1879,7 +1879,7 @@ public class JSONObject {
     }
 
     /**
-     * Creates a JSONPointer using an initialization string and tries to 
+     * Creates a JSONPointer using an initialization string and tries to
      * match it to an item within this JSONObject. For example, given a
      * JSONObject initialized with this document:
      * <pre>
@@ -1887,13 +1887,13 @@ public class JSONObject {
      *     "a":{"b":"c"}
      * }
      * </pre>
-     * and this JSONPointer string: 
+     * and this JSONPointer string:
      * <pre>
      * "/a/b"
      * </pre>
      * Then this method will return the String "c".
      * A JSONPointerException may be thrown from code called by this method.
-     *   
+     *
      * @param jsonPointer string that can be used to create a JSONPointer
      * @return the item matched by the JSONPointer, otherwise null
      */
@@ -1901,7 +1901,7 @@ public class JSONObject {
         return query(new JSONPointer(jsonPointer));
     }
     /**
-     * Uses a user initialized JSONPointer  and tries to 
+     * Uses a user initialized JSONPointer  and tries to
      * match it to an item within this JSONObject. For example, given a
      * JSONObject initialized with this document:
      * <pre>
@@ -1909,24 +1909,24 @@ public class JSONObject {
      *     "a":{"b":"c"}
      * }
      * </pre>
-     * and this JSONPointer: 
+     * and this JSONPointer:
      * <pre>
      * "/a/b"
      * </pre>
      * Then this method will return the String "c".
      * A JSONPointerException may be thrown from code called by this method.
-     *   
+     *
      * @param jsonPointer string that can be used to create a JSONPointer
      * @return the item matched by the JSONPointer, otherwise null
      */
     public Object query(JSONPointer jsonPointer) {
         return jsonPointer.queryFrom(this);
     }
-    
+
     /**
      * Queries and returns a value from this object using {@code jsonPointer}, or
      * returns null if the query fails due to a missing key.
-     * 
+     *
      * @param jsonPointer the string representation of the JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
@@ -1934,11 +1934,11 @@ public class JSONObject {
     public Object optQuery(String jsonPointer) {
     	return optQuery(new JSONPointer(jsonPointer));
     }
-    
+
     /**
      * Queries and returns a value from this object using {@code jsonPointer}, or
      * returns null if the query fails due to a missing key.
-     * 
+     *
      * @param jsonPointer The JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
@@ -2090,18 +2090,18 @@ public class JSONObject {
             return false;
         }
     }
-    
+
     /**
      * Compares two numbers to see if they are similar.
-     * 
+     *
      * If either of the numbers are Double or Float instances, then they are checked to have
      * a finite value. If either value is not finite (NaN or &#177;infinity), then this
      * function will always return false. If both numbers are finite, they are first checked
      * to be the same type and implement {@link Comparable}. If they do, then the actual
      * {@link Comparable#compareTo(Object)} is called. If they are not the same type, or don't
-     * implement Comparable, then they are converted to {@link BigDecimal}s. Finally the 
+     * implement Comparable, then they are converted to {@link BigDecimal}s. Finally the
      * BigDecimal values are compared using {@link BigDecimal#compareTo(BigDecimal)}.
-     * 
+     *
      * @param l the Left value to compare. Can not be <code>null</code>.
      * @param r the right value to compare. Can not be <code>null</code>.
      * @return true if the numbers are similar, false otherwise.
@@ -2111,7 +2111,7 @@ public class JSONObject {
             // non-finite numbers are never similar
             return false;
         }
-        
+
         // if the classes are the same and implement Comparable
         // then use the built in compare first.
         if(l.getClass().equals(r.getClass()) && l instanceof Comparable) {
@@ -2119,7 +2119,7 @@ public class JSONObject {
             int compareTo = ((Comparable)l).compareTo(r);
             return compareTo==0;
         }
-        
+
         // BigDecimal should be able to handle all of our number types that we support through
         // documentation. Convert to BigDecimal first, then use the Compare method to
         // decide equality.
@@ -2130,7 +2130,7 @@ public class JSONObject {
         }
         return lBigDecimal.compareTo(rBigDecimal) == 0;
     }
-    
+
     private static boolean numberIsFinite(Number n) {
         if (n instanceof Double && (((Double) n).isInfinite() || ((Double) n).isNaN())) {
             return false;
@@ -2139,10 +2139,10 @@ public class JSONObject {
         }
         return true;
     }
-    
+
     /**
      * Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
-     * 
+     *
      * @param val value to test
      * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
      */
@@ -2150,12 +2150,12 @@ public class JSONObject {
         return val.indexOf('.') > -1 || val.indexOf('e') > -1
                 || val.indexOf('E') > -1 || "-0".equals(val);
     }
-    
+
     /**
-     * Converts a string to a number using the narrowest possible type. Possible 
+     * Converts a string to a number using the narrowest possible type. Possible
      * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
      * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
-     * 
+     *
      * @param val value to convert
      * @return Number representation of the value.
      * @throws NumberFormatException thrown if the value is not a valid number. A public
@@ -2204,7 +2204,7 @@ public class JSONObject {
             // integer representation.
             // This will narrow any values to the smallest reasonable Object representation
             // (Integer, Long, or BigInteger)
-            
+
             // BigInteger down conversion: We use a similar bitLenth compare as
             // BigInteger#intValueExact uses. Increases GC, but objects hold
             // only what they need. i.e. Less runtime overhead if the value is
@@ -2307,7 +2307,7 @@ public class JSONObject {
      * <p><b>
      * Warning: This method assumes that the data structure is acyclical.
      * </b>
-     * 
+     *
      * @return a printable, displayable, portable, transmittable representation
      *         of the object, beginning with <code>{</code>&nbsp;<small>(left
      *         brace)</small> and ending with <code>}</code>&nbsp;<small>(right
@@ -2324,11 +2324,11 @@ public class JSONObject {
 
     /**
      * Make a pretty-printed JSON text of this JSONObject.
-     * 
+     *
      * <p>If <pre>{@code indentFactor > 0}</pre> and the {@link JSONObject}
      * has only one key, then the object will be output on a single line:
      * <pre>{@code {"key": 1}}</pre>
-     * 
+     *
      * <p>If an object has 2 or more keys, then it will be output across
      * multiple lines: <pre>{@code {
      *  "key1": 1,
@@ -2506,11 +2506,11 @@ public class JSONObject {
 
     /**
      * Write the contents of the JSONObject as JSON text to a writer.
-     * 
+     *
      * <p>If <pre>{@code indentFactor > 0}</pre> and the {@link JSONObject}
      * has only one key, then the object will be output on a single line:
      * <pre>{@code {"key": 1}}</pre>
-     * 
+     *
      * <p>If an object has 2 or more keys, then it will be output across
      * multiple lines: <pre>{@code {
      *  "key1": 1,
@@ -2612,7 +2612,7 @@ public class JSONObject {
         }
         return results;
     }
-    
+
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param key name of the key
@@ -2628,7 +2628,7 @@ public class JSONObject {
                 "JSONObject[" + quote(key) + "] is not a " + valueType + "."
                 , cause);
     }
-    
+
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param key name of the key

From d6ccc64c794bd54bfa70bd510e217cdb72c10268 Mon Sep 17 00:00:00 2001
From: Shashank Sabniveesu <shashank@linux.com>
Date: Sun, 28 Feb 2021 16:01:59 -0500
Subject: [PATCH 004/212] Closes 563: As never defined in RFC 6901 Section 3,
 do not handle backslashes (\) and quotes(") as anything special

---
 src/main/java/org/json/JSONPointer.java       | 16 +++++++--------
 .../java/org/json/junit/JSONPointerTest.java  | 20 ++++++++++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index e8a0b78..a3d1c1a 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -187,10 +187,11 @@ public class JSONPointer {
         this.refTokens = new ArrayList<String>(refTokens);
     }
 
+    /**
+     * @see https://tools.ietf.org/html/rfc6901#section-3
+     */
     private static String unescape(String token) {
-        return token.replace("~1", "/").replace("~0", "~")
-                .replace("\\\"", "\"")
-                .replace("\\\\", "\\");
+        return token.replace("~1", "/").replace("~0", "~");
     }
 
     /**
@@ -263,16 +264,15 @@ public class JSONPointer {
     /**
      * Escapes path segment values to an unambiguous form.
      * The escape char to be inserted is '~'. The chars to be escaped 
-     * are ~, which maps to ~0, and /, which maps to ~1. Backslashes
-     * and double quote chars are also escaped.
+     * are ~, which maps to ~0, and /, which maps to ~1.
      * @param token the JSONPointer segment value to be escaped
      * @return the escaped value for the token
+     * 
+     * @see https://tools.ietf.org/html/rfc6901#section-3
      */
     private static String escape(String token) {
         return token.replace("~", "~0")
-                .replace("/", "~1")
-                .replace("\\", "\\\\")
-                .replace("\"", "\\\"");
+                .replace("/", "~1");
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index e06851e..f1b9684 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -117,14 +117,24 @@ public class JSONPointerTest {
         assertSame(document.get("m~n"), query("/m~0n"));
     }
 
+    /**
+     * We pass backslashes as-is
+     * 
+     * @see https://tools.ietf.org/html/rfc6901#section-3
+     */
     @Test
-    public void backslashEscaping() {
-        assertSame(document.get("i\\j"), query("/i\\\\j"));
+    public void backslashHandling() {
+        assertSame(document.get("i\\j"), query("/i\\j"));
     }
 
+    /**
+     * We pass quotations as-is
+     * 
+     * @see https://tools.ietf.org/html/rfc6901#section-3
+     */
     @Test
-    public void quotationEscaping() {
-        assertSame(document.get("k\"l"), query("/k\\\\\\\"l"));
+    public void quotationHandling() {
+        assertSame(document.get("k\"l"), query("/k\"l"));
     }
 
     @Test
@@ -189,7 +199,7 @@ public class JSONPointerTest {
                 .append("\"")
                 .append(0)
                 .build();
-        assertEquals("/obj/other~0key/another~1key/\\\"/0", pointer.toString());
+        assertEquals("/obj/other~0key/another~1key/\"/0", pointer.toString());
     }
     
     @Test

From 8cc1e9830dff33d05026aae6059c2e9515f118f5 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 7 Mar 2021 21:09:01 -0600
Subject: [PATCH 005/212] Update README.md

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

diff --git a/README.md b/README.md
index 82c6157..6ef5527 100644
--- a/README.md
+++ b/README.md
@@ -246,6 +246,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20210307    Recent commits and potentially breaking fix to JSONPointer
+
 20201115    Recent commits and first release after project structure change
 
 20200518    Recent commits and snapshot before project structure change

From 7299b201f4f49e5894800a4e98caf983deada869 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 7 Mar 2021 21:11:48 -0600
Subject: [PATCH 006/212] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e5449ba..643bea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>v20200429-SNAPSHOT</version>
+    <version>20210307</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From 2630676f36000d159712b00e0096fac273b1c070 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Tue, 9 Mar 2021 19:54:54 -0600
Subject: [PATCH 007/212] Update README.md

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

diff --git a/README.md b/README.md
index 6ef5527..ef8a472 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://repo1.maven.org/maven2/org/json/json/20201115/json-20201115.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20210307/json-20210307.jar)**
 
 # Overview
 

From 29103e32286e99fb25231c648b9b27795613ce03 Mon Sep 17 00:00:00 2001
From: anton0xf <anton0xf@gmail.com>
Date: Sun, 14 Mar 2021 22:45:38 +0500
Subject: [PATCH 008/212] JSONStringer.java: fix max nesting level in javadoc

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

diff --git a/src/main/java/org/json/JSONStringer.java b/src/main/java/org/json/JSONStringer.java
index bb9e7a4..d2a4dfb 100644
--- a/src/main/java/org/json/JSONStringer.java
+++ b/src/main/java/org/json/JSONStringer.java
@@ -50,7 +50,7 @@ import java.io.StringWriter;
  * <p>
  * The first method called must be <code>array</code> or <code>object</code>.
  * There are no methods for adding commas or colons. JSONStringer adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
+ * you. Objects and arrays can be nested up to 200 levels deep.
  * <p>
  * This can sometimes be easier than using a JSONObject to build a string.
  * @author JSON.org

From e1f69ff3fea1f7e6298aa9b4cd88ae22b1b6e389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mar=C3=ADn=20G=C3=B3mez?= <pabmargom3@alum.us.es>
Date: Fri, 2 Apr 2021 11:25:57 +0200
Subject: [PATCH 009/212] Added some examples for new-comers

---
 src/main/java/org/json/JSONExamples.java | 304 +++++++++++++++++++++++
 1 file changed, 304 insertions(+)
 create mode 100644 src/main/java/org/json/JSONExamples.java

diff --git a/src/main/java/org/json/JSONExamples.java b/src/main/java/org/json/JSONExamples.java
new file mode 100644
index 0000000..3e87149
--- /dev/null
+++ b/src/main/java/org/json/JSONExamples.java
@@ -0,0 +1,304 @@
+package org.json;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+//This class' intention is to explain to new-comers the basics of this project
+
+
+public class JSONExamples {
+	
+	//EXPLAINING THE DIFFERENT WAYS OF CREATING A JSON
+	
+	private static void JSONExampleArray1() {
+		//We create a JSONObject from a String containing an array using JSONArray
+		//Firstly, we declare an Array in a String
+		 String arrayStr = 
+		            "["+"true,"+"false,"+ "\"true\","+ "\"false\","+"\"hello\","+"23.45e-4,"+
+		                "\"23.45\","+"42,"+"\"43\","+"["+"\"world\""+"],"+
+		            		"{"+
+		                    "\"key1\":\"value1\","+
+		                    "\"key2\":\"value2\","+
+		                    "\"key3\":\"value3\","+
+		                    "\"key4\":\"value4\""+
+		                "},"+
+		                "0,"+"\"-1\""+
+		            "]";
+		 //Then, we initializate the JSONArray thanks to its constructor
+		  JSONArray array = new JSONArray(arrayStr);
+		  System.out.println("Values array: "+ array);
+		  //We convert that array into a JSONObject, but first, we need the labels, so we need another JSONArray with the labels Here we will use an auxiliary function to get one for the example.
+		  JSONArray list = listNumberArray(array.length());
+		  System.out.println("Label Array: "+ list.toString());
+		  //Now, we construct the JSONObject using both the  value array and the label array.
+		  JSONObject object = array.toJSONObject(list);
+		  System.out.println("Final JSONOBject: " + object);
+	}
+	//This method creates an JSONArray of labels in which those are generated by their positions
+	private static JSONArray listNumberArray(int max){
+		 JSONArray res = new JSONArray();
+		for (int i=0; i<max;i++) {
+			//The value of the labels must be an String in order to make it work
+			res.put(String.valueOf(i));
+		}
+		return res;
+	}
+	
+	private static void JSONExampleArray2() {
+		//We can also create an Array without a String by creating an empty array and adding elements to it
+		  JSONArray array = new JSONArray();
+		//Adding elements with .put()
+		array.put("value");
+		array.put(5);
+		array.put(-23.45e67);
+		array.put(true);
+		
+		//We convert it to JSONObject providing a label arrray like last time
+		 JSONArray list = listNumberArray(array.length());
+		 JSONObject object = array.toJSONObject(list);
+		 System.out.println("Final JSONOBject: " + object);
+	}
+	
+	private static void JSONExampleStringer() {
+		//We initializate the JSONStringer
+		JSONStringer jsonStringer = new JSONStringer();
+		//Now we start the process of adding elements with .object()
+        jsonStringer.object();
+        //We can now add elements as keys and values with .values () and .key()
+        jsonStringer.key("trueValue").value(true);
+        jsonStringer.key("falseValue").value(false);
+        jsonStringer.key("nullValue").value(null);
+        jsonStringer.key("stringValue").value("hello world!");
+        jsonStringer.key("complexStringValue").value("h\be\tllo w\u1234orld!");
+        jsonStringer.key("intValue").value(42);
+        jsonStringer.key("doubleValue").value(-23.45e67);
+        //We end this prcedure with .ednObject
+        jsonStringer.endObject();
+       //Once we have a JSONStringer, we convert it to JSONObject generating a String and using JSONObject's contructor.
+        String str = jsonStringer.toString();
+        JSONObject jsonObject = new JSONObject(str);
+        
+       System.out.println("Final JSONOBject: " + jsonObject);
+	}
+	
+	private static void JSONExampleObject1() {
+		//We can create a JSONObject from a String with the class builder
+		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+		JSONObject example = new JSONObject(string);
+		System.out.println("Final JSONObject: " + example);
+		
+	}
+	
+	private static void JSONExampleObject2() {
+		//We can also create a JSONObject directly without messing around with any of the other functions.
+		JSONObject example = new JSONObject();
+		//Now we add the keys and values in a similar way as the Stringer method
+		example.put("key", "value");
+		//As you can see, the first entry is the key and the second would be its associeted value.
+		example.put("key2", 5);
+		example.put("key3", -23.45e67);
+		example.put("trueValue", true);
+		//We can't add null values thougth
+		//example.put("nullValue", null);
+		
+		 System.out.println("Final JSONOBject: " + example);
+	}
+	
+	private static void JSONExampleObject3() {
+		//We can also create a JSONObject with a Java Map
+		//YoU will need a Map whose keys are Strings. The values can be whatever you want
+		Map<String,Double> map = new HashMap<String, Double>();
+		
+		map.put("key1", 1.0);
+		map.put("key2", -23.45e67);
+		
+		//We create the JSONObject with the map with its class builder
+		JSONObject example = new JSONObject(map);
+		 System.out.println("Final JSONOBject: " + example);
+	}
+	
+	
+	
+	private static void JSONExamplWriter() {
+		//This method works in a very similar way to Object  and Stringer in the construction of the JSON.
+		//The difference is that it needs a Java object called "Appendable" like StringBuilder
+		StringBuilder write = new StringBuilder();
+		JSONWriter jsonWriter = new JSONWriter(write);
+		//We behave now the same way as Stringer
+		jsonWriter.object();
+		
+		jsonWriter.key("trueValue").value(true);
+		jsonWriter.key("falseValue").value(false);
+		jsonWriter.key("nullValue").value(null);
+		jsonWriter.key("stringValue").value("hello world!");
+		jsonWriter.key("complexStringValue").value("h\be\tllo w\u1234orld!");
+		jsonWriter.key("intValue").value(42);
+		jsonWriter.key("doubleValue").value(-23.45e67);
+		
+		jsonWriter.endObject();
+		
+		//The resoult should be in the "write" object
+		
+		System.out.println("JSON: " + write.toString());
+		
+		//The difference is that we don't get a JSONObject in this one.
+		
+		
+	}
+
+	
+	private static void JSONExampleTokener() {
+		//A partir de una String podemos crear un JSONTokener, que lo podemos usar alternativamente para JSONArray,JSONObject
+		String string = "this is not a valid JSON string";
+		JSONTokener token = new JSONTokener(string);
+		
+		//Now you can use the token in JSONObject and Array the same way as a String
+		JSONObject object = new JSONObject(token);
+		JSONArray array = new JSONArray(token);
+		
+	}
+	
+	//CONVERSIONS
+	
+	private static void JSONObjectToArray() {
+		//We start with a JSONObject
+		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+		JSONObject example = new JSONObject(string);
+		
+		//We need a list of key strings like the reverse operation
+		
+		JSONArray keyStrings = listNumberArray(example.length());
+		
+		//Then we convert to the Array using both elelements
+		
+		JSONArray array = example.toJSONArray(keyStrings);
+		
+		System.out.println("Final JSONArray: " + array);
+		
+	}	
+	private static void XMLToExampleConversion() {
+		//We start with a JSONObject
+		
+		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+		JSONObject example = new JSONObject(string);
+		//We obtain a String with XML format with toString()
+		String output = XML.toString(example);
+		System.out.println("Final XML: " + output);
+	}
+	
+	private static void XMLFromExampleConversion() {
+		//We start with a string with  the XML format
+		String string = "<0>value</0><1>5</1><2>-2.345E+68</2><3>true</3>";
+		//We obtain a JSONObject with toJSONOBject()
+		JSONObject output = XML.toJSONObject(string);
+		
+		System.out.println("Final JSONObject: " + output);
+	}
+	
+	private static void CookieToExampleConversion() {
+		//We start with a JSONObject
+		//The JSONOBject needs to entries that gives the cookie a name and gives the field "name" a name too.
+		//The Cokkie format doesn't support booleans
+		String string = "{\"name\":\"Cookie-Name\",\"value\":\"name\",\"1\":5,\"2\":-2.345E68,\"3\":'true'}";
+		JSONObject example = new JSONObject(string);
+		
+		//We obtain a String with Cookie format with toString()
+		String output = Cookie.toString(example);
+		System.out.println("Final Cookie: " + output);
+	}
+	private static void CookieFromExampleConversion() {
+		//We start with a string with  the Cookie format
+				String string = "Cookie-Name=name;1=5;2=-2.345E%2b68;3=true";
+				//We obtain a JSONObject with toJSONOBject()
+				JSONObject output = Cookie.toJSONObject(string);
+				System.out.println("Final JSONObject: " + output);
+	}
+	
+
+	private static void HTTPToExampleConversion() {
+		//We start with a JSONObject
+		//The JSONObject must have the minimun header for a HTTP request or header
+		String string = "{\"Method\":\"POST\",\"Request-URI\":'/',\"HTTP-Version\":'HTTP/1.1',\"Value1\":true,\"Value2\":2,\"Value3\":-2.345E68}";
+		JSONObject example = new JSONObject(string);
+		//We obtain a String with HTTP format with toString()
+		String output = HTTP.toString(example);
+		System.out.println("Final HTTP: " + output);
+	}
+	
+	private static void HTTPFromExampleConversion() {
+		//We start with a string with  the HTTP format
+		String string = "Final HTTP: POST '/' HTTP/1.1 Value3: -2.345E+68 Value1: true Value2: 2";
+		//We obtain a JSONObject with toJSONOBject()
+		JSONObject output = HTTP.toJSONObject(string);
+		System.out.println("Final JSONObject: " + output);
+	}
+	
+private static String CDLToExampleConversion() {
+		//We start with some JSONObjects with the same values in the keys but different values in the "values"
+		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+		JSONObject example = new JSONObject(string);
+		
+		String string2 = "{\"0\":\"value2\",\"1\":6,\"2\":-8.345E68,\"3\":false}";
+		JSONObject example2 = new JSONObject(string2);
+		
+		//We need now a JSONArray with those JSONObjects
+		JSONArray array = new JSONArray();
+		array.put(example);
+		array.put(example2);
+		//We obtain a String with XML format with toString()
+		String output = CDL.toString(array);
+		System.out.println("Final CDL: \r\n" + output);
+		return output;
+	}
+
+private static void CDLFromExampleConversion() {
+	//We start wtih a String with the CDL format
+	//String string = CDLToExampleConversion();
+	String string = "0,1,2,3\n"
+			+ "value,5,-2.345E+68,true\n"
+			+ "value2,6,-8.345E+68,false";
+	//We obtain a JSONArray with toJSONOBject()
+	JSONArray output = CDL.toJSONArray(string);
+	System.out.println("Final JSONArray: " + output);
+}
+	private static Properties PropertyToExampleConversion() {
+	//We start with a JSONObject
+	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+	JSONObject example = new JSONObject(string);
+	//We obtain a String with Properties format with toString()
+	Properties output = Property.toProperties(example);
+	System.out.println("Final Properties: " + output);
+	return output;
+	}
+	
+	private static void PropertyFromExampleConversion() {
+		//We start with a Properties object
+		Properties input = PropertyToExampleConversion();
+		//We obtain a JSONObject with toJSONOBject()
+		JSONObject output = Property.toJSONObject(input);
+		System.out.println("Final JSONObject: " + output);
+	}
+	
+	public static void main(String[] args) {
+		//JSONObjectToArray();
+		//JSONExampleArray1();
+		//JSONExampleArray2();
+		//JSONExampleStringer();
+		//JSONExampleObject1();
+		//JSONExampleObject2();
+		//JSONExampleObject3();
+		//JSONExamplWriter();
+		//XMLToExampleConversion();
+		//XMLFromExampleConversion();
+		//CookieToExampleConversion();
+		//CookieFromExampleConversion(); 
+		//HTTPToExampleConversion();
+		//HTTPFromExampleConversion();
+		//CDLToExampleConversion();
+		//CDLFromExampleConversion();
+		//PropertyToExampleConversion();
+		//PropertyFromExampleConversion();
+	}
+
+}

From 6bf3d388894931eae7e3f8282dcc61cf1c2a8252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mar=C3=ADn=20G=C3=B3mez?= <pabmargom3@alum.us.es>
Date: Fri, 2 Apr 2021 19:28:37 +0200
Subject: [PATCH 010/212] Changed JSONExamples to a Markdown file (and another
 place) with minor tweaks

---
 .../org/json/JSONExamples.java => Examples.md | 209 ++++++++++++++----
 1 file changed, 169 insertions(+), 40 deletions(-)
 rename src/main/java/org/json/JSONExamples.java => Examples.md (88%)

diff --git a/src/main/java/org/json/JSONExamples.java b/Examples.md
similarity index 88%
rename from src/main/java/org/json/JSONExamples.java
rename to Examples.md
index 3e87149..3f45e78 100644
--- a/src/main/java/org/json/JSONExamples.java
+++ b/Examples.md
@@ -1,19 +1,24 @@
-package org.json;
+<h1>Examples</h1>
+<p>Imports used in the examples: </p>
 
+```
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+```
 
-//This class' intention is to explain to new-comers the basics of this project
+<p>This document's intention is to explain to new-comers the basics of this project</p>
 
-
-public class JSONExamples {
-	
-	//EXPLAINING THE DIFFERENT WAYS OF CREATING A JSON
 	
+<h2>Part 1: Creating a JSON document</h2>
+
+<h3>Using JSONArray</h3>
+
+```
 	private static void JSONExampleArray1() {
 		//We create a JSONObject from a String containing an array using JSONArray
 		//Firstly, we declare an Array in a String
+
 		 String arrayStr = 
 		            "["+"true,"+"false,"+ "\"true\","+ "\"false\","+"\"hello\","+"23.45e-4,"+
 		                "\"23.45\","+"42,"+"\"43\","+"["+"\"world\""+"],"+
@@ -25,17 +30,24 @@ public class JSONExamples {
 		                "},"+
 		                "0,"+"\"-1\""+
 		            "]";
+
 		 //Then, we initializate the JSONArray thanks to its constructor
+
 		  JSONArray array = new JSONArray(arrayStr);
 		  System.out.println("Values array: "+ array);
-		  //We convert that array into a JSONObject, but first, we need the labels, so we need another JSONArray with the labels Here we will use an auxiliary function to get one for the example.
+
+		  //We convert that array into a JSONObject, but first, we need the labels, so we need another JSONArray with the labels.
+		  //Here we will use an auxiliary function to get one for the example.
+
 		  JSONArray list = listNumberArray(array.length());
 		  System.out.println("Label Array: "+ list.toString());
 		  //Now, we construct the JSONObject using both the  value array and the label array.
 		  JSONObject object = array.toJSONObject(list);
 		  System.out.println("Final JSONOBject: " + object);
 	}
+
 	//This method creates an JSONArray of labels in which those are generated by their positions
+
 	private static JSONArray listNumberArray(int max){
 		 JSONArray res = new JSONArray();
 		for (int i=0; i<max;i++) {
@@ -44,28 +56,44 @@ public class JSONExamples {
 		}
 		return res;
 	}
-	
+```
+```
 	private static void JSONExampleArray2() {
+
 		//We can also create an Array without a String by creating an empty array and adding elements to it
+
 		  JSONArray array = new JSONArray();
+
 		//Adding elements with .put()
+
 		array.put("value");
 		array.put(5);
 		array.put(-23.45e67);
 		array.put(true);
 		
 		//We convert it to JSONObject providing a label arrray like last time
+
 		 JSONArray list = listNumberArray(array.length());
 		 JSONObject object = array.toJSONObject(list);
 		 System.out.println("Final JSONOBject: " + object);
 	}
-	
+```
+
+<h3>Using JSONStringer</h3>
+
+```
 	private static void JSONExampleStringer() {
+
 		//We initializate the JSONStringer
+
 		JSONStringer jsonStringer = new JSONStringer();
+
 		//Now we start the process of adding elements with .object()
+
         jsonStringer.object();
+
         //We can now add elements as keys and values with .values () and .key()
+
         jsonStringer.key("trueValue").value(true);
         jsonStringer.key("falseValue").value(false);
         jsonStringer.key("nullValue").value(null);
@@ -73,59 +101,86 @@ public class JSONExamples {
         jsonStringer.key("complexStringValue").value("h\be\tllo w\u1234orld!");
         jsonStringer.key("intValue").value(42);
         jsonStringer.key("doubleValue").value(-23.45e67);
+
         //We end this prcedure with .ednObject
+
         jsonStringer.endObject();
+
        //Once we have a JSONStringer, we convert it to JSONObject generating a String and using JSONObject's contructor.
+
         String str = jsonStringer.toString();
         JSONObject jsonObject = new JSONObject(str);
         
        System.out.println("Final JSONOBject: " + jsonObject);
 	}
-	
+```
+<h3>Using JSONObject</h3>
+
+```
 	private static void JSONExampleObject1() {
+
 		//We can create a JSONObject from a String with the class builder
+
 		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
 		JSONObject example = new JSONObject(string);
 		System.out.println("Final JSONObject: " + example);
 		
 	}
-	
+```
+```
 	private static void JSONExampleObject2() {
+
 		//We can also create a JSONObject directly without messing around with any of the other functions.
+
 		JSONObject example = new JSONObject();
+
+
 		//Now we add the keys and values in a similar way as the Stringer method
 		example.put("key", "value");
+
 		//As you can see, the first entry is the key and the second would be its associeted value.
+
 		example.put("key2", 5);
 		example.put("key3", -23.45e67);
 		example.put("trueValue", true);
+
 		//We can't add null values thougth
-		//example.put("nullValue", null);
+
+		//example.put("nullValue", null); //This is not possible
 		
 		 System.out.println("Final JSONOBject: " + example);
 	}
-	
+```
+```
 	private static void JSONExampleObject3() {
+
 		//We can also create a JSONObject with a Java Map
 		//YoU will need a Map whose keys are Strings. The values can be whatever you want
+
 		Map<String,Double> map = new HashMap<String, Double>();
 		
 		map.put("key1", 1.0);
 		map.put("key2", -23.45e67);
 		
 		//We create the JSONObject with the map with its class builder
+
 		JSONObject example = new JSONObject(map);
 		 System.out.println("Final JSONOBject: " + example);
 	}
-	
-	
-	
+```
+<h3>Using JSONWriter</h3>
+
+```	
 	private static void JSONExamplWriter() {
+
 		//This method works in a very similar way to Object  and Stringer in the construction of the JSON.
 		//The difference is that it needs a Java object called "Appendable" like StringBuilder
+
 		StringBuilder write = new StringBuilder();
 		JSONWriter jsonWriter = new JSONWriter(write);
+
 		//We behave now the same way as Stringer
+
 		jsonWriter.object();
 		
 		jsonWriter.key("trueValue").value(true);
@@ -146,24 +201,34 @@ public class JSONExamples {
 		
 		
 	}
-
-	
+```
+```	
 	private static void JSONExampleTokener() {
+
 		//A partir de una String podemos crear un JSONTokener, que lo podemos usar alternativamente para JSONArray,JSONObject
+
 		String string = "this is not a valid JSON string";
 		JSONTokener token = new JSONTokener(string);
 		
 		//Now you can use the token in JSONObject and Array the same way as a String
+
 		JSONObject object = new JSONObject(token);
 		JSONArray array = new JSONArray(token);
 		
 	}
+```	
+<h2>Part 2: Conversion methods</h2>
+<p>We don't need to have a JSON docuemnt to work. This project also admits conversions from other type of files.</p>
+<p>Secondly, we can also convert from JSON to those type of files.</p>
 	
-	//CONVERSIONS
-	
+<h3>Extra: Conversion to JSONArray</h3>
+
+```
 	private static void JSONObjectToArray() {
 		//We start with a JSONObject
+
 		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+
 		JSONObject example = new JSONObject(string);
 		
 		//We need a list of key strings like the reverse operation
@@ -175,67 +240,108 @@ public class JSONExamples {
 		JSONArray array = example.toJSONArray(keyStrings);
 		
 		System.out.println("Final JSONArray: " + array);
-		
-	}	
+	}
+```
+<h3>XML Conversions</h3>
+
+```		
 	private static void XMLToExampleConversion() {
+
 		//We start with a JSONObject
 		
 		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
 		JSONObject example = new JSONObject(string);
+
 		//We obtain a String with XML format with toString()
+
 		String output = XML.toString(example);
 		System.out.println("Final XML: " + output);
 	}
-	
+```
+```	
 	private static void XMLFromExampleConversion() {
+
 		//We start with a string with  the XML format
+
 		String string = "<0>value</0><1>5</1><2>-2.345E+68</2><3>true</3>";
+
 		//We obtain a JSONObject with toJSONOBject()
+
 		JSONObject output = XML.toJSONObject(string);
 		
 		System.out.println("Final JSONObject: " + output);
 	}
-	
+```
+<h3>Cookie Conversions</h3>
+
+```
 	private static void CookieToExampleConversion() {
+
 		//We start with a JSONObject
 		//The JSONOBject needs to entries that gives the cookie a name and gives the field "name" a name too.
 		//The Cokkie format doesn't support booleans
+
 		String string = "{\"name\":\"Cookie-Name\",\"value\":\"name\",\"1\":5,\"2\":-2.345E68,\"3\":'true'}";
 		JSONObject example = new JSONObject(string);
 		
 		//We obtain a String with Cookie format with toString()
+
 		String output = Cookie.toString(example);
 		System.out.println("Final Cookie: " + output);
 	}
+```
+```
 	private static void CookieFromExampleConversion() {
-		//We start with a string with  the Cookie format
-				String string = "Cookie-Name=name;1=5;2=-2.345E%2b68;3=true";
-				//We obtain a JSONObject with toJSONOBject()
-				JSONObject output = Cookie.toJSONObject(string);
-				System.out.println("Final JSONObject: " + output);
-	}
-	
 
+		//We start with a string with  the Cookie format
+
+		String string = "Cookie-Name=name;1=5;2=-2.345E%2b68;3=true";
+
+		//We obtain a JSONObject with toJSONOBject()
+
+		JSONObject output = Cookie.toJSONObject(string);
+		System.out.println("Final JSONObject: " + output);
+	}
+```
+
+<h3>HTTP Conversions</h3>
+
+```
 	private static void HTTPToExampleConversion() {
+
 		//We start with a JSONObject
 		//The JSONObject must have the minimun header for a HTTP request or header
+
 		String string = "{\"Method\":\"POST\",\"Request-URI\":'/',\"HTTP-Version\":'HTTP/1.1',\"Value1\":true,\"Value2\":2,\"Value3\":-2.345E68}";
+
 		JSONObject example = new JSONObject(string);
+
 		//We obtain a String with HTTP format with toString()
+
 		String output = HTTP.toString(example);
 		System.out.println("Final HTTP: " + output);
 	}
-	
+```
+```	
 	private static void HTTPFromExampleConversion() {
+
 		//We start with a string with  the HTTP format
+
 		String string = "Final HTTP: POST '/' HTTP/1.1 Value3: -2.345E+68 Value1: true Value2: 2";
+
 		//We obtain a JSONObject with toJSONOBject()
+
 		JSONObject output = HTTP.toJSONObject(string);
 		System.out.println("Final JSONObject: " + output);
 	}
-	
-private static String CDLToExampleConversion() {
+```
+<h3>CDL Conversions</h3>
+
+```	
+private static void CDLToExampleConversion() {
+
 		//We start with some JSONObjects with the same values in the keys but different values in the "values"
+
 		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
 		JSONObject example = new JSONObject(string);
 		
@@ -243,43 +349,66 @@ private static String CDLToExampleConversion() {
 		JSONObject example2 = new JSONObject(string2);
 		
 		//We need now a JSONArray with those JSONObjects
+
 		JSONArray array = new JSONArray();
 		array.put(example);
 		array.put(example2);
+
 		//We obtain a String with XML format with toString()
+
 		String output = CDL.toString(array);
 		System.out.println("Final CDL: \r\n" + output);
-		return output;
 	}
-
+```	
+```	
 private static void CDLFromExampleConversion() {
+
 	//We start wtih a String with the CDL format
-	//String string = CDLToExampleConversion();
+
 	String string = "0,1,2,3\n"
 			+ "value,5,-2.345E+68,true\n"
 			+ "value2,6,-8.345E+68,false";
+	
 	//We obtain a JSONArray with toJSONOBject()
+
 	JSONArray output = CDL.toJSONArray(string);
 	System.out.println("Final JSONArray: " + output);
 }
+```
+<h3>Properties Conversions</h3>
+
+```
 	private static Properties PropertyToExampleConversion() {
+
 	//We start with a JSONObject
+
 	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
 	JSONObject example = new JSONObject(string);
+
 	//We obtain a String with Properties format with toString()
+
 	Properties output = Property.toProperties(example);
 	System.out.println("Final Properties: " + output);
+
 	return output;
 	}
-	
+```
+```	
 	private static void PropertyFromExampleConversion() {
+
 		//We start with a Properties object
+
 		Properties input = PropertyToExampleConversion();
+
 		//We obtain a JSONObject with toJSONOBject()
+
 		JSONObject output = Property.toJSONObject(input);
 		System.out.println("Final JSONObject: " + output);
 	}
-	
+```
+<h2>List of all examples methods</h2>
+
+```
 	public static void main(String[] args) {
 		//JSONObjectToArray();
 		//JSONExampleArray1();
@@ -300,5 +429,5 @@ private static void CDLFromExampleConversion() {
 		//PropertyToExampleConversion();
 		//PropertyFromExampleConversion();
 	}
+```
 
-}

From 75894086e59d3b6ec23e35825c468fde5618366b Mon Sep 17 00:00:00 2001
From: Ian Lovejoy <ian@actualarchitecture.com>
Date: Tue, 27 Apr 2021 19:03:35 -0700
Subject: [PATCH 011/212] Fixed incorrect cast getting float from array Added
 test for getting float from array

---
 src/main/java/org/json/JSONArray.java           | 2 +-
 src/test/java/org/json/junit/JSONArrayTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 2a8a1d2..342b91e 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -326,7 +326,7 @@ public class JSONArray implements Iterable<Object> {
     public float getFloat(int index) throws JSONException {
         final Object object = this.get(index);
         if(object instanceof Number) {
-            return ((Float)object).floatValue();
+            return ((Number)object).floatValue();
         }
         try {
             return Float.parseFloat(object.toString());
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 1c04251..d0980ef 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -364,6 +364,8 @@ public class JSONArrayTest {
                 new Double(23.45e-4).equals(jsonArray.getDouble(5)));
         assertTrue("Array string double",
                 new Double(23.45).equals(jsonArray.getDouble(6)));
+        assertTrue("Array double can be float",
+                new Float(23.45e-4f).equals(jsonArray.getFloat(5)));
         // ints
         assertTrue("Array value int",
                 new Integer(42).equals(jsonArray.getInt(7)));

From 97023e1098d9afddb1b57aad5a7ea57b50732df2 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@sap.com>
Date: Mon, 31 May 2021 14:53:59 +0200
Subject: [PATCH 012/212] Fix Javadoc formatting in JSONObject and
 XMLParserConfiguration

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 8bbb874..82da3ca 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1627,9 +1627,6 @@ public class JSONObject {
      * implementations and interfaces has the annotation. Returns the depth of the
      * annotation in the hierarchy.
      *
-     * @param <A>
-     *            type of the annotation
-     *
      * @param m
      *            method to check
      * @param annotationClass
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index b9e752c..165a406 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -94,7 +94,7 @@ public class XMLParserConfiguration {
      * Configure the parser string processing to try and convert XML values to JSON values and
      * use the passed CDATA Tag Name the processing value. Pass <code>null</code> to
      * disable CDATA processing
-     * @param cDataTagName<code>null</code> to disable CDATA processing. Any other value
+     * @param cDataTagName <code>null</code> to disable CDATA processing. Any other value
      *      to use that value as the JSONObject key name to process as CDATA.
      * @deprecated This constructor has been deprecated in favor of using the new builder
      *      pattern for the configuration.
@@ -109,7 +109,7 @@ public class XMLParserConfiguration {
      * Configure the parser to use custom settings.
      * @param keepStrings <code>true</code> to parse all values as string.
      *      <code>false</code> to try and convert XML string values into a JSON value.
-     * @param cDataTagName<code>null</code> to disable CDATA processing. Any other value
+     * @param cDataTagName <code>null</code> to disable CDATA processing. Any other value
      *      to use that value as the JSONObject key name to process as CDATA.
      * @deprecated This constructor has been deprecated in favor of using the new builder
      *      pattern for the configuration.

From b48abe655853107a3705af11d8b401ade4a2385d Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@sap.com>
Date: Mon, 31 May 2021 15:00:29 +0200
Subject: [PATCH 013/212] Suppress java/unchecked-cast-in-equals warning for
 JSONObject.Null.equals()

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 82da3ca..131d02f 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -128,6 +128,7 @@ public class JSONObject {
          *         null.
          */
         @Override
+        @SuppressWarnings("lgtm[java/unchecked-cast-in-equals]")
         public boolean equals(Object object) {
             return object == null || object == this;
         }

From 8fa9be742c8ab89d6bfe74e0cdb74d7f122d597d Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@sap.com>
Date: Mon, 31 May 2021 15:16:27 +0200
Subject: [PATCH 014/212] Added a security policy

---
 SECURITY.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..5af9a56
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please follow the instructions in the ["How are vulnerabilities and exploits handled?"](https://github.com/stleary/JSON-java/wiki/FAQ#how-are-vulnerabilities-and-exploits-handled) section in the FAQ.

From 5bc8dae5d0c83ff7c6fec5045ce0c7eb1d9b7297 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@sap.com>
Date: Mon, 31 May 2021 15:24:41 +0200
Subject: [PATCH 015/212] Setup CodeQL scans

---
 .github/workflows/codeql-analysis.yml | 57 +++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..42e6793
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,57 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '18 18 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 20b4f85efeaf45b0f226ad7eaf435672587dbef1 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@sap.com>
Date: Mon, 31 May 2021 15:30:20 +0200
Subject: [PATCH 016/212] Updated build command in the CodeQL workflow

---
 .github/workflows/codeql-analysis.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 42e6793..b57d361 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,21 +37,7 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - 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@v1

From 8f3e5ade18dbd8bdbaad7a78d488fdd0163edfe6 Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Tue, 22 Jun 2021 19:34:22 -0500
Subject: [PATCH 017/212] Add logo image

---
 images/JsonJava.png                       | Bin 0 -> 15697 bytes
 src/test/java/org/json/junit/XMLTest.java |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 images/JsonJava.png

diff --git a/images/JsonJava.png b/images/JsonJava.png
new file mode 100644
index 0000000000000000000000000000000000000000..28c5c9cbca0f1fc0f4e023f5ff515a4de5ef0695
GIT binary patch
literal 15697
zcmb7rWmB9@ur|RpxCD21cUauro!}M-8a%kmqKj*=#WlEx#oY-O+}-8yy!HNob3V*H
z)gPv+r?2Yn>Aw4lQd5ydLncIqf`USmmy^=?*hfE>3nKi-xArbH>|^`nrXec<RXss`
z_#wdB0F(hxP<06?FXnI`GLnm&z8e(O=l=iJry=JuODHJeJ$WgB)(?}@9E5Bm?dA8p
zjKAY)jy~ri#SzpgQ|)pQa>?mpWr1oYgWbr%U65zwnvob}M*6hwXuSs}N@c`QJVc&Q
z3=R47&U;5sFYCK^zdRwER^R*e<z>A3?*Wh5V-q<UZs#KVk2$5;``JWb4Y|((J8E>>
zhl|9nkb=)UkR-{^`joP19}<>8{Z67}8U#oaL0m5t&n&Q$NaJcbOcB8hq*DAWU>QZM
z?+T$%{NEj!-d<>MX&ttlF%h#H_{tGA^zTk#cncyELp54$+-~`JwOj9XZbF6jQ2edH
zxZRV}5`tm3+FS)JVO`ReF|Kf}5;)jfp-okgx3c=xdEbIhJvlj<-qF!fdA4Qxg(aHV
z=*aiHlWybv?cVBe=GVew9&EOZ!1Wl{uHnX0+Rf?eA}lL%W9>*qr-3|~mpFs|mUHUj
z59~Vl;NPFDCUZsV&3d7iTb%QZyP4KxYfL&%NEH+mDiZe9h*-jz-Tl11TZQkIEUx~Z
z2k7!TuQNwUQNA7)z(Fsxc{sElmSpY33!T+=zZP*0l+7uw28vsbdIHf5rJ9e9t3@b%
z?_;#Iio46iSyvk|8CbFGjG1SelI7mlDM?li>m-1EI_qBbaDR~i<b%<;Ogn$QHs-Ij
zLA2KSTevLSjYu^x2%l4m5=0H)(FmzOOp~gTBPjoTcY5lk;Qy0b`+%TX^*rYcDV4P|
zPuQuNx9T`Bko=d22H&aS#E(NEgg^~1rmFNi=19{1qc}WCJXo`jv#$4ly+-riZs@2!
z!@438p|$dKX)dy~O>?iR<9<5Y=<Z(gSTuH>*VbKj=7%XQz@`}J+oe1YAm_9JLRQcy
zS3P|!1<FXWQ4@dFY8A^3YZU%clm&kBm->T>EpW>Ztb2-{sW`6B#tR~_1rCt~8kHz#
z(UJu`n4`Jjx~d@~BUik$&LpR&r74`RcUmpgnsa_z<NtsyrgLauC!oQJsLgU-5IB^F
zuU~YZQyc>=_RmR(gq${q$@K<NHNT;(jSy8T``=-@R9ek6OxMN?LRDkeWswxCfNXKm
zXF=t#k83tU!qJF!?pB@C`PP3F=?t~rS8KMiAU65lpV=FVAO{2iA`3(N=6m-`b38L&
z76V_?QAvfD;wh*RMuc63ucIMgXD0cDnD~oz8we`g+;1EaZKVx2g^B2Zk;QjGcg)9o
z2dQseD#co|n{7%B9}ww1cRXyzT;0s7j@Da^#&WNr5846A)z|jV2zGwb+kSbeBNg!h
z?e$6(#T`L+WOK;w-1$oFv0cEn<K37bYde^DM?tFiDrir4(GZun%~~O2t(0DCbXNtR
z<+QmoYm}!U_&Id0i+oZ~cS>ZA(2ew5u@iyU<9t@HPq(zS0R^7t91+=vwVtO2MCSM`
z29{LcF#KB7e4WNX9Io3@beU@8%x^v+E}8Z{KR>ySaSVZw!hh!Tn5YK}KgH593uz})
zlOt6bM&vL43?Tbz+vGaiT`vC8E@wC|EXq^^|C>~a6+Us}^~~#PT9#}$jm7X}o%mDm
z&P6iykL(!*C(vgSK|Nn_Ja|lQhMgep3?(k^W8a2UScNq7RA!K+dA|HqKA$PuRTz_S
zGV>8>2))n&a91p#a>ci#8IbR<m^z!zp#Nq#94x=8W&8cJr~&jRq!4V^`!@S|#%l%w
zC(JT(42;mX38C{8w@H!3P-ydEDZE9a_!K{{dlO*#23G5N3*|N55q(Y0GUy94q>z)r
zv`YtWyTrEMg~fIf-{c1%;3_!}@_gQH%5oCGd2z(8c=7w4=YcOk@x%SAjOnRlViVPi
zWV8{W`^+q-d$$+J==DXTX;DI;_h$Hc($Cr@cR<tj(G@Zfcq>~x5roX$9CH1}b&Xr?
zis3>7aQRdutH@1$$bnKLKo207oqu86H<rcg6djw1i;tgW5fiswXCdo*j-OWBw|^!S
zo1pc2#tcLtQ*V%ra!u5fZekRk#nP;Pj#;)joIHZzKE0k4W4mAXtr^P^TC8T0!$Fop
zB6SP1h?je_z*#}#!ovnNzift}k0JE!INT6`p>x&ZI&3o_rnz^1iT(ad-_$KXCFWN{
zA8dMG?+s`2IGmi5KbU+dw6kQ9(1eH~fmKPT`3Yny)t(!mZ@J({ayd7{)xZSRC{f^w
zQrg`9MEN@RLNKMOXnKC0`*#lWG%^13;r&(P(+z{fR-rM-<bETtJHy1*P&S;L;pLnJ
z)95mA()0lpt5uGW&~Yf91W#Qu1VDh#Z%a==b#ZOtqq);`Xks=14IRN?K&)T?sfd(B
z*k*#bVWWSH7q-i7f1*U6Tv_s`0K4Mp)uDZng{<tYTT~`~Q3Tj2;1@)sCF<oe05}wI
zmMV6*A@+t2H0&aGeSFN-pOKG(F)x%cfb}|>E0;-GZm?PH<nKktB9F#+`={RhOU+AP
zKZ98K#}uSaGpDX)-AA!RHSe3#njZBH>7p}^w+sUD^>_RBv<S3#y?SPo4!ym}JTgKg
zw>}=f2bXL8hjt3JFG-Jz9Rew8afQ(6>Jx(UI}=&bT|PPZ6T;tO@d-(bU<JQbLf~wo
z{Y-M!oWX%torWp=e35=fTJ!wIvxI+2tuTyA)!93<&v9r^I?yxqs-;Nw`FedGSe+un
zOUyC>pbRdXk+;`pDu0Nh_@Y)taAwilxF(x7#hnaerFB21ES_NMgvCG@JD?B>5}YjP
zd7_uqDMLUAO*^n~R91#3PY)tK{;Rq3G#Qy)6-vP=xke`2oO+eqS4_P3Wq?3Xe5diB
z^tX-`s?Xh9?Ex{U0RN-%(lIYHa+f|592c)x7q)wax%j?~Gm!w3x$_V>jY55Ll#=B?
zaYW-0%gs(%B<K$Nj=gLx=UCob9v(~c?~)dLg>C;&u}BF73B2qXc5%GE!XnuO-U!e=
z+NV1nAR7@<h_<Z_*D^c+zT8wJWmn0g>niPFv5bPUAKp83+Y6CO;_+&fZME#I(L!zM
z@5UPb*2d+(q1A!IV)^8qJ`}bT6xQG3AO0@f`g8<lsh1AO5~JTdx?J3ipKiuT>DxG7
zs7hWm@g09D^>Ijt`r>l;{faEW$Z~7OMfp|!UnCU@6&bec4uAt1URF3XHs0nN99Lz5
z6o=)JS{2@7ua-q|@pZ!&mR4eDXvRDlVlQuuu<4f^ul2fN*=}+n^S#ta(iJSzlO#n}
zV8eu<V)$ng`{Ytt5|5N@zpLT-p_<k`!sm9wmT&V0v~pO1TU@2aFM9-V&{i<tO4ZKe
zqI9@xV3dorS6+rU^6-}%dA>?qV-I`)S;#FF0ZJ^E4Eaf{B+R)@Nj;9_cxeR|o(+~C
z{R6_o$omNw0Nvy64t;_=^mKD*vGVW3NG+d&gxO%TpU>7i+m%_dUL}k2jfbVgXD{?q
z$RvZ58i`z1!W<-gCD$E?gL}+f;|Y)K48^9D31Bo!qB;cnM_&cAT?T+*2kCCY{o+GZ
z?6Dnj9KBH0Dt7Yj74R#t5xBG4=<gW%o$HG8Wo&j+@gLV}8kRL7k$>qM@5J~kv=xe7
zLHC&g2|6xnphuiN<lkAY_h6}c?qMv~MD2zq`faP*1Jdxu+%7jtnA;|i%wq(Ay=JZ^
z{lh0BZw@pJp};pY3${Y97SZYVgFhBQfD(r91Bqerg;X5c7rKZZ;h(m8Uiz2;P=qkq
z*Ig@@#U-KY@hURy%=)ZXQ+d(>cL?*GWb{FvKe|+!gL^tTh5+y!_qcQPIA<uFX08BA
z8`f4#GRn=l>kKmfGh#Y?)N3@f?ITpIu#K5NbBA=JNi>R;7y8;Vt2n_vHP|vyO2p?h
z2~XGS4?IpG))`mfrNE|@erQ=7eMIorU~{}FpgFm`OJ69G^(vnX_~$}}_8&C-!xjB7
z@{m|@f<3Iae8N3LF`UOd)2NQyF4EPLUm<hS1fdv7<Vyit9&i+Y)&viWlbNLlk?OIn
zmAK+%|FR8n)J-*mY~rZ{#-+Djs!e1Gx&^{{YbyG=WY1b{(#Vb6(;!oT_3WfP3s@Bb
zH3(yXV$}pBB||cnDx4V+=QEwB2)0cJdhi78B2s}FtP}GTGgU-nwqI;ntu!C4YvSCy
z-aig!AmrWGU`Om6yH!^HdeKIDk5y&TgsD7uz#Kyyahmb1i5`b;4x|H0qZXljP>G~K
zCa(ckKmTG497$k0GfH6}@7qvH!jiFubD-3Z(4BZ?5NKo+c(VmMu&Su`JrO3<^tAqB
zl773(hKzVbAehI~*C+BvosQ8HH|FK|t4JaC7G4vf2zF%Irz%dWH+*fx-y2U+n8Zy5
zGdnG)U%z@QWR^;Gy}JR)UjHa&=(h}GBa2P8qDwS1SdVkgxcmhG{=^arxE6Ol$@(KN
zBY9Y9z`$d5MKIt|NBK^AWqa>WNCFya7i<@+|0Y$)b|E`>u|B6jknH2@9>!~o$>-Mn
zO$br1+2YU=x#8jo>ZiPSSb!*a)W|M<;-QGoIrnjJ+xWVD#9*n%KloDdUyiGOl}#U-
zPm$@^3FJ?Rs=Uv#m6f!b?o=am+ypq@k(<-2fFHs#y1&5wkWM5~|FJ7#0Ead2(Vd9&
zwXS0+3}}3rH>-;Ez9BzLZ{+TYrHubwUZgGBD6kdcGCzgN-B=FOR9;7(pnSJNLzLVk
z@Lehqt|~Z60w>m1odAQ|(Tf|UL`E|aZmN}Lkg}AR>FRdUx18m#p!eZ^Mk8v^oZ0y3
zCtT>!1Rr(f2GeL^fkDM7tuK}Ei|6<zx)_eMx?i9OwlK};208>aD_O<yRzkPMB82E@
zY{LZ#f1G#fzdS)WM^wP6|2z@}-rb$$c~(}?Upfaz8<pn*dx;xb(^VtcWnuLX_{Z4r
zyv@ZTg8qw;*p;lw#a%zWEKz5-HagT#FGi){Z?yqa@sm3b&j5+7iB3w*jXP*4ReE#J
zgR-N|P(G!|3_f$H3lxr;TZ$MMr++mYIp~Gr)HdP%N?7N@DOw~G{sf>Or-jsyH|6&6
z$`>!<Vr8xgPj1fOBC%T%61|ZbGCyd3N{9pwY8ELrvl9P-WwsflZ^zIL>J2zFxN=?-
zIH4H%vY{JAETU1|iB+D-pRpr<EIwOlKy}qVB<!2xxX1X~BesnIm*M*v`D_UKq+!1v
zYXAG~(<Ge!Pw=9u67r(ip7ZPD*ATRFk-SbwRtN(kaKxj+n`3B?MW?%_&*5A$jw+a$
z`GT^Joe?H2-nuz+Sn%X|51IrLPwDRyY4jrvLSl;fc(y3@?V&Q=YOPDlpO8c#>P5<f
zm&z`TOJt7OuoJMW>dasoVb*=o*6l4V_u6-ie_&5h4dWNlEZHz+63<+%hTcACcGmV}
zyv1d5DvXBlH6Ym9IwamryB|ZpvH*CCqLk&&J{c1a+#Rojzo=KYy|gR{0bx*)<b6hg
zf$gnxj*fyjLSaV6)=eG1%u026Btulsa9UqSDd{SlXUmP-wy1oF`f9gb&nTUvzDf7Z
zGOM_R^eGWNG@;Z~W61Y&SH-aVO?Z9zVe}dwi=$)pbuSzk)^~f^t|z%vIF+YRdS^nP
zaRAD#mr+Iy!q{uomCnt1suNhKZQwy=$z+ZVwZ#?$qAt-V!(`<~$rXyY9~D4_0z%3<
zmSKsHbwuyK0N*?GcSaYz4WWRH*l?D<$GkGLpiB}P-hLJC$r^nlz!Zu43tU9t?a_R5
zFTy!jkRW1fvY~9wn_Iq<oQhTbBAHY^|M;%Nl{Y^H8f>V5eLh4RKN9t9A5Q+o3}d-o
zd$=&Pmv~lDp!mZy6i?FO98@L*`UkeKXn|qC^JJ*v-aNo;cCpGy_j?wE@7sljC<bCA
zF8mcFttz@)e_^FQl%iA2YZR%GDyEyio?Sg=FV3KPv*&)Al)S7J(&A>wq+a?i9M636
zBGJepR<o6v<!J^*QU7E8i+%GE`9EhucPfWS@{v(zU+mThjiyH1`YHX`Y*u8M(#KEg
zh*g|NK)zdf;2=6{K~W|VemT3}n*uQCuuPwTK)zETU6_I87VleY6P-%pV-}!KY(<mU
zoW8P5s{NwVjObH*fi`>ZL%a|ITvA=Q^;TaP&r#`bH>m2tv0C~)8>D~<sq=aK6247M
zq+4D6Ux8eJ;SLlb|L|3;@en*^JVAn?+$y8~M&umXW)>#Oh71sxO-qNlBL*H(z@Pr$
z2Q%)18+(R;=Wly_RwnxXfKTd3c8k?TRyY>Xtw6Cd{cNb`sJ@Nr90I*5)PO$z!l`g6
z-1005!%JfgJ#yp_Ab56ulxd@Pz-ptZ#NPBpq|gFCmtm%%^scCe1<DD{9JE!V{JJL@
zLxYkNtKU;8(rRWdp177)%>NiiavMzkrg{=M(f2gTN~P<h(3z6ZHs%M>(9p2I-@4<y
zcEE?lFSteF8pK2Z(DmY=1%-dN+)AA!2cooVvSq?u$GHfjv|pf*2pDyq;f^aq+Z5r?
zJc_TH#bbW4IEx;$3>-HSX>p;Cf;M2*KPXFO(p|Bnrus_2Zm0(a1e?3@-$_}n|JYEB
zw4_t8205kUlRR=_MofaD{>19FMcby6qK;$)AS_$h)qlQ`L2jfD2ofWKV-d$e8CpYX
zFwHkEh+86z_W!dqf+!Zciz*z~gBjLF@bh84VN%rL*ap&qLWK;6Vg7PcD(18}m$JF;
z>vg|p0s@aP#+7AEQx5k<LgW-m9JGof)Z^7b{=JYAr_W`6%imJYmGB?W5k8(awJl-C
z;p4g2NZ)TbwR?nJ)!3IIqSi@q><5mG8UxfqzNE>5{h5Ay`jNbKaxr6erP}m8Y!E=<
zZwp(*m6MNJJe4lbPlHx9*D(YwudY7Doq`uTa4*AV%#lg}E9p|evXJy%;W_!M+q5+P
zGBMtOlRXAbuTtmJ*989FwK~Z-JVm@hGY}GgzWN(-5qk*=VM%KbqFzDiMy>qLeL|Gq
za|Gqa6A<G3PJ8uoZ1VIP-L!6vn)1a>`t2nJ;&q1ay+gJRYp7Mox|$J3NIO%|>6t=!
zwuXJ*zr#o+AoYC(jzXp^MC!78UkGH(f8}WRd<3o;Ij-quW$V02!sQ-bb?$a@BB~sH
zJvAwh3A0WNbFj6?##f^u-0hf^nh;#hx^N1gwfs*_T8gOPFwC%cNf3K4q)-}^i4D>&
zF0bW)vz~9Li4?w}<C!GIYLy&zTSb@Zdi1ZUjo<w=FP>cLlf{W~iEMz62#Z<Y``Sq@
zIkO1FJd0_i^n(q?vsF3!cssm&)IpxQQ^+{@I)6_3sQah)f4{f%c6;v%%B^=?jWCT5
zc<eiWPMrVS*|6UptL?_jfA2~^y$#t`VsAu_x5Lrb`+}&i2UuFO<S65&y0IMo8eFC2
z)R$I0hQJ<mr%Hpd8~24$Q78Ijc^{J*RVr|$30uIw@ZJy4Q}VkRj;uwl|J^cgz0f;c
z&~8`A03x2KSD2^N?C<S&;Rm97KEkm4;c>nVM<NT19EXW06D78>I*Xwn4yGVq0ocwj
z(Rd&AVN8alj3n_YJ2^Lq@#HChzEOcCAKq49_cyHW8b=p4bfm<{`!7a<<VN;qvJ~mF
zC~1SzY}aUkC5&)HyshtY|6oPwA9}lwpR#pr)?4q#bT2KT?<g#gt_p$;!~L%6D(ss4
zMUia8rqCk92+%l4K<Xth)7$~#IIt04e67#CH;j6u%!J5@FWVNXr6kz$@-$=}NC3la
zoktSq-?2~BkQPH)dPEA83AQLu@8zRKx4xTvk|4zic=rwbp7$6dbY?P58XDo;d8;!^
zpG`OO;%eOIPz!Z$fR2H?(<{Z7G%V8Rz~+!v_Vjw5g~$@mT-?M?HBL<kjR~7`L`zB3
zw&m5_^GGb9Wf_Ug^JVb6V1!~}s0ZksfL8CRy|~}~l%Df@@V!f(p)<x8|CD{OB{X3e
zFgNb{N0>NB8kDa>^)QSf6T9iP#&ORVf*lsQxY%{avzme)mo$9y^+f?QzY;a&hNFtt
zh{^^ECVV}YM!(QQsCFN)B+#gJc&X(yZOd)2)*tI~(tY1~KAgg!8Osk~Z_D*LD!(cs
zdxa>~?Q!>mBG=j^E#JO6^S#0;N-sEH#B-R-S15Sv8@S9=5zk`Qt04rQxCnN*A+YUQ
zz1TX-Y>4>rtnM?<&|-wJvk|6OIWUX?I0A#q38{mrLVRzt3^4lr)7yq+Eke*6hadOz
zoTY|$rv6D_?L5q4Q-bH5ub-_{uu%!=uO3G`5zyx8cz+giifX(Use(-*U0(s+s@;<C
zJp<n>3fS&eTFR%sLbgMLG4`EW{#siTkPyKdk{Ema^|(8cfBUAwH3rxn!+N=603f2X
z8MD+|Wu+(8CA$;Q#KDl1!*q|Y-=9)&iVp+Aoyxnso+<ctl91fVH$%fRd?`_~Y$-y&
z8%heWY|+IsHL?tL4yEjJ{G@ilx|L8A!e+xxq}@vfSxD4I-94HUN+9)B`hlV{&}^M4
z6HXF{u{JL2JHMp3i*Gmmr(rNVyTaR%Zg<l2S^K1h(ZL$|6z#_2gqI_=<2SCcAUyX$
ziQcYlQ7@OiEjd8lFz@Lm{IiJNRO&Z1^YGk9EbD_P!laE|ZnTEifK!RpuYCZFfCMDp
z34wi3xMzXaShZu3$yyC?z-uGm;k=U~KR{Ok@VA3|o7miz!?M64!zvt6RroU0qyBwn
znjD1SekF3hW|8c*bn_maZ%ht#O<P<urPD~lM8YvI7k}e`Wx~-!U~4PM2?v?;G(RL3
zZX~E@NAHQ{N|>d!qC%7rp*`%n`NfuzArn1Hkzr~_;j&{+q=z`*+m_oW9x@yqm{fK5
zpeq$)`$aHiIzhI<JRu@Tg%)`LaoC}H)*<+=XWy*<GoC$1LDZc%j3&8a^*Cpdv@Kp_
zaOdlMO~8C33Y8@W2(>gXpl!|n{;%uH<xpvYH5Aox5NG*U{FWPfqA-ws<qyN#Ku+)C
z7n5Uo^^Jhrn_DNnIF8N<(83^C!RE<UB;Q&yb-}dBD^Kh2F}U_;c&0|(XObJ@!$<(m
zZ|C_XZ6Po3+Y<C=^X@${8iNiekv{kFPb>Tddo7u%b$ygIub;P?8WHQoKQDasyUyCE
zY;FlLyUU#Hei&pk(D^2#R|IwwvM5OryYJ8=U?OP#9;q$=7J8|{e~1-@$sUR20;>x5
z+wTe`3G|k$Yg)w!re1GP$1(8%?x2yb<*O;D3LfCHbuy+pckG6R34ebhxC9Nfd88Ij
zn$UQ^J~4jh1Qmux?Xx9bb&J_8l197VdiT#GbnHk(-5;Ex5$3_#{`)IL-Rc;$L&772
zP?vZUZY>o<j-s9uLFyw%`eXBx;v0$yXBX0=hS>A+<XCSF*C>D0r_XP1m;w(G-Jq#Z
z$;o6T`8SS#zjh2;6yBDmr?Fvtlw%(d-XF?{{dOi-${i<0A?Km`#~RRszV6A}Y=6nC
zMBT~<2ouqAjOsK-0<Q8g!=KAI>StIhl#x}0v}^A1hL2~3ir9ZOI|8qU-YBfPA3Iw-
z$?a1Xo_{jav;-($C5Y*K)elX~g1cF5juRwMPJM~8k?+uKkyKcdlpU4%DFEX+B-<bQ
zJu4E8$igB5`>hh&K-PYcQQq&OK<jjcM%&6hJ`7JJ4_V#ySAcGl8g9^Q;<b>O!7kc?
zv$c+P>s#8!V%c$iar1e~K(@C+B}{JZBEr+_&K0gs#b^7RM%lPymSj*;tJ#=s)T$dh
zWhmJcJQ1(L?sLNlrlGlqHojBHTpL=_gG;<U?|fe#4uRhRjFVxxL(7|WkGU#dA#bQq
z1|1?-H<UU%XDmneQS48OlTbymnWq$XTD1%X6C*gk2(1YnfO$lUoSSktxOkk1TTMB%
zh<Z<=I_L?bYhas3qshYN71HM+nKti0Q!Y`RI$uFF@O+!xf!R-;R=TfB28KJ*z-Dc=
zkNfETvFqvPYn^V;rMji=_)dYQVPqNrllt2F1+Tn{&*l-Ik=IP08YDyeGno@%8e(q$
zDb-5@;jmHbH+L2VENY<lk=~8UXLPZ{+wxU@#T_W7m3#K8M#@yW(J>GVQKn#MhPfSz
z6fZcZP=~7T3p%*`RbU^htq^IN^+T=Dz6z(;N4Viik_~RtI=IxWXqFWo5c^pXtuXtC
zw})LikRAy}edJEjb(&bd<37{=>~5v2s^PeucEDU2uMzo>XeXqOns*GAYAxz9)k!b_
z*T8DrK)%enJo-i(dTO?W_gnMEToV@$u;JxW7A*2NDn^m)HYk44SAHz#Jmc#!bW*vD
ze7St2btO$DBR?qcv0n@9aRky&Bp+RHB7JNPcZAKmc3$7kNCW{QqM3ZEv~lgbSWW4p
z?2?<5Et2>QUQ3cRUfE^S?AfoCJ`>RJTcDF8>o;SBDgATYLyDxOC@beVwnstgrt^+L
z)DT~)Si+F-&)#Xf@FtA_z45MBfiu5Kc3ikbs{JD)(5LeJg#@!Tvtz*13z<X3{x(nT
zE&N??yoVsb5Wb$>jM{oUZLVUTHkJqKkez~|mv;&5#Aj0tTtG45=F*UN0>dO_b0{<B
z`D$4%dfIthHer!*uN^b31l@c+qo`EQB#7YAUt$i*k%JVX%`z5SZ<cPZVSfTAGaJax
zFPtW2^Qjh7nn6=g^B=rE`A}?cmi_7j8g&^d)6<~rnQ84G@C^K5{Z}_+D<b$5=C7JS
z;SzgNU_c3*$kXalhi`=fs7y6^P6S|`uMWjvNCU&%%KN{;{Nd&4h2Dt4#V_BO)!il$
z3Y}B`W#ApBHKASwDn}zkk<;)LM`+wl`td4Io_*!jnf7}pk4t|0HG)u}B89(v{5bW(
ze&S4wJ7CUS5f1_|_!Ikui?W532Ki4P9kP0@<4Y=adoQ`Wl=jO{=F^pm9<;RIT?-@j
zTJ54u-;?hRDJ9f%Bt@hde;3Irbm&fE1Zf_qYJNl_Xs*b8x;Z!z`~ZckBI#K2!w}Jf
zeGD$=6N0Ga+|n;AfUq_0If<&6Va<21@={5J`Dn>17W?@k7{GkVcoOwe0ij?$8X*$Z
zh%A}hu4aPV?x?C<rJ?ii`weaq-<D-(;HzUVvwR1Sw1#48<I}oQA8N~*7Qf@L1S>(j
z$Z()}`NPi}v}VB(M%=t<xiH~6vx4Hr{{FFqAMXK4Vm>JY?d}Ufm7cR0Z_2C>a<bg7
zB2*4IH!YXBBFv0<f^0?U(KU$%<r9LRJxkg!VCO{{c)AhIv+}eRBX3vcZ$`=Z7W_(-
z$jcHzJhB>KNm9BpCoEmf>dnx9C%DO+h%4lEwsr9bPri*`HG>@FX|=AwfBc;*v|g^+
zl2$q;kyX0&42*A_eMJ1JTit`SRNlaXPh>~p+~QZ^@o5j6K%Ys9G;yxYT56P>NTfg5
zK1I#egF9a-unZ$Sr>1LF#PR0U<WFs5XdjP@i?lYcw81+Ggast*5Ny|O_DjA17)*-3
zsti~oWq9J37mlJvD#=1#S^~j7@O!dRyUHt2NutyM?vpMV9j<g`u#V@rC4yE&C6!u}
zRTi}tSFxwJohVQKp5gk>E)AC%q!M$M!hL6${BzCF8V-sEv_wl78U_1NnR#keg)ppO
zZ8x}mBictBqq3FiWa|Acx>QxsN|<%hVX-sRVWMBw-xhNZ8`Dv(ZLqg%=b4%HDBB5U
zV26Y8dSUzPylC}|#eZX8&#CAFYG_;x$f#V`K|nzRw6x$li_TO@z`;EtpKbvAsv+%{
z#3Fm!?m+`wxeit5NgR}z847o);uPl45~_lYep7iCV^UI)1_$S=fjRXwZ7T}G>4br#
zUrC^M;Jl$^&&~Po&!S^<LyfsFz<!$b)`t5|D3HTPgxY@;R)*bE!J5rY9w1^{B3AE}
zUbGKXYJ8UOxQ>2gt@9+g{cWG|so$M_7EloH>ts)yW@#=ORuvC{L78Rj$@ut9YyEEt
zY+P!oPcDBeWRHk6wXuJDNcAX{wDiNbEPlqgeGbp{)p(@Pj*&jAWyzKR`N$^aY*z6q
zqWqN%U_I-8B&27e6RAdc^Fx704LV6TJYmPXLj6jX*s4pT%GXW2p&}vJS{X1!ex*g^
zc~1NIz(g~MH{PFuiYo_CI;KwPhWV<=RwkKe&^<#-+#2AQ+%Y|ru~4Srl>Fl!cb40m
zicYT5%}e!I_OA`sb}bdkj(AqSHpl{r3MDfvN^a(|VTHt0C_Rx$;#=?+TiZtQ^@{?N
zrPQeLYU6R#C_q|12KX?jGojX!JMV^gj~RRy6C0i3-2~yP=@Z>22$tVLPKvmcubEaF
zBE{^5jj$X+Q7iMLi6KXffyGij{=53teBt%pb>~%U(%5K)#jNR6dXM3AsxKLc0=z%d
zh-=bpifCR2{nIvVo=>>R<g3zl>Kc40BA5&)sNwqm8Z+H5#b)0A`|xO}dT|_Ds)kI%
z-bKAeDUtyUY$YMag}S00@FN8^Z^gx6yF2iuXee<c`%Obx>r^e-e8G{8GUZe3)FV~6
zH+Bl(Kt!BZ=5a2qDz||cN6<g-s|vhWj6lX_r#*>vFbP-Jgb}*~42`$zqr$oHo7>?A
zwMQn>9}QR$^sVcT0!gLWg^Kizv)e+qZ&8x{1s+UD+y2_gc6Gkg&p$O?NvcvRiC5bV
zlVbKGPc#F$mLeh$Jrq|c;MLi4ci_y~hx%wKhv7n)$Li+3z-ej$J0dj|eH8OWe?FRT
zX>dn*s0AhM(+^urP{M}#PBTlDa(=pwnQrqbWJi?Iy2I*;K)jSC=;i3ea4A&d>2cZt
zmoIkbrM+$4KAQ#n8PhjWF{ni&CwWs?fo-_A-;+rD;p}7)I*<O^2}hE~n!J<gkr6_&
z{PWu5gwk6UoRGAkpn<YqmiI@zI6$krSD~<Xg^fdgB9}F)#gr2bXCYxcu0Ni6CwM$p
zWVQJYiK|!6?r^atPg%<Pd1q@U8aIt2#>og}M-z>-%qkIcFh2+1rYIZ$({WEhA{npa
z`W8G^L_FZIXma%@0oSgS%2Vz=bIMMnKuRZhGBP+&>zGiB2&Y^;fzVF9*5ECb46&uT
z)UN-vX<V({l*ZUkygNaDsBR*MdDHw9OSrpBmMJODDWfM&s?wu;hs?Kahr})VvxI#n
ztGXM9dU>XD(;LISeB~n4{7(BX*CVcvJll^FJ!hZ1H)t;Xk<xHb_er~HP%%Q|a3g~O
z*|C{nK*MA6s|3_lgQ@9}4^*(M7uM%@Vd1*rG@1G98TE`oYO@m`i7j;62Sar4+m+8I
zbA%E2jknb?EJF_97Vb@f#j0t4r)`>reyPGJS2R!e^&3qE33+tV#LCas)cm}`^WT5W
zj~dGJw&_Tm62*dLlNo}7Z;ziVjN4i2Wj4uwoZiYPA>h#{1z}M+pIkQgfbGHfvBN|h
zDp#t)vae<9loj8TMsKqnA)b-nmlEOJVuod#&%RGaqC$VIEr(99w2+Jze8oK#e+eoU
zY+71sk}3TCL}xrNrk)HArvlgTqSO>I#x&Uj!+hq3#1owg*=Ki%vBNuk>?6Qa90*t)
z@cuFAmg*dS-1n_r5(7I)zt(AudN&SvG@ReqZ<`=CG0@$TzIAwEvabtRM>jn`k-`JF
zyLCzEuNnhlqFbB4Pu<%}JHP~!WUP?G8tFv)Drw6nogjW5aKCUUh3N^^q*-XlE9Ony
zGAe-4_Z`-S9z;l(n$~DKgu1N)nO=T+EXW<PR2b2oC8<<Wkl4_4(%h=0Krw*Bjx}Oe
zsx=c7l>#K!V)9y2AnV{Ch)?dBVjhWSsRkKWi^lA01t{ThP3jQ^i(zm~+dLXGGSiN!
zPql562+H+-ACl|v7#`Zc=;cI_tE4VkHl~uYiCMu_kXh+_7kXVS)U~Hwk+RfF`x&wj
z!eEnJ*ZT=Fp}lK|JM#py7>=$>^7fgg%_}Zy`PzM8QZ$6{EBTZaF4A&Ww~@}bzf6Yr
z#5bW?zD!P3kN;G(k{Hd6ej6b)>-o~$a+E6gJ@8*Uy(}8)08?&-?nZ+>gm!Nect^Nd
zvOG!DpvyggZz>l5LFrn%ORt)ZY={|!N74UddmyU$(y)X@iiBB{U`TXqZ@<$%!B1m_
zqxZ*Tnc~)=#M4oREq^EDPVWX2b4bRC@mO)<B*_wgpIcgnIl57cC%<)46|VYM?56EC
zL{Iy11Gc6To$wmul+i6pNpgk$BOXAbLgydqFMj~!AXI{WZC`e?-_KrQHI2G?F&BLM
z<#3&MuPc9)?y7A72Hdu!GXAhXCXPt1mfD$imeCg=BP_mFs`_C`vQed`8eMW4gPhuW
zl;vms)Y?Xj@+1dXjWJ2ocjcor1uLZz$1DE%63wR~^tcMbjmRrI;@%Qz&g)Ep^G|`-
zN0j=F<}LmUIA!?y7-rm1!OD^Nn!`>rcsOTIKQ}ZMiJUvkL!(?zma{YI?&{~&a~yPk
zlWL6U^L@=|Ym#-B!#G|T96g``OySD7(-63E;w8~Y;B<(|@T3ugAGJgT@aJKDs&=w6
z7{VVhDis4!w)8sf+{m8<rkNBOC=~Ec9BDB)PW9l$6Z`r47NBl74aakjA9c)&?KLaz
zm*xwdcvgB=%wvi@&r*I2-K`U5)IQI;QKzxAKnUJ+wTKQ<A=R(AS3`Vh!+%u+=+Tw*
z$+>jD@qKdEtqj$6^C-2?aC-hs_^H`;xsi>6=uT&(EeF9;QXA-az^kRB)dZwj{XBw9
zv;54|Je(qMYy}Qz`K_Icdaxoxi+aGkPxjXk{%B)zLXU>+aDTVLqp+<+6ynp5+y&3D
z^fr6?Yg7hHm^qRJ)!PKIL_J4>7<!?i*8PFW^f6k*pP#>byK#i2WsQ<=%_T&{iIM6z
zO;yA8t)1&;E*aPqv;LbT0EANzllmZQvq;SN6BSwkG*=SWB-!#4*y=>Y@HV2X;r^Eg
zi%AC!XK#S1V$Oy!a8H2Yd9Y@j8x@%!J3UM{Kqk8T0q&NfZE0;J=zN1I^}H+nO@`3N
z*~n{aURPlnEib*J>*z+Nhti2_J^j^dqiC-X*$o6So47qH*uQ^f>f)Wc{(fq^Kjlpm
zP_$D1;I^o6nci)=!XKLgnLMjkcpNnx-5C@(woJDV`*s@rOIbar&B%MEt5{85lN|2x
zJ6F!gNOJwY*{_quKId{yl`Ol%<pL?08+*3DtLbu!&4V+F8~E39?3r3@{^z~O-ZD)K
z{;K0?$+EYJ=K<Co?sl5Q0wtC)l@Mroy>f`)k6Zv`-8d1>N!$bvSUwqW*MJs)g>$U^
z_OdTF+Ihe35QxBo;-J0cmF}dE^kp#vMF!z~naQgAHH7%(Z$FQJ5IMgJl7qaLuqM;-
z=G0N&b@6TBTH2j|9|8)mznmYx;peq`F19topVH&Bq;xbb{(r~7(fcKkAcTOes#w%U
zI)jQ^V=sl?j8bo4En+_I2wC7q6Xq$#1>j|?L{yyM#zNDw@zqe6Llrl4;p=Ogg=uRV
zvOxaZh$szo07@P%SXHY`%6!shQ{b5Yl)&mcjk=P-;lB3@9*sh5vqB}WL3D~O@juSr
zbD_BwMVUScN`{P@)-|a$0Y1e>o{oW4S&(vFFG*mk*0n8y5_Pl6>lS(-y=JLOQ)H@d
zBky_O+jZXR>~HqbBN)QO{i=&lBjOi!?AW=qQP%b`PmMAAb7LnSMLW~lo@^V3LHem+
zM5>zJ?RXn#Hwt^!0;ImibeOJaWpYlym!wro2I{driy6!#D}O(i0{r`e?l>^5P5rD=
zEh;$_@WHHke~C|*NUdg_kKtKfscy5djl1kq!C58MOCqV0mHS5gOqG9~eL|?aHX2u(
zv+tMr($3h!S@l2n=gim$UclspBgRtVdE<DZHT^#a_X$VKCh#5(V8UN|(J0r-D7)qI
zN37_1k>b7AWYwvB_)bZRsnn%t$KR+&-BFe)&sn9P&JDy}mcNs53O{UyG-IG}p(_7F
z7>TN7TMgp8vT3K_8=!oTkyXCFF`C%bb?3hfjjZ{-jr`v*Si@>J|6lLa8s+3@e3Ppg
zj?BVeoI%qy{z8gEb!F-Yk2j!o)znP0G+pa1`6sG~XazPgu#Kv~Lrb8XeN$$_-ddm$
zS-dB>VInb@OAB0Vv+5AUt5%x6DLKeB>EpENuxK5$K;|qPnLd7A*py>j{ids)ku=OW
z7nt2FWnHt*+Mx3-xh2gJ7<TNHIax3Hn$EL&KN|7$rSHA)iBuEcF{PZ$DbWsvZ)A-}
zsMz9If~)^`Q>Xnl%ldCaliY3-lDCv>k&5(eq2?CMX}jD%lttD6kiOq-OZV$I=_9cW
z4pccg3KL<&Jo8I<l<bjJ%kU-@HTy1m_fpbr1-N=d5L#w*d4lG8FDsdFS>aG+wCjf$
z7_L)=`=@j$Xb91c3<f*@0m1Ux^Sl}X8u!R!751o)Mnk|q+#YV8oi|AD+Lz-N6Ge{>
zn?v6|AFZ(l3zjSr*4{9J@<#NS-hA_SW*hGYG)K|Ietut09)9xoSD|5nBHs*)_oqJP
ztKdxKgzgrNfY%X;$HVLErm^Jr=cBLQ5+t|ybCcfMQS6#IKH0tj2@LRvl9Q(Gn!M+%
zTnJ<h$9<RnzjTL^XlEJ8XKc3E_ZIun#hArj4^>ZraG0h%z1H;?2x1RGA`jtfRc#-g
z!BsU!=dQ;R%xUyU2@t_-Ld4O9C|H<X3DkPM({q2uLsqbGfJR_96@d3=yo9C+iv;#U
zNCFP93Wp8Wdri}^$+lN-rmt;KS`O(>i7xdRpiA89rh662yTPpjUsZWY@HUolR%!Sh
zFS6{Aw7xRQCo|~`2faVmX?5JSnYhVO6%RXL|5|PiT5pFF?1P8x^yExcJe%U>KR2p5
zLwy~@rI~Z=vso?|MTMSx?zB(adP&!%J>7qxJ5?~yZ;Xl5|0G(71r_*9OPQk)o?^fA
z=-sxa!aL0-2udM*mJbnVX`W)Ei<_H&JHk{0io$^#W5xTr)l&P1IvGZ#lNIirulq4h
z<Sf4FP6cdcU8e&VT#Na8HJ)dco``|q#MJ0+HqV#JA7kaWB`$uM+K}%&rZ!k+%(^?O
z`WLSwGH#mQF&4v%>7v{ve)atwOgvOjL^OlF>$-2Zmp_k>mXKb~{f~&dG%szc)ZB?h
zPu8bC4-Kh-*f0}dZ)k|d<%^=mU5u%M>*dS}VPtQizah<?-QN3;LPLZbrbegTxy85(
z^APxJ`7m8$iouo_vi1mreKaVFp{+peaWJp+BWI(p5Eb-hw9)94lpMnzZgHQ!^I}`7
z^vuI*7v%O(EC$4bO*tH_FHLa&hse26S}$XaX`!b`{jB3!Wi^Su?9&<pIqV)@*W`KN
zyKhWILFd}OEqxkt1B&RR{(qE?(?jEBTO5Q1y_DCZ7LCi3Yu-Q&O@iC1_~J)8Vz#RH
z>s1rzuO8`^!I?Z+Eh9l>?^2AW{^LZ(ueYwRf+P6Z?CR0om)Z<!8#F)G?QMmyFqXWI
zTRQzA!4jn<w8iXI|LA^Ug|K@K^L4XUO)LVlJ~5mSBaU}<)|(F7z9ElBglx>Z)$X+F
z9WxS$si0p_ofpX+c+{VjoCHM_Z|5a<4$qR$b&rUh>Dl=Yoi>yG%p2pz>_h!c_=KZe
zZ}!UC`Uvzod7<+4NW_}Q1L-}Y+E>UYJxO*&T$||RCcYX7HZdd>J$s~Z$=oD%<tR!b
z^<_}{<o814{P)CyRa(f_*bU&eXx)kLjNAiI<Pk+A+f3h|7VmCYBeysB(E~#TvPRju
z*GP#zse@X|(bX#@^(#g{GrL<~wD_>D!iC+S@wWCfj@Gja$ZHg|C~H7v%PNy_0yQ1v
zbjA`fN6S=1GapGPGCr;7$XxxrtDj2-z;x2<Sz-WyTAWx&)QholW_m<r7@Q7yiwzO$
zhTp4v(O7;}jW6~oH4bq{<cjTCQ6~SbB<%T1L>Q{?`9Z@VL9oo~N?Hj{yg!{YIQwl`
zi5y6mQRf$9pK*KCUYT5KQ=LXP7wC-~D7~SY(+yZRR)8`~$6}zBY-{1UR=Taq=|`VH
z=>6fOASKi9(v#sXRaP{!i)pFE+N?r@4Z63b-ZPyd5Vnf8#UBO=^QY!q(0vR;0ARXc
z)Y)q;zPoHv5GTYEi1;)DYfZ4Tef$x>sMn6@61?{B>rByx;pd+33LOem&NeU@;7>3)
zsM=?#+8uOq5vioropO^|hZi4%SBgIK8zNg_SIxRLtPd2LRp2@W>A*U|blW+51I2a1
z;0yLC`PF_rQm<M!3&N1cV2x_N|J)poaASFFNaLM3-(18*qrzv^*J6I2zt`*XP8c(2
zGA;qvPU<)O&1GLJ@~_J<0;&58rj8tllI-l5|J{8ldWMw#xk>tm;FXF5BQ$zgA>y*c
zmOG`(O0cNQO1vmLLA*TM2N{HWp!57XD-N>5+4~+@j0r_gzF!lS$l)G)ICyqz3)`qf
zFhy8ApFBIbAdS;(xXWPtAgC((SR59f=X)j~bVfQ2&)zO)OtB3oU;Q!9JPI#9I;U6!
zC9~tS`s<}Ua0Ra@u@tXSh1Zk*X^e*VqX~W;K@o0ta9f{>6_rsiH9f1tT45*o<frwz
zo>NXs8T`jFz*r5?gU;CTqOltEN2wN3>yjWUP?QeIb7*n8X`v@Z=L^5uaogCaHhA)9
z@#ZIm6HB`;3@73fx>JNKGwpHjd`TN`heMs#`wW4rhnv(tRUb~!D1bf2vi&*sjsI+H
z^In}LM1Q{9jp)ldI4AaOb$HJL-phf>U$7<3gv4OA(!czPuZKI*1iEG?3MeJub*i%5
zb)GNqVu^^uSa8Imh#5&8GfQZTOiMb=YA!C6PctQv7>&3%mcdnZ!3ThD=IYxCrk+Fj
zLXM<5*m<|&u={jelb)<1Snfmmi-K=R5REqw3=$qhX@@_ax-b5VpY2|VlkKUnH|0Rk
zC@7<Yg*CiIxvhn=f>-xDQxOJXDY(AO(JEw}&W>LxI~;2j-7i+1s@P@bSDFeL!zLoS
z8<VOSQ!}3dh7lQ9e7>gVJPJYcssXBfk&B*2RE;yd>C<WTy(FI7d=H@BI<QZPu0ELW
zT*OwQ)8|;!+iMw*2i!a|w!3QinAXYLBC%ZCFjgPIcOq=Yb(!Uvs;^%<gy+0uRYHIr
zKbwB&toto_xuRUhdDVv2#M^2Fi=n-drT!)@&H#aAu^EI$&^hXW%9#`f%=@cJ9{b*U
z4Im4@x214xBZs3UC@?EDQK14rLu3U}9ro#zGc9{VV%WO$;86+8-jMbkrs#WaQ^1e+
zjrOTt>(?J`1d+L_ebx>+<=RVGo91UKC``otBoM*l0USImj}tO&MJrC~4upe7e7@Of
zo$D(iLFjxc`~WNeGpe1(Q#sa92MSm-a8gMGU7#L;1h_(~L8D&LhceM*Ce^tr-aU$C
z!F79~i0CBS7__pW!EarBL%1d@Q}!?5WRsP%Adqez<0uhKYyK_F9lt(~Vya#_xBM<Q
zY0IAmLq2J&+{N)S{I3i#3e)lVU5fU~iAXU$%au}9vvd_RuwF}<jeG2d#&B$mXs#;9
zzOH1N^~*TBiuh968rwp<g+zfgz4|6!wKzs!k1eW(j$Xu7>!iQRx3)uCf%li|IBr(v
zwX&?~iQa66_v4LDrN5gU!JhOvW0W;IM>U~Uf6K7_OohU1LYGvoihsdoyI`xNwO0t}
zuwU}eLfa-9$hDvw0>3US*KgI@QU#ZVJ;oF=(RzdN%Gpk4ZVlv|83K>=om<_WTIM&M
zWnM7*i!bUGJ7C9Z9l$6??F;<^OO7>Zp5OQ9Jn5$Z<+f8$hlP7;-K@X%Y*5eV*T>iu
z?Y_*+`=y$Y7%KAd)W}&JmIvN11e47gj@Pf-``jM%*sSk^>?C~}lZzT}<|ZMq;{9d;
z%DPTGfv2CJPkvJvTPk&{%(TWmb>&*j+FGW{MR|%FnptD2(59n^!6B^Mq5I*FF%i3^
zy=g2lU=5Lsf7;R$n%tpL=RypowZl4SMf#F1_Ne4Dn%~26sRNfYwALhe?-+GYX}QME
zPGxerJ-VJ5V7(;y6!aR733-{OnoSO%m~t4<s`wEQ-EwG5uit3<s-%IZtRbdoN+qvC
zRJm%l!V{*7J5%*QR9u8(;ulnfA-%dlWWY8W$yCz8oO<4Q&f<q+f~6R`+L$JRSiO(Z
zZaolhIeaTL-?8#r_O86S_Ld$ODJzlMz#2?1kjKc#nu;Ws#FCNEY@f>Jedu!;D41Ho
zJE^%?K>kgC*hy<v9IH`JDrTNYA2=9PgQXD8|3EL*HpL4v#enCEf#A{NUQ^`=dGUVD
zH$EcyTY+w?#)HYCMM!)~(m2Q-!yK0zRT(aEJTx|HD`;1Wg%{7=Ph6(BI?D;e=?;_Z
zzh`l1hJ&;sKI}lG0lT>TZ1zz}^y=}d&1km-y^$but7U1_pi%x5HV@~BLH}McT%f$w
z*L8>wqkL$+Pw@#k<dFap%#c=Io&|kNiL!aje`JgGg7fylOqqpt!qg$Ovi=~b^rxyF
zJhsAC7jZ0ZA5FTmdd0U*{Hvj=U{%|A$}FsI%MY%i8*yQ+BD1UhC+yk!f})jNus~RA
zxMjLG%Z+rT{J{-=(3Qp(Koi(;*`fNsQ-uLL?=WOiMZCCGm2w|6XefDU6{%_ov*7;$
DUpsi{

literal 0
HcmV?d00001

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 62ee516..acb1ca0 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -65,6 +65,15 @@ public class XMLTest {
     @Rule
     public TemporaryFolder testFolder = new TemporaryFolder();
 
+    @Test
+    public void what() {
+    	String s = "<example><value attribute=\"value\"><![CDATA[some treatment <b>plant</b> with bio chemicals]]></value></example>";
+    	JSONObject jo = XML.toJSONObject(s);
+    	System.out.println(jo.toString());
+    }
+    
+    
+    
     /**
      * JSONObject from a null XML string.
      * Expects a NullPointerException

From 0200c984cc71b5e018916b2e3efe0a65452678d8 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Tue, 22 Jun 2021 19:41:31 -0500
Subject: [PATCH 018/212] Update README.md

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

diff --git a/README.md b/README.md
index ef8a472..40bcbfd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+![Json-Java logo](https://github.com/stleary/JSON-java/blob/master/images/JsonJava.png?raw=true)
+
+<sub><sup>image credit: Ismael Pérez Ortiz</sup></sub>
+
+
 JSON in Java [package org.json]
 ===============================
 
@@ -5,6 +10,7 @@ JSON in Java [package org.json]
 
 **[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20210307/json-20210307.jar)**
 
+
 # Overview
 
 [JSON](http://www.JSON.org/) is a light-weight language-independent data interchange format.

From 76ec2fe5a2bc0cddafcedadd4a37342502cda027 Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Tue, 22 Jun 2021 19:46:33 -0500
Subject: [PATCH 019/212] Revert accidentally changed file

---
 src/test/java/org/json/junit/XMLTest.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index acb1ca0..0155472 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -65,14 +65,6 @@ public class XMLTest {
     @Rule
     public TemporaryFolder testFolder = new TemporaryFolder();
 
-    @Test
-    public void what() {
-    	String s = "<example><value attribute=\"value\"><![CDATA[some treatment <b>plant</b> with bio chemicals]]></value></example>";
-    	JSONObject jo = XML.toJSONObject(s);
-    	System.out.println(jo.toString());
-    }
-    
-    
     
     /**
      * JSONObject from a null XML string.

From f91d0c8a52d0ec7bb52e56b5aec2e6658d6cbdab Mon Sep 17 00:00:00 2001
From: Niels Frederiksen <niels@forecast.it>
Date: Wed, 23 Jun 2021 15:15:00 +0200
Subject: [PATCH 020/212] New JSONObject.optJSONObject method with defaultValue
 parameter

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 8bbb874..97a6df8 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1370,9 +1370,21 @@ public class JSONObject {
      *            A key string.
      * @return A JSONObject which is the value.
      */
-    public JSONObject optJSONObject(String key) {
+    public JSONObject optJSONObject(String key) { return this.optJSONObject(key, null); }
+
+    /**
+     * Get an optional JSONObject associated with a key, or the default if there
+     * is no such key or if the value is not a JSONObject.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An JSONObject which is the value.
+     */
+    public JSONObject optJSONObject(String key, JSONObject defaultValue) {
         Object object = this.opt(key);
-        return object instanceof JSONObject ? (JSONObject) object : null;
+        return object instanceof JSONObject ? (JSONObject) object : defaultValue;
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2e296f0..0d5acdd 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2404,8 +2404,8 @@ public class JSONObjectTest {
                 MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
         assertTrue("optJSONArray() should return null ",
                 null==jsonObject.optJSONArray("myKey"));
-        assertTrue("optJSONObject() should return null ",
-                null==jsonObject.optJSONObject("myKey"));
+        assertTrue("optJSONObject() should return default JSONObject ",
+                jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
         assertTrue("optLong() should return default long",
                 42l == jsonObject.optLong("myKey", 42l));
         assertTrue("optDouble() should return default double",
@@ -2440,8 +2440,8 @@ public class JSONObjectTest {
                  MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
          assertTrue("optJSONArray() should return null ",
                  null==jsonObject.optJSONArray("myKey"));
-         assertTrue("optJSONObject() should return null ",
-                 null==jsonObject.optJSONObject("myKey"));
+         assertTrue("optJSONObject() should return default JSONObject ",
+                jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
          assertTrue("optLong() should return default long",
                  42l == jsonObject.optLong("myKey", 42l));
          assertTrue("optDouble() should return default double",

From cfbc306673ba3a4bec76ef6607db6401beb9c09b Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Sun, 18 Jul 2021 10:32:49 -0500
Subject: [PATCH 021/212] Fixes Issue #611 JsonObject.similar() returns after
 number entry check

---
 src/main/java/org/json/JSONObject.java           |  4 +++-
 src/test/java/org/json/junit/JSONObjectTest.java | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 97a6df8..6d7d340 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2092,7 +2092,9 @@ public class JSONObject {
                         return false;
                     }
                 } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                    return isNumberSimilar((Number)valueThis, (Number)valueOther);
+                    if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
+                    	return false;
+                    };
                 } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 0d5acdd..39c020f 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -100,6 +100,7 @@ public class JSONObjectTest {
     @Test
     public void verifySimilar() {
         final String string1 = "HasSameRef";
+        final String string2 = "HasDifferentRef";
         JSONObject obj1 = new JSONObject()
                 .put("key1", "abc")
                 .put("key2", 2)
@@ -119,12 +120,16 @@ public class JSONObjectTest {
                 .put("key1", "abc")
                 .put("key2", 2.0)
                 .put("key3", new String(string1));
-        
-        assertFalse("Should eval to false", obj1.similar(obj2));
 
-        assertTrue("Should eval to true", obj1.similar(obj3));
+        JSONObject obj5 = new JSONObject()
+                .put("key1", "abc")
+                .put("key2", 2.0)
+                .put("key3", new String(string2));
         
-        assertTrue("Should eval to true", obj1.similar(obj4));
+        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
+        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
+        assertTrue("obj1-obj4 Should eval to true", obj1.similar(obj4));
+        assertFalse("obj1-obj5 Should eval to false", obj1.similar(obj5));
         
     }
     

From c6089e53f553b1432e047a53bb13d6bdd999d26d Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Sun, 18 Jul 2021 19:53:23 -0500
Subject: [PATCH 022/212] Fixes Issue #611 JsonArray.similar() returns after
 number entry check

---
 src/main/java/org/json/JSONArray.java           |  4 +++-
 src/test/java/org/json/junit/JSONArrayTest.java | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 342b91e..1e6a8a6 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1383,7 +1383,9 @@ public class JSONArray implements Iterable<Object> {
                     return false;
                 }
             } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                return JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther);
+                if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
+                	return false;
+                }
             } else if (!valueThis.equals(valueOther)) {
                 return false;
             }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index d0980ef..eafda51 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -87,6 +87,7 @@ public class JSONArrayTest {
     @Test
     public void verifySimilar() {
         final String string1 = "HasSameRef";
+        final String string2 = "HasDifferentRef";
         JSONArray obj1 = new JSONArray()
                 .put("abc")
                 .put(string1)
@@ -101,10 +102,20 @@ public class JSONArrayTest {
                 .put("abc")
                 .put(new String(string1))
                 .put(2);
+
+        JSONArray obj4 = new JSONArray()
+                .put("abc")
+                .put(2.0)
+        		.put(new String(string1));
+
+        JSONArray obj5 = new JSONArray()
+                .put("abc")
+                .put(2.0)
+        		.put(new String(string2));
         
-        assertFalse("Should eval to false", obj1.similar(obj2));
-        
-        assertTrue("Should eval to true", obj1.similar(obj3));
+        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
+        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
+        assertFalse("obj4-obj5 Should eval to false", obj4.similar(obj5));
     }
         
     /**

From 4e0faebe62ebe4d067d6fd97530a569d672ab524 Mon Sep 17 00:00:00 2001
From: John Aylward <john@johnanddalene.net>
Date: Thu, 22 Jul 2021 22:54:46 -0400
Subject: [PATCH 023/212] fix javadoc errors that prevent compilation in
 Eclipse

---
 src/main/java/org/json/JSONObject.java         |  3 ---
 src/main/java/org/json/JSONPointer.java        |  4 ++--
 .../java/org/json/XMLParserConfiguration.java  | 18 +++++++++---------
 .../java/org/json/junit/JSONPointerTest.java   |  4 ++--
 .../org/json/junit/data/ExceptionalBean.java   |  2 +-
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 97a6df8..a8cfbb7 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1639,9 +1639,6 @@ public class JSONObject {
      * implementations and interfaces has the annotation. Returns the depth of the
      * annotation in the hierarchy.
      *
-     * @param <A>
-     *            type of the annotation
-     *
      * @param m
      *            method to check
      * @param annotationClass
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index a3d1c1a..f1f7f33 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -188,7 +188,7 @@ public class JSONPointer {
     }
 
     /**
-     * @see https://tools.ietf.org/html/rfc6901#section-3
+     * @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
      */
     private static String unescape(String token) {
         return token.replace("~1", "/").replace("~0", "~");
@@ -268,7 +268,7 @@ public class JSONPointer {
      * @param token the JSONPointer segment value to be escaped
      * @return the escaped value for the token
      * 
-     * @see https://tools.ietf.org/html/rfc6901#section-3
+     * @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
      */
     private static String escape(String token) {
         return token.replace("~", "~0")
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index b9e752c..af3093b 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -94,7 +94,7 @@ public class XMLParserConfiguration {
      * Configure the parser string processing to try and convert XML values to JSON values and
      * use the passed CDATA Tag Name the processing value. Pass <code>null</code> to
      * disable CDATA processing
-     * @param cDataTagName<code>null</code> to disable CDATA processing. Any other value
+     * @param cDataTagName <code>null</code> to disable CDATA processing. Any other value
      *      to use that value as the JSONObject key name to process as CDATA.
      * @deprecated This constructor has been deprecated in favor of using the new builder
      *      pattern for the configuration.
@@ -109,7 +109,7 @@ public class XMLParserConfiguration {
      * Configure the parser to use custom settings.
      * @param keepStrings <code>true</code> to parse all values as string.
      *      <code>false</code> to try and convert XML string values into a JSON value.
-     * @param cDataTagName<code>null</code> to disable CDATA processing. Any other value
+     * @param cDataTagName <code>null</code> to disable CDATA processing. Any other value
      *      to use that value as the JSONObject key name to process as CDATA.
      * @deprecated This constructor has been deprecated in favor of using the new builder
      *      pattern for the configuration.
@@ -182,7 +182,7 @@ public class XMLParserConfiguration {
      * When parsing the XML into JSON, 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)
      * 
-     * @return The {@link #keepStrings} configuration value.
+     * @return The <code>keepStrings</code> configuration value.
      */
     public boolean isKeepStrings() {
         return this.keepStrings;
@@ -193,7 +193,7 @@ public class XMLParserConfiguration {
      * they should try to be guessed into JSON values (numeric, boolean, string)
      * 
      * @param newVal
-     *      new value to use for the {@link #keepStrings} configuration option.
+     *      new value to use for the <code>keepStrings</code> configuration option.
      * 
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
@@ -208,7 +208,7 @@ public class XMLParserConfiguration {
      * been the value "content" but can be changed. Use <code>null</code> to indicate no CDATA
      * processing.
      * 
-     * @return The {@link #cDataTagName} configuration value.
+     * @return The <code>cDataTagName</code> configuration value.
      */
     public String getcDataTagName() {
         return this.cDataTagName;
@@ -220,7 +220,7 @@ public class XMLParserConfiguration {
      * processing.
      * 
      * @param newVal
-     *      new value to use for the {@link #cDataTagName} configuration option.
+     *      new value to use for the <code>cDataTagName</code> configuration option.
      * 
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
@@ -235,7 +235,7 @@ public class XMLParserConfiguration {
      * should be kept as attribute(<code>false</code>), or they should be converted to
      * <code>null</code>(<code>true</code>)
      * 
-     * @return The {@link #convertNilAttributeToNull} configuration value.
+     * @return The <code>convertNilAttributeToNull</code> configuration value.
      */
     public boolean isConvertNilAttributeToNull() {
         return this.convertNilAttributeToNull;
@@ -247,7 +247,7 @@ public class XMLParserConfiguration {
      * <code>null</code>(<code>true</code>)
      * 
      * @param newVal
-     *      new value to use for the {@link #convertNilAttributeToNull} configuration option.
+     *      new value to use for the <code>convertNilAttributeToNull</code> configuration option.
      * 
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
@@ -262,7 +262,7 @@ public class XMLParserConfiguration {
      * will be converted to target type defined to client in this configuration
      * {@code Map<String, XMLXsiTypeConverter<?>>} to parse values with attribute
      * xsi:type="integer" as integer,  xsi:type="string" as string
-     * @return {@link #xsiTypeMap} unmodifiable configuration map.
+     * @return <code>xsiTypeMap</code> unmodifiable configuration map.
      */
     public Map<String, XMLXsiTypeConverter<?>> getXsiTypeMap() {
         return this.xsiTypeMap;
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index f1b9684..a72af3d 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -120,7 +120,7 @@ public class JSONPointerTest {
     /**
      * We pass backslashes as-is
      * 
-     * @see https://tools.ietf.org/html/rfc6901#section-3
+     * @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
      */
     @Test
     public void backslashHandling() {
@@ -130,7 +130,7 @@ public class JSONPointerTest {
     /**
      * We pass quotations as-is
      * 
-     * @see https://tools.ietf.org/html/rfc6901#section-3
+     * @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
      */
     @Test
     public void quotationHandling() {
diff --git a/src/test/java/org/json/junit/data/ExceptionalBean.java b/src/test/java/org/json/junit/data/ExceptionalBean.java
index 72d6c0c..91067b8 100644
--- a/src/test/java/org/json/junit/data/ExceptionalBean.java
+++ b/src/test/java/org/json/junit/data/ExceptionalBean.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
 /**
- * Object for testing the exception handling in {@link JSONObject#populateMap}.
+ * Object for testing the exception handling in {@link org.json.JSONObject#populateMap}.
  * 
  * @author John Aylward
  */

From c03054b1a6b2633525f26d7d234b1a259db4c456 Mon Sep 17 00:00:00 2001
From: John Aylward <john@johnanddalene.net>
Date: Thu, 22 Jul 2021 22:57:15 -0400
Subject: [PATCH 024/212] Add test to show bug

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

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 0d5acdd..cec27a9 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -126,6 +126,8 @@ public class JSONObjectTest {
         
         assertTrue("Should eval to true", obj1.similar(obj4));
         
+        assertTrue("should eval to true",new JSONObject().put("a",1.1d).similar(new JSONObject("{\"a\":1.1}")));
+        
     }
     
     @Test

From 579784d73efc940bf806480817388d225e07de40 Mon Sep 17 00:00:00 2001
From: John Aylward <john@johnanddalene.net>
Date: Thu, 22 Jul 2021 23:13:19 -0400
Subject: [PATCH 025/212] correct error in converting doubles to big decimals

---
 src/main/java/org/json/JSONObject.java        | 25 ++++++++++++++++---
 .../java/org/json/junit/JSONObjectTest.java   |  3 ++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index a8cfbb7..73d499a 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1159,6 +1159,18 @@ public class JSONObject {
      *          to convert.
      */
     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.
+     * @param exact When <code>true</code>, then {@link Double} and {@link Float} values will be converted exactly.
+     *      When <code>false</code>, they will be converted to {@link String} values before converting to {@link BigDecimal}.
+     * @return BigDecimal conversion of the original value, or the defaultValue if unable
+     *          to convert.
+     */
+    static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue, boolean exact) {
         if (NULL.equals(val)) {
             return defaultValue;
         }
@@ -1172,7 +1184,14 @@ public class JSONObject {
             if (!numberIsFinite((Number)val)) {
                 return defaultValue;
             }
-            return new BigDecimal(((Number) val).doubleValue());
+            if (exact) {
+                return new BigDecimal(((Number)val).doubleValue());
+            }else {
+                // use the string constructor so that we maintain "nice" values for doubles and floats
+                // the double constructor will translate doubles to "exact" values instead of the likely
+                // intended representation
+                return new BigDecimal(val.toString());
+            }
         }
         if (val instanceof Long || val instanceof Integer
                 || val instanceof Short || val instanceof Byte){
@@ -2132,8 +2151,8 @@ public class JSONObject {
         // BigDecimal should be able to handle all of our number types that we support through
         // documentation. Convert to BigDecimal first, then use the Compare method to
         // decide equality.
-        final BigDecimal lBigDecimal = objectToBigDecimal(l, null);
-        final BigDecimal rBigDecimal = objectToBigDecimal(r, null);
+        final BigDecimal lBigDecimal = objectToBigDecimal(l, null, false);
+        final BigDecimal rBigDecimal = objectToBigDecimal(r, null, false);
         if (lBigDecimal == null || rBigDecimal == null) {
             return false;
         }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index cec27a9..5529032 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -126,6 +126,7 @@ public class JSONObjectTest {
         
         assertTrue("Should eval to true", obj1.similar(obj4));
         
+        // verify that a double and big decimal are "similar"
         assertTrue("should eval to true",new JSONObject().put("a",1.1d).similar(new JSONObject("{\"a\":1.1}")));
         
     }
@@ -942,7 +943,7 @@ public class JSONObjectTest {
         assertTrue("-0 Should be a Double!",JSONObject.stringToValue("-0")  instanceof Double);
         assertTrue("-0.0 Should be a Double!",JSONObject.stringToValue("-0.0") instanceof Double);
         assertTrue("'-' Should be a String!",JSONObject.stringToValue("-") instanceof String);
-        assertTrue( "0.2 should be a Double!",
+        assertTrue( "0.2 should be a BigDecimal!",
                 JSONObject.stringToValue( "0.2" ) instanceof BigDecimal );
         assertTrue( "Doubles should be BigDecimal, even when incorrectly converting floats!",
                 JSONObject.stringToValue( new Double( "0.2f" ).toString() ) instanceof BigDecimal );

From 8680b10716970e17a7e5448b4b8d83339ab01773 Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Mon, 26 Jul 2021 18:07:38 -0500
Subject: [PATCH 026/212] merge from master to pick up #616 and add one more
 test

---
 src/test/java/org/json/junit/JSONObjectTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e98c419..9ddbc2e 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -130,10 +130,13 @@ public class JSONObjectTest {
         assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
         assertTrue("obj1-obj4 Should eval to true", obj1.similar(obj4));
         assertFalse("obj1-obj5 Should eval to false", obj1.similar(obj5));
-        
         // verify that a double and big decimal are "similar"
         assertTrue("should eval to true",new JSONObject().put("a",1.1d).similar(new JSONObject("{\"a\":1.1}")));
-        
+        // Confirm #618 is fixed (compare should not exit early if similar numbers are found)
+        // Note that this test may not work if the JSONObject map entry order changes
+        JSONObject first = new JSONObject("{\"a\": 1, \"b\": 2, \"c\": 3}");
+        JSONObject second = new JSONObject("{\"a\": 1, \"b\": 2.0, \"c\": 4}");
+        assertFalse("first-second should eval to false", first.similar(second));
     }
     
     @Test

From 8ca8a8075382780b1fbf5307f8c5154fe6a27ef1 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 25 Aug 2021 13:56:44 -0700
Subject: [PATCH 027/212] Fix some typos

---
 src/main/java/org/json/Cookie.java               | 2 +-
 src/main/java/org/json/JSONArray.java            | 8 ++++----
 src/main/java/org/json/JSONObject.java           | 6 +++---
 src/main/java/org/json/XML.java                  | 2 +-
 src/test/java/org/json/junit/EnumTest.java       | 2 +-
 src/test/java/org/json/junit/JSONObjectTest.java | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index a43d1ed..1c5fb78 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -109,7 +109,7 @@ public class Cookie {
         // parse the remaining cookie attributes
         while (x.more()) {
             name = unescape(x.nextTo("=;")).trim().toLowerCase(Locale.ROOT);
-            // don't allow a cookies attributes to overwrite it's name or value.
+            // don't allow a cookies attributes to overwrite its name or value.
             if("name".equalsIgnoreCase(name)) {
                 throw new JSONException("Illegal attribute name: 'name'");
             }
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 1e6a8a6..7e95a96 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -385,7 +385,7 @@ public class JSONArray implements Iterable<Object> {
 
     /**
      * Get the BigDecimal value associated with an index. If the value is float
-     * or double, the the {@link BigDecimal#BigDecimal(double)} constructor
+     * or double, the {@link BigDecimal#BigDecimal(double)} constructor
      * will be used. See notes on the constructor for conversion issues that
      * may arise.
      *
@@ -792,7 +792,7 @@ public class JSONArray implements Iterable<Object> {
      * Get the optional BigDecimal value associated with an index. The 
      * defaultValue is returned if there is no value for the index, or if the 
      * value is not a number and cannot be converted to a number. If the value
-     * is float or double, the the {@link BigDecimal#BigDecimal(double)}
+     * is float or double, the {@link BigDecimal#BigDecimal(double)}
      * constructor will be used. See notes on the constructor for conversion
      * issues that may arise.
      *
@@ -1157,7 +1157,7 @@ public class JSONArray implements Iterable<Object> {
      *            The Map value.
      * @return this.
      * @throws JSONException
-     *             If the index is negative or if the the value is an invalid
+     *             If the index is negative or if the value is an invalid
      *             number.
      * @throws NullPointerException
      *             If a key in the map is <code>null</code>
@@ -1180,7 +1180,7 @@ public class JSONArray implements Iterable<Object> {
      *            String, or the JSONObject.NULL object.
      * @return this.
      * @throws JSONException
-     *             If the index is negative or if the the value is an invalid
+     *             If the index is negative or if the value is an invalid
      *             number.
      */
     public JSONArray put(int index, Object value) throws JSONException {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 5f7a260..761df1d 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -645,7 +645,7 @@ public class JSONObject {
 
     /**
      * Get the BigDecimal value associated with a key. If the value is float or
-     * double, the the {@link BigDecimal#BigDecimal(double)} constructor will
+     * double, the {@link BigDecimal#BigDecimal(double)} constructor will
      * be used. See notes on the constructor for conversion issues that may
      * arise.
      *
@@ -1613,7 +1613,7 @@ public class JSONObject {
      * @param annotationClass
      *            annotation to look for
      * @return the {@link Annotation} if the annotation exists on the current method
-     *         or one of it's super class definitions
+     *         or one of its super class definitions
      */
     private static <A extends Annotation> A getAnnotation(final Method m, final Class<A> annotationClass) {
         // if we have invalid data the result is null
@@ -2236,7 +2236,7 @@ public class JSONObject {
             // This will narrow any values to the smallest reasonable Object representation
             // (Integer, Long, or BigInteger)
 
-            // BigInteger down conversion: We use a similar bitLenth compare as
+            // BigInteger down conversion: We use a similar bitLength compare as
             // BigInteger#intValueExact uses. Increases GC, but objects hold
             // only what they need. i.e. Less runtime overhead if the value is
             // long lived.
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 805a5c3..b7f0c8b 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -532,7 +532,7 @@ public class XML {
             // This will narrow any values to the smallest reasonable Object representation
             // (Integer, Long, or BigInteger)
             
-            // BigInteger down conversion: We use a similar bitLenth compare as
+            // BigInteger down conversion: We use a similar bitLength compare as
             // BigInteger#intValueExact uses. Increases GC, but objects hold
             // only what they need. i.e. Less runtime overhead if the value is
             // long lived.
diff --git a/src/test/java/org/json/junit/EnumTest.java b/src/test/java/org/json/junit/EnumTest.java
index ed2c87a..6867123 100644
--- a/src/test/java/org/json/junit/EnumTest.java
+++ b/src/test/java/org/json/junit/EnumTest.java
@@ -93,7 +93,7 @@ public class EnumTest {
 
     /**
      * To serialize an enum by its set of allowed values, use getNames()
-     * and the the JSONObject Object with names constructor. 
+     * and the JSONObject Object with names constructor.
      */
     @Test
     public void jsonObjectFromEnumWithNames() {
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 9ddbc2e..94c3e4b 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1678,7 +1678,7 @@ public class JSONObjectTest {
         // correct implementation (with change of behavior) would be:
         // this.put(key, new Float((Float) value + 1)); 
         // Probably it would be better to deprecate the method and remove some day, while convenient processing the "payload" is not
-        // really in the the scope of a JSON-library (IMHO.)
+        // really in the scope of a JSON-library (IMHO.)
 
     }
 

From e29c541353ede045b85849af9c8646d69a60373d Mon Sep 17 00:00:00 2001
From: Pedro Machado <pedro.baptistamachado@ntu.ac.uk>
Date: Sat, 28 Aug 2021 21:28:31 +0100
Subject: [PATCH 028/212] Update README.md

corrected the backward slash into forwarding slash
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 40bcbfd..7825759 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ The org.json package can be built from the command line, Maven, and Gradle. The
 
 *Build the class files from the package root directory src/main/java*
 ````
-javac org\json\*.java
+javac org/json/*.java
 ````
 
 *Create the jar file in the current directory*

From a526b41b677f5a2fce82bc062e683fb784465c78 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Tue, 5 Oct 2021 20:56:25 -0500
Subject: [PATCH 029/212] Create CONTRIBUTING.md

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..d81ff61
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,22 @@
+# Contribution Guidelines
+
+Feel free to work on any issue with a #hacktoberfest label.
+
+If you discover an issue you would like to work on, you can add a new issue to the list. If it meets our criteria, a hacktoberfest label will be added.
+
+# Who is allowed to submit pull requests for this project?
+
+Anyone can submit pull requests for code, tests, or documentation.
+
+# How do you decide which pull requests to accept?
+
+* Does it call out a bug that needs to be fixed? If so, it goes to the top of the list.
+* Does it fix a major user inconvenience? These are given high priority as well.
+* Does it align with the specs? If not, it will probably not be accepted. It turns out there are gray areas in the specs. If this is in a gray area, it will likely be given the benefit of the doubt.
+* Does it break the existing behavior of the lib? If so, it will not be accepted, unless it fixes an egregious bug. This is happening less frequently now.
+
+# For more guidance, see these links:
+
+[README.md (includes build instructions)](https://github.com/stleary/JSON-java#readme)
+
+[FAQ - all your questions answered](https://github.com/stleary/JSON-java/wiki/FAQ)

From d284c81e1620d60b4379036427df8a7a16549fcf Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Tue, 5 Oct 2021 21:01:55 -0500
Subject: [PATCH 030/212] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7825759..cfa4921 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,9 @@ The files in this package implement JSON encoders and decoders. The package can
 
 The license includes this restriction: ["The software shall be used for good, not evil."](https://en.wikipedia.org/wiki/Douglas_Crockford#%22Good,_not_Evil%22) If your conscience cannot live with that, then choose a different package.
 
-**If you would like to contribute to this project**
+# If you would like to contribute to this project
+
+For more information on contributions, please see [CONTRIBUTING.md](https://github.com/stleary/JSON-java/blob/master/CONTRIBUTING.md)
 
 Bug fixes, code improvements, and unit test coverage changes are welcome! Because this project is currently in the maintenance phase, the kinds of changes that can be accepted are limited. For more information, please read the [FAQ](https://github.com/stleary/JSON-java/wiki/FAQ).
 

From e89649760278329a51cd000483ad5c7d9a36b457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Lengrand?=
 <42970493+loic5@users.noreply.github.com>
Date: Fri, 8 Oct 2021 16:35:55 +0200
Subject: [PATCH 031/212] Create CODE_OF_CONDUCT.md

hello i propose to create a Code of conduct :)
---
 CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..7b83acd
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at jean.bisutti@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

From cf43419015af4dd3dcfa0e217efab8c521011c0f Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sat, 9 Oct 2021 10:14:47 -0500
Subject: [PATCH 032/212] Update pipeline.yml

replace hardcoded Ubuntu version with "Ubuntu-latest"
---
 .github/workflows/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 98ee6c1..ce91174 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   # old-school build and jar method. No tests run or compiled.
   build-1_6: 
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         # build for java 1.6, however don't run any tests
@@ -38,7 +38,7 @@ jobs:
           path: target/org.json.jar
       
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         # build against supported Java LTS versions:
@@ -71,4 +71,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: Test Report ${{ matrix.java }}
-          path: target/site/
\ No newline at end of file
+          path: target/site/

From b4bbc586443eb15a817ccce93469e9468c4e5c7c Mon Sep 17 00:00:00 2001
From: sreekesh93 <sreekeshsbkv@gmail.com>
Date: Mon, 11 Oct 2021 10:42:31 +0530
Subject: [PATCH 033/212] Refactor JSONPointerTest

---
 .../java/org/json/junit/JSONPointerTest.java  | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index a72af3d..9a7225a 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -41,6 +41,10 @@ import org.junit.Test;
 public class JSONPointerTest {
 
     private static final JSONObject document;
+    private static final String EXPECTED_COMPLETE_DOCUMENT = "{\"\":0,\" \":7,\"g|h\":4,\"c%d\":2,\"k\\\"l\":6,\"a/b\":1,\"i\\\\j\":5," +
+            "\"obj\":{\"\":{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some other value\"}," +
+            "\"other~key\":{\"another/key\":[\"val\"]},\"key\":\"value\"},\"foo\":[\"bar\",\"baz\"],\"e^f\":3," +
+            "\"m~n\":8}";
 
     static {
         @SuppressWarnings("resource")
@@ -57,7 +61,7 @@ public class JSONPointerTest {
 
     @Test
     public void emptyPointer() {
-        assertSame(document, query(""));
+        assertEquals(EXPECTED_COMPLETE_DOCUMENT, query("").toString());
     }
 
     @SuppressWarnings("unused")
@@ -68,12 +72,12 @@ public class JSONPointerTest {
 
     @Test
     public void objectPropertyQuery() {
-        assertSame(document.get("foo"), query("/foo"));
+        assertEquals("[\"bar\",\"baz\"]", query("/foo").toString());
     }
 
     @Test
     public void arrayIndexQuery() {
-        assertSame(document.getJSONArray("foo").get(0), query("/foo/0"));
+        assertEquals("bar", query("/foo/0"));
     }
 
     @Test(expected = JSONPointerException.class)
@@ -83,38 +87,33 @@ public class JSONPointerTest {
 
     @Test
     public void queryByEmptyKey() {
-        assertSame(document.get(""), query("/"));
+        assertEquals(0, query("/"));
     }
 
     @Test
     public void queryByEmptyKeySubObject() {
-        assertSame(document.getJSONObject("obj").getJSONObject(""), query("/obj/"));
+        assertEquals( "{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some" +
+                " other value\"}", query("/obj/").toString());
     }
 
     @Test
     public void queryByEmptyKeySubObjectSubOject() {
-        assertSame(
-            document.getJSONObject("obj").getJSONObject("").get(""),
-            query("/obj//")
-        );
+        assertEquals("empty key of an object with an empty key", query("/obj//"));
     }
     
     @Test
     public void queryByEmptyKeySubObjectValue() {
-        assertSame(
-            document.getJSONObject("obj").getJSONObject("").get("subKey"),
-            query("/obj//subKey")
-        );
+        assertEquals("Some other value", query("/obj//subKey"));
     }
 
     @Test
     public void slashEscaping() {
-        assertSame(document.get("a/b"), query("/a~1b"));
+        assertEquals(1, query("/a~1b"));
     }
 
     @Test
     public void tildeEscaping() {
-        assertSame(document.get("m~n"), query("/m~0n"));
+        assertEquals(8, query("/m~0n"));
     }
 
     /**
@@ -124,7 +123,7 @@ public class JSONPointerTest {
      */
     @Test
     public void backslashHandling() {
-        assertSame(document.get("i\\j"), query("/i\\j"));
+        assertEquals(5, query("/i\\j"));
     }
 
     /**
@@ -134,30 +133,30 @@ public class JSONPointerTest {
      */
     @Test
     public void quotationHandling() {
-        assertSame(document.get("k\"l"), query("/k\"l"));
+        assertEquals(6, query("/k\"l"));
     }
 
     @Test
     public void whitespaceKey() {
-        assertSame(document.get(" "), query("/ "));
+        assertEquals(7, query("/ "));
     }
 
     @Test
     public void uriFragmentNotation() {
-        assertSame(document.get("foo"), query("#/foo"));
+        assertEquals("[\"bar\",\"baz\"]", query("#/foo").toString());
     }
 
     @Test
     public void uriFragmentNotationRoot() {
-        assertSame(document, query("#"));
+        assertEquals(EXPECTED_COMPLETE_DOCUMENT, query("#").toString());
     }
 
     @Test
     public void uriFragmentPercentHandling() {
-        assertSame(document.get("c%d"), query("#/c%25d"));
-        assertSame(document.get("e^f"), query("#/e%5Ef"));
-        assertSame(document.get("g|h"), query("#/g%7Ch"));
-        assertSame(document.get("m~n"), query("#/m~0n"));
+        assertEquals(2, query("#/c%25d"));
+        assertEquals(3, query("#/e%5Ef"));
+        assertEquals(4, query("#/g%7Ch"));
+        assertEquals(8, query("#/m~0n"));
     }
 
     @SuppressWarnings("unused")

From f03eb56071e6dec9723c346ffee7964d1fe3a90e Mon Sep 17 00:00:00 2001
From: sreekesh93 <sreekeshsbkv@gmail.com>
Date: Mon, 11 Oct 2021 19:46:27 +0530
Subject: [PATCH 034/212] Fix test to support oreder mismatch

---
 src/test/java/org/json/junit/JSONPointerTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 9a7225a..ee24bf9 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -25,7 +25,6 @@ SOFTWARE.
 */
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -61,7 +60,7 @@ public class JSONPointerTest {
 
     @Test
     public void emptyPointer() {
-        assertEquals(EXPECTED_COMPLETE_DOCUMENT, query("").toString());
+        assertEquals(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).toString(), query("").toString());
     }
 
     @SuppressWarnings("unused")
@@ -148,7 +147,7 @@ public class JSONPointerTest {
 
     @Test
     public void uriFragmentNotationRoot() {
-        assertEquals(EXPECTED_COMPLETE_DOCUMENT, query("#").toString());
+        assertEquals(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).toString(), query("#").toString());
     }
 
     @Test

From 9000901a11aa0793fa7f8adda5a35bb672565460 Mon Sep 17 00:00:00 2001
From: sreekesh93 <sreekeshsbkv@gmail.com>
Date: Mon, 11 Oct 2021 19:55:31 +0530
Subject: [PATCH 035/212] Fix test to support oreder mismatch

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

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index ee24bf9..89f1f6c 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -60,7 +60,7 @@ public class JSONPointerTest {
 
     @Test
     public void emptyPointer() {
-        assertEquals(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).toString(), query("").toString());
+        assertTrue(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).similar(query("")));
     }
 
     @SuppressWarnings("unused")
@@ -147,7 +147,7 @@ public class JSONPointerTest {
 
     @Test
     public void uriFragmentNotationRoot() {
-        assertEquals(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).toString(), query("#").toString());
+        assertTrue(new JSONObject(EXPECTED_COMPLETE_DOCUMENT).similar(query("#")));
     }
 
     @Test

From 9f19c22b773c60695e9287f672db161a9e01d51f Mon Sep 17 00:00:00 2001
From: Janit Sriganeshaelankovan <janits_27@hotmail.com>
Date: Thu, 14 Oct 2021 16:43:30 -0400
Subject: [PATCH 036/212] updated the README to include commands for Unix
 systems

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

diff --git a/README.md b/README.md
index cfa4921..ce9b9cd 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,8 @@ jar cf json-java.jar org/json/*.class
 
 *Compile a program that uses the jar (see example code below)*
 ````
-javac -cp .;json-java.jar Test.java 
+javac -cp .;json-java.jar Test.java (Windows)
+javac -cp .:json-java.jar Test.java (Unix Systems)
 ````
 
 *Test file contents*
@@ -71,7 +72,8 @@ public class Test {
 
 *Execute the Test file*
 ```` 
-java -cp .;json-java.jar Test
+java -cp .;json-java.jar Test (Windows)
+java -cp .:json-java.jar Test (Unix Systems)
 ````
 
 *Expected output*

From f27e5fe04d9b4f45ca0d0d3c522a0c2e196aeb1a Mon Sep 17 00:00:00 2001
From: Ronqn <ronandoudies@gmail.com>
Date: Sat, 16 Oct 2021 16:42:55 +0200
Subject: [PATCH 037/212] Docs folder containing the contributions files

---
 docs/CONTRIBUTING.md | 22 +++++++++++
 docs/FILES.md        | 62 +++++++++++++++++++++++++++++++
 docs/NOTES.md        | 87 ++++++++++++++++++++++++++++++++++++++++++++
 docs/RELEASES.md     | 38 +++++++++++++++++++
 docs/SECURITY.md     |  5 +++
 5 files changed, 214 insertions(+)
 create mode 100644 docs/CONTRIBUTING.md
 create mode 100644 docs/FILES.md
 create mode 100644 docs/NOTES.md
 create mode 100644 docs/RELEASES.md
 create mode 100644 docs/SECURITY.md

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000..d81ff61
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,22 @@
+# Contribution Guidelines
+
+Feel free to work on any issue with a #hacktoberfest label.
+
+If you discover an issue you would like to work on, you can add a new issue to the list. If it meets our criteria, a hacktoberfest label will be added.
+
+# Who is allowed to submit pull requests for this project?
+
+Anyone can submit pull requests for code, tests, or documentation.
+
+# How do you decide which pull requests to accept?
+
+* Does it call out a bug that needs to be fixed? If so, it goes to the top of the list.
+* Does it fix a major user inconvenience? These are given high priority as well.
+* Does it align with the specs? If not, it will probably not be accepted. It turns out there are gray areas in the specs. If this is in a gray area, it will likely be given the benefit of the doubt.
+* Does it break the existing behavior of the lib? If so, it will not be accepted, unless it fixes an egregious bug. This is happening less frequently now.
+
+# For more guidance, see these links:
+
+[README.md (includes build instructions)](https://github.com/stleary/JSON-java#readme)
+
+[FAQ - all your questions answered](https://github.com/stleary/JSON-java/wiki/FAQ)
diff --git a/docs/FILES.md b/docs/FILES.md
new file mode 100644
index 0000000..1522721
--- /dev/null
+++ b/docs/FILES.md
@@ -0,0 +1,62 @@
+# Files
+
+**JSONObject.java**: The `JSONObject` can parse text from a `String` or a `JSONTokener`
+to produce a map-like object. The object provides methods for manipulating its
+contents, and for producing a JSON compliant object serialization.
+
+**JSONArray.java**: The `JSONArray` can parse text from a String or a `JSONTokener`
+to produce a vector-like object. The object provides methods for manipulating
+its contents, and for producing a JSON compliant array serialization.
+
+**JSONTokener.java**: The `JSONTokener` breaks a text into a sequence of individual
+tokens. It can be constructed from a `String`, `Reader`, or `InputStream`. It also can 
+parse text from a `String`, `Number`, `Boolean` or `null` like `"hello"`, `42`, `true`, 
+`null` to produce a simple json object.
+
+**JSONException.java**: The `JSONException` is the standard exception type thrown
+by this package.
+
+**JSONPointer.java**: Implementation of
+[JSON Pointer (RFC 6901)](https://tools.ietf.org/html/rfc6901). Supports
+JSON Pointers both in the form of string representation and URI fragment
+representation.
+
+**JSONPropertyIgnore.java**: Annotation class that can be used on Java Bean getter methods.
+When used on a bean method that would normally be serialized into a `JSONObject`, it
+overrides the getter-to-key-name logic and forces the property to be excluded from the
+resulting `JSONObject`.
+
+**JSONPropertyName.java**: Annotation class that can be used on Java Bean getter methods.
+When used on a bean method that would normally be serialized into a `JSONObject`, it
+overrides the getter-to-key-name logic and uses the value of the annotation. The Bean
+processor will look through the class hierarchy. This means you can use the annotation on
+a base class or interface and the value of the annotation will be used even if the getter
+is overridden in a child class.   
+
+**JSONString.java**: The `JSONString` interface requires a `toJSONString` method,
+allowing an object to provide its own serialization.
+
+**JSONStringer.java**: The `JSONStringer` provides a convenient facility for
+building JSON strings.
+
+**JSONWriter.java**: The `JSONWriter` provides a convenient facility for building
+JSON text through a writer.
+
+
+**CDL.java**: `CDL` provides support for converting between JSON and comma
+delimited lists.
+
+**Cookie.java**: `Cookie` provides support for converting between JSON and cookies.
+
+**CookieList.java**: `CookieList` provides support for converting between JSON and
+cookie lists.
+
+**HTTP.java**: `HTTP` provides support for converting between JSON and HTTP headers.
+
+**HTTPTokener.java**: `HTTPTokener` extends `JSONTokener` for parsing HTTP headers.
+
+**XML.java**: `XML` provides support for converting between JSON and XML.
+
+**JSONML.java**: `JSONML` provides support for converting between JSONML and XML.
+
+**XMLTokener.java**: `XMLTokener` extends `JSONTokener` for parsing XML text.
\ No newline at end of file
diff --git a/docs/NOTES.md b/docs/NOTES.md
new file mode 100644
index 0000000..a8298dd
--- /dev/null
+++ b/docs/NOTES.md
@@ -0,0 +1,87 @@
+# Notes
+
+**Recent directory structure change**
+
+_Due to a recent commit - [#515 Merge tests and pom and code](https://github.com/stleary/JSON-java/pull/515) - the structure of the project has changed from a flat directory containing all of the Java files to a directory structure that includes unit tests and several tools used to build the project jar and run the unit tests. If you have difficulty using the new structure, please open an issue so we can work through it._
+
+**Implementation notes**
+
+Numeric types in this package comply with
+[ECMA-404: The JSON Data Interchange Format](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf) and
+[RFC 8259: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc8259#section-6).
+This package fully supports `Integer`, `Long`, and `Double` Java types. Partial support
+for `BigInteger` and `BigDecimal` values in `JSONObject` and `JSONArray` objects is provided
+in the form of `get()`, `opt()`, and `put()` API methods.
+
+Although 1.6 compatibility is currently supported, it is not a project goal and might be
+removed in some future release.
+
+In compliance with RFC8259 page 10 section 9, the parser is more lax with what is valid
+JSON then the Generator. For Example, the tab character (U+0009) is allowed when reading
+JSON Text strings, but when output by the Generator, the tab is properly converted to \t in
+the string. Other instances may occur where reading invalid JSON text does not cause an
+error to be generated. Malformed JSON Texts such as missing end " (quote) on strings or
+invalid number formats (1.2e6.3) will cause errors as such documents can not be read
+reliably.
+
+Some notable exceptions that the JSON Parser in this library accepts are:
+* Unquoted keys `{ key: "value" }`
+* Unquoted values `{ "key": value }`
+* Unescaped literals like "tab" in string values `{ "key": "value   with an unescaped tab" }`
+* Numbers out of range for `Double` or `Long` are parsed as strings
+
+Recent pull requests added a new method `putAll` on the JSONArray. The `putAll` method
+works similarly to other `put` methods in that it does not call `JSONObject.wrap` for items
+added. This can lead to inconsistent object representation in JSONArray structures.
+
+For example, code like this will create a mixed JSONArray, some items wrapped, others
+not:
+
+```java
+SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
+// these will be wrapped
+JSONArray jArr = new JSONArray(myArr);
+// these will not be wrapped
+jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
+```
+
+For structure consistency, it would be recommended that the above code is changed
+to look like 1 of 2 ways.
+
+Option 1:
+```Java
+SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
+JSONArray jArr = new JSONArray();
+// these will not be wrapped
+jArr.putAll(myArr);
+// these will not be wrapped
+jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
+// our jArr is now consistent.
+```
+
+Option 2:
+```Java
+SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
+// these will be wrapped
+JSONArray jArr = new JSONArray(myArr);
+// these will be wrapped
+jArr.putAll(new JSONArray(new SomeBean[]{ new SomeBean(3), new SomeBean(4) }));
+// our jArr is now consistent.
+```
+
+**Unit Test Conventions**
+
+Test filenames should consist of the name of the module being tested, with the suffix "Test". 
+For example, <b>Cookie.java</b> is tested by <b>CookieTest.java</b>.
+
+<b>The fundamental issues with JSON-Java testing are:</b><br>
+* <b>JSONObjects</b> are unordered, making simple string comparison ineffective. 
+* Comparisons via **equals()** is not currently supported. Neither <b>JSONArray</b> nor <b>JSONObject</b> override <b>hashCode()</b> or <b>equals()</b>, so comparison defaults to the <b>Object</b> equals(), which is not useful.
+* Access to the <b>JSONArray</b> and <b>JSONObject</b> internal containers for comparison is not currently available.
+
+<b>General issues with unit testing are:</b><br>
+* Just writing tests to make coverage goals tends to result in poor tests. 
+* Unit tests are a form of documentation - how a given method works is demonstrated by the test. So for a code reviewer or future developer looking at code a good test helps explain how a function is supposed to work according to the original author. This can be difficult if you are not the original developer.
+*   It is difficult to evaluate unit tests in a vacuum. You also need to see the code being tested to understand if a test is good. 
+* Without unit tests, it is hard to feel confident about the quality of the code, especially when fixing bugs or refactoring. Good tests prevent regressions and keep the intent of the code correct.
+* If you have unit test results along with pull requests, the reviewer has an easier time understanding your code and determining if it works as intended.
\ No newline at end of file
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
new file mode 100644
index 0000000..0fda8b9
--- /dev/null
+++ b/docs/RELEASES.md
@@ -0,0 +1,38 @@
+# Release history:
+
+JSON-java releases can be found by searching the Maven repository for groupId "org.json"
+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)
+
+~~~
+20210307    Recent commits and potentially breaking fix to JSONPointer
+
+20201115    Recent commits and first release after project structure change
+
+20200518    Recent commits and snapshot before project structure change
+
+20190722    Recent commits
+
+20180813    POM change to include Automatic-Module-Name (#431)
+
+20180130    Recent commits
+
+20171018    Checkpoint for recent commits.
+
+20170516    Roll up recent commits.
+
+20160810    Revert code that was breaking opt*() methods.
+
+20160807    This release contains a bug in the JSONObject.opt*() and JSONArray.opt*() methods,
+it is not recommended for use.
+Java 1.6 compatability fixed, JSONArray.toList() and JSONObject.toMap(),
+RFC4180 compatibility, JSONPointer, some exception fixes, optional XML type conversion.
+Contains the latest code as of 7 Aug 2016
+
+20160212    Java 1.6 compatibility, OSGi bundle. Contains the latest code as of 12 Feb 2016.
+
+20151123    JSONObject and JSONArray initialization with generics. Contains the latest code as of 23 Nov 2015.
+
+20150729    Checkpoint for Maven central repository release. Contains the latest code
+as of 29 July 2015.
+~~~
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
new file mode 100644
index 0000000..5af9a56
--- /dev/null
+++ b/docs/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please follow the instructions in the ["How are vulnerabilities and exploits handled?"](https://github.com/stleary/JSON-java/wiki/FAQ#how-are-vulnerabilities-and-exploits-handled) section in the FAQ.

From 9c87d6e2142d2f5a68aef2daa2833bdae76b17ad Mon Sep 17 00:00:00 2001
From: Ronqn <ronandoudies@gmail.com>
Date: Sat, 16 Oct 2021 16:43:10 +0200
Subject: [PATCH 038/212] Updated README.md

---
 README.md | 188 ++----------------------------------------------------
 1 file changed, 4 insertions(+), 184 deletions(-)

diff --git a/README.md b/README.md
index ce9b9cd..6f0bdd9 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The license includes this restriction: ["The software shall be used for good, no
 
 # If you would like to contribute to this project
 
-For more information on contributions, please see [CONTRIBUTING.md](https://github.com/stleary/JSON-java/blob/master/CONTRIBUTING.md)
+For more information on contributions, please see [CONTRIBUTING.md](https://github.com/stleary/JSON-java/blob/master/docs/CONTRIBUTING.md)
 
 Bug fixes, code improvements, and unit test coverage changes are welcome! Because this project is currently in the maintenance phase, the kinds of changes that can be accepted are limited. For more information, please read the [FAQ](https://github.com/stleary/JSON-java/wiki/FAQ).
 
@@ -98,192 +98,12 @@ gradlew clean build test
 
 # Notes
 
-**Recent directory structure change**
-
-_Due to a recent commit - [#515 Merge tests and pom and code](https://github.com/stleary/JSON-java/pull/515) - the structure of the project has changed from a flat directory containing all of the Java files to a directory structure that includes unit tests and several tools used to build the project jar and run the unit tests. If you have difficulty using the new structure, please open an issue so we can work through it._
-
-**Implementation notes**
-
-Numeric types in this package comply with
-[ECMA-404: The JSON Data Interchange Format](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf) and
-[RFC 8259: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc8259#section-6).
-This package fully supports `Integer`, `Long`, and `Double` Java types. Partial support
-for `BigInteger` and `BigDecimal` values in `JSONObject` and `JSONArray` objects is provided
-in the form of `get()`, `opt()`, and `put()` API methods.
-
-Although 1.6 compatibility is currently supported, it is not a project goal and might be
-removed in some future release.
-
-In compliance with RFC8259 page 10 section 9, the parser is more lax with what is valid
-JSON then the Generator. For Example, the tab character (U+0009) is allowed when reading
-JSON Text strings, but when output by the Generator, the tab is properly converted to \t in
-the string. Other instances may occur where reading invalid JSON text does not cause an
-error to be generated. Malformed JSON Texts such as missing end " (quote) on strings or
-invalid number formats (1.2e6.3) will cause errors as such documents can not be read
-reliably.
-
-Some notable exceptions that the JSON Parser in this library accepts are:
-* Unquoted keys `{ key: "value" }`
-* Unquoted values `{ "key": value }`
-* Unescaped literals like "tab" in string values `{ "key": "value   with an unescaped tab" }`
-* Numbers out of range for `Double` or `Long` are parsed as strings
-
-Recent pull requests added a new method `putAll` on the JSONArray. The `putAll` method
-works similarly to other `put` methods in that it does not call `JSONObject.wrap` for items
-added. This can lead to inconsistent object representation in JSONArray structures.
-
-For example, code like this will create a mixed JSONArray, some items wrapped, others
-not:
-
-```java
-SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
-// these will be wrapped
-JSONArray jArr = new JSONArray(myArr);
-// these will not be wrapped
-jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
-```
-
-For structure consistency, it would be recommended that the above code is changed
-to look like 1 of 2 ways.
-
-Option 1:
-```Java
-SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
-JSONArray jArr = new JSONArray();
-// these will not be wrapped
-jArr.putAll(myArr);
-// these will not be wrapped
-jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
-// our jArr is now consistent.
-```
-
-Option 2:
-```Java
-SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
-// these will be wrapped
-JSONArray jArr = new JSONArray(myArr);
-// these will be wrapped
-jArr.putAll(new JSONArray(new SomeBean[]{ new SomeBean(3), new SomeBean(4) }));
-// our jArr is now consistent.
-```
-
-**Unit Test Conventions**
-
-Test filenames should consist of the name of the module being tested, with the suffix "Test". 
-For example, <b>Cookie.java</b> is tested by <b>CookieTest.java</b>.
-
-<b>The fundamental issues with JSON-Java testing are:</b><br>
-* <b>JSONObjects</b> are unordered, making simple string comparison ineffective. 
-* Comparisons via **equals()** is not currently supported. Neither <b>JSONArray</b> nor <b>JSONObject</b> override <b>hashCode()</b> or <b>equals()</b>, so comparison defaults to the <b>Object</b> equals(), which is not useful.
-* Access to the <b>JSONArray</b> and <b>JSONObject</b> internal containers for comparison is not currently available.
-
-<b>General issues with unit testing are:</b><br>
-* Just writing tests to make coverage goals tends to result in poor tests. 
-* Unit tests are a form of documentation - how a given method works is demonstrated by the test. So for a code reviewer or future developer looking at code a good test helps explain how a function is supposed to work according to the original author. This can be difficult if you are not the original developer.
-*   It is difficult to evaluate unit tests in a vacuum. You also need to see the code being tested to understand if a test is good. 
-* Without unit tests, it is hard to feel confident about the quality of the code, especially when fixing bugs or refactoring. Good tests prevent regressions and keep the intent of the code correct.
-* If you have unit test results along with pull requests, the reviewer has an easier time understanding your code and determining if it works as intended.
-
+For more information, please see [NOTES.md](https://github.com/stleary/JSON-java/blob/master/docs/NOTES.md)
 
 # Files
 
-**JSONObject.java**: The `JSONObject` can parse text from a `String` or a `JSONTokener`
-to produce a map-like object. The object provides methods for manipulating its
-contents, and for producing a JSON compliant object serialization.
-
-**JSONArray.java**: The `JSONArray` can parse text from a String or a `JSONTokener`
-to produce a vector-like object. The object provides methods for manipulating
-its contents, and for producing a JSON compliant array serialization.
-
-**JSONTokener.java**: The `JSONTokener` breaks a text into a sequence of individual
-tokens. It can be constructed from a `String`, `Reader`, or `InputStream`. It also can 
-parse text from a `String`, `Number`, `Boolean` or `null` like `"hello"`, `42`, `true`, 
-`null` to produce a simple json object.
-
-**JSONException.java**: The `JSONException` is the standard exception type thrown
-by this package.
-
-**JSONPointer.java**: Implementation of
-[JSON Pointer (RFC 6901)](https://tools.ietf.org/html/rfc6901). Supports
-JSON Pointers both in the form of string representation and URI fragment
-representation.
-
-**JSONPropertyIgnore.java**: Annotation class that can be used on Java Bean getter methods.
-When used on a bean method that would normally be serialized into a `JSONObject`, it
-overrides the getter-to-key-name logic and forces the property to be excluded from the
-resulting `JSONObject`.
-
-**JSONPropertyName.java**: Annotation class that can be used on Java Bean getter methods.
-When used on a bean method that would normally be serialized into a `JSONObject`, it
-overrides the getter-to-key-name logic and uses the value of the annotation. The Bean
-processor will look through the class hierarchy. This means you can use the annotation on
-a base class or interface and the value of the annotation will be used even if the getter
-is overridden in a child class.   
-
-**JSONString.java**: The `JSONString` interface requires a `toJSONString` method,
-allowing an object to provide its own serialization.
-
-**JSONStringer.java**: The `JSONStringer` provides a convenient facility for
-building JSON strings.
-
-**JSONWriter.java**: The `JSONWriter` provides a convenient facility for building
-JSON text through a writer.
-
-
-**CDL.java**: `CDL` provides support for converting between JSON and comma
-delimited lists.
-
-**Cookie.java**: `Cookie` provides support for converting between JSON and cookies.
-
-**CookieList.java**: `CookieList` provides support for converting between JSON and
-cookie lists.
-
-**HTTP.java**: `HTTP` provides support for converting between JSON and HTTP headers.
-
-**HTTPTokener.java**: `HTTPTokener` extends `JSONTokener` for parsing HTTP headers.
-
-**XML.java**: `XML` provides support for converting between JSON and XML.
-
-**JSONML.java**: `JSONML` provides support for converting between JSONML and XML.
-
-**XMLTokener.java**: `XMLTokener` extends `JSONTokener` for parsing XML text.
-
+For more information on files, please see [FILES.md](https://github.com/stleary/JSON-java/blob/master/docs/FILES.md)
 
 # Release history:
 
-JSON-java releases can be found by searching the Maven repository for groupId "org.json"
-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)
-
-~~~
-20210307    Recent commits and potentially breaking fix to JSONPointer
-
-20201115    Recent commits and first release after project structure change
-
-20200518    Recent commits and snapshot before project structure change
-
-20190722    Recent commits
-
-20180813    POM change to include Automatic-Module-Name (#431)
-
-20180130    Recent commits
-
-20171018    Checkpoint for recent commits.
-
-20170516    Roll up recent commits.
-
-20160810    Revert code that was breaking opt*() methods.
-
-20160807    This release contains a bug in the JSONObject.opt*() and JSONArray.opt*() methods,
-it is not recommended for use.
-Java 1.6 compatability fixed, JSONArray.toList() and JSONObject.toMap(),
-RFC4180 compatibility, JSONPointer, some exception fixes, optional XML type conversion.
-Contains the latest code as of 7 Aug 2016
-
-20160212    Java 1.6 compatibility, OSGi bundle. Contains the latest code as of 12 Feb 2016.
-
-20151123    JSONObject and JSONArray initialization with generics. Contains the latest code as of 23 Nov 2015.
-
-20150729    Checkpoint for Maven central repository release. Contains the latest code
-as of 29 July 2015.
-~~~
+For the release history, please see [RELEASES.md](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
\ No newline at end of file

From 30a70c88861e4966f5023114c5d78640d16903bd Mon Sep 17 00:00:00 2001
From: katldewitt <80657210+katldewitt@users.noreply.github.com>
Date: Sun, 24 Oct 2021 08:41:57 -0700
Subject: [PATCH 039/212] chore: initial unit tests

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

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 89f1f6c..2701bfb 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -134,6 +134,14 @@ public class JSONPointerTest {
     public void quotationHandling() {
         assertEquals(6, query("/k\"l"));
     }
+    
+    /**
+     * KD Added
+     * */
+    @Test
+    public void quotationEscaping() {
+        assertEquals(document.get("k\"l"), query("/k\\\"l"));
+    }
 
     @Test
     public void whitespaceKey() {
@@ -389,4 +397,33 @@ public class JSONPointerTest {
         obj = jsonArray.optQuery(new JSONPointer("/a/b/c"));
         assertTrue("Expected null", obj == null);
     }
+    
+    /**
+     * KD added
+     * Coverage for JSONObject query(JSONPointer)
+     */
+    @Test
+    public void queryFromJSONObjectUsingPointer2() {
+        String str = "{"+
+            "\"string\\\\\\\\Key\":\"hello world!\","+
+            "}"+
+            "}";
+        JSONObject jsonObject = new JSONObject(str);
+        Object obj = jsonObject.optQuery(new JSONPointer("/string\\\\\\\\Key"));
+        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
+    }
+    /**
+     * KD added - understanding behavior
+     * Coverage for JSONObject query(JSONPointer)
+     */
+    @Test
+    public void queryFromJSONObjectUsingPointer0() {
+        String str = "{"+
+            "\"string\\\\Key\":\"hello world!\","+
+            "}"+
+            "}";
+        JSONObject jsonObject = new JSONObject(str);
+        Object obj = jsonObject.optQuery(new JSONPointer("/string\\Key"));
+        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
+    }
 }

From 669316d29e78cb8012fa02e590db7efb38432fd5 Mon Sep 17 00:00:00 2001
From: katldewitt <80657210+katldewitt@users.noreply.github.com>
Date: Thu, 28 Oct 2021 05:45:23 -0700
Subject: [PATCH 040/212] chore: write unit tests for behavior

---
 .../java/org/json/junit/JSONPointerTest.java  | 60 +++++++++----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 2701bfb..0058b0c 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -41,10 +41,11 @@ public class JSONPointerTest {
 
     private static final JSONObject document;
     private static final String EXPECTED_COMPLETE_DOCUMENT = "{\"\":0,\" \":7,\"g|h\":4,\"c%d\":2,\"k\\\"l\":6,\"a/b\":1,\"i\\\\j\":5," +
-            "\"obj\":{\"\":{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some other value\"}," +
+    		"\"obj\":{\"\":{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some other value\"}," +
             "\"other~key\":{\"another/key\":[\"val\"]},\"key\":\"value\"},\"foo\":[\"bar\",\"baz\"],\"e^f\":3," +
-            "\"m~n\":8}";
+            "\"m~n\":8,\"four\\\\\\\\slashes\":\"slash test!\"}";
 
+    
     static {
         @SuppressWarnings("resource")
         InputStream resourceAsStream = JSONPointerTest.class.getClassLoader().getResourceAsStream("jsonpointer-testdoc.json");
@@ -125,6 +126,17 @@ public class JSONPointerTest {
         assertEquals(5, query("/i\\j"));
     }
 
+    /**
+     * When creating a jsonObject we need to parse escaped characters "\\\\"
+     *  --> it's the string representation of  "\\", so when query'ing via the JSONPointer 
+     *  we DON'T escape them
+     *  
+     */
+    @Test
+    public void multipleBackslashHandling() {
+        assertEquals("slash test!", query("/four\\\\slashes"));
+    }
+    
     /**
      * We pass quotations as-is
      * 
@@ -134,15 +146,7 @@ public class JSONPointerTest {
     public void quotationHandling() {
         assertEquals(6, query("/k\"l"));
     }
-    
-    /**
-     * KD Added
-     * */
-    @Test
-    public void quotationEscaping() {
-        assertEquals(document.get("k\"l"), query("/k\\\"l"));
-    }
-
+   
     @Test
     public void whitespaceKey() {
         assertEquals(7, query("/ "));
@@ -399,31 +403,21 @@ public class JSONPointerTest {
     }
     
     /**
-     * KD added
-     * Coverage for JSONObject query(JSONPointer)
-     */
-    @Test
-    public void queryFromJSONObjectUsingPointer2() {
-        String str = "{"+
-            "\"string\\\\\\\\Key\":\"hello world!\","+
-            "}"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj = jsonObject.optQuery(new JSONPointer("/string\\\\\\\\Key"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
-    }
-    /**
-     * KD added - understanding behavior
+     * KD added - this should pass
      * Coverage for JSONObject query(JSONPointer)
      */
     @Test
     public void queryFromJSONObjectUsingPointer0() {
-        String str = "{"+
-            "\"string\\\\Key\":\"hello world!\","+
-            "}"+
-            "}";
-        JSONObject jsonObject = new JSONObject(str);
-        Object obj = jsonObject.optQuery(new JSONPointer("/string\\Key"));
-        assertTrue("Expected 'hello world!'", "hello world!".equals(obj));
+    	String str = "{"+
+                "\"string\\\\\\\\Key\":\"hello world!\","+
+
+                "\"\\\\\":\"slash test\"," + 
+                "}"+
+                "}";
+            JSONObject jsonObject = new JSONObject(str);
+            //Summary of issue: When a KEY in the jsonObject is "\\\\" --> it's held
+            // as "\\" which makes it impossible to get back where expected
+            Object obj = jsonObject.optQuery(new JSONPointer("/\\"));
+            assertEquals("slash test", obj);
     }
 }

From 3ed9154f6316ed4b6105da2246e373f43a16f111 Mon Sep 17 00:00:00 2001
From: katldewitt <80657210+katldewitt@users.noreply.github.com>
Date: Thu, 28 Oct 2021 05:59:22 -0700
Subject: [PATCH 041/212] fix: refactor tests

context: the backslash unit tests cannot be in the complete document as uriFragmentNotationRoot() will fail due to backslash handling
---
 .../java/org/json/junit/JSONPointerTest.java  | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 0058b0c..4ea7434 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -43,7 +43,7 @@ public class JSONPointerTest {
     private static final String EXPECTED_COMPLETE_DOCUMENT = "{\"\":0,\" \":7,\"g|h\":4,\"c%d\":2,\"k\\\"l\":6,\"a/b\":1,\"i\\\\j\":5," +
     		"\"obj\":{\"\":{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some other value\"}," +
             "\"other~key\":{\"another/key\":[\"val\"]},\"key\":\"value\"},\"foo\":[\"bar\",\"baz\"],\"e^f\":3," +
-            "\"m~n\":8,\"four\\\\\\\\slashes\":\"slash test!\"}";
+            "\"m~n\":8}";
 
     
     static {
@@ -125,17 +125,6 @@ public class JSONPointerTest {
     public void backslashHandling() {
         assertEquals(5, query("/i\\j"));
     }
-
-    /**
-     * When creating a jsonObject we need to parse escaped characters "\\\\"
-     *  --> it's the string representation of  "\\", so when query'ing via the JSONPointer 
-     *  we DON'T escape them
-     *  
-     */
-    @Test
-    public void multipleBackslashHandling() {
-        assertEquals("slash test!", query("/four\\\\slashes"));
-    }
     
     /**
      * We pass quotations as-is
@@ -403,8 +392,10 @@ public class JSONPointerTest {
     }
     
     /**
-     * KD added - this should pass
-     * Coverage for JSONObject query(JSONPointer)
+     * When creating a jsonObject we need to parse escaped characters "\\\\"
+     *  --> it's the string representation of  "\\", so when query'ing via the JSONPointer 
+     *  we DON'T escape them
+     *  
      */
     @Test
     public void queryFromJSONObjectUsingPointer0() {
@@ -416,8 +407,11 @@ public class JSONPointerTest {
                 "}";
             JSONObject jsonObject = new JSONObject(str);
             //Summary of issue: When a KEY in the jsonObject is "\\\\" --> it's held
-            // as "\\" which makes it impossible to get back where expected
-            Object obj = jsonObject.optQuery(new JSONPointer("/\\"));
-            assertEquals("slash test", obj);
+            // as "\\" which means when querying, we need to use "\\"
+            Object twoBackslahObj = jsonObject.optQuery(new JSONPointer("/\\"));
+            assertEquals("slash test", twoBackslahObj);
+
+            Object fourBackslashObj = jsonObject.optQuery(new JSONPointer("/string\\\\Key"));
+            assertEquals("hello world!", fourBackslashObj);
     }
 }

From 30b3680050ed12bf02ff8dd35df5fa02381b2aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Lengrand?=
 <42970493+loic5@users.noreply.github.com>
Date: Fri, 29 Oct 2021 09:38:19 +0200
Subject: [PATCH 042/212] Update CODE_OF_CONDUCT.md

I replaced the email address
---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 7b83acd..ecd7755 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at jean.bisutti@gmail.com. All
+reported by contacting the project team at jsonjava060@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

From 7823d3a4f3edf348514ef2486ba6819a7ca0c964 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 15:28:01 -0600
Subject: [PATCH 043/212] locate the pace for cyclic check

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 761df1d..8891673 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1540,10 +1540,12 @@ public class JSONObject {
                     try {
                         final Object result = method.invoke(bean);
                         if (result != null) {
+                            // check cyclic dependency and throw error if needed
+
                             this.map.put(key, wrap(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
+                            // after calling toString 
                             if (result instanceof Closeable) {
                                 try {
                                     ((Closeable) result).close();

From b5bcb68968f0f3f20598ca930e108a8657ba0c2d Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 16:57:41 -0600
Subject: [PATCH 044/212] added set check logic

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 8891673..c1e3b70 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -39,6 +39,7 @@ import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
@@ -1510,6 +1511,11 @@ public class JSONObject {
         return NULL.equals(object) ? defaultValue : object.toString();
     }
 
+    // Set to store the current seen objects in the recursive reaversal
+    // If the next value to be added to this set is a duplicate, a cycle
+    // is found
+    private final Set<Object> objectsRecord = new HashSet<Object>();
+
     /**
      * Populates the internal map of the JSONObject with the bean properties. The
      * bean can not be recursive.
@@ -1541,8 +1547,18 @@ public class JSONObject {
                         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);
 
                             this.map.put(key, wrap(result));
+
+                            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 
@@ -2678,4 +2694,15 @@ public class JSONObject {
                 "JSONObject[" + quote(key) + "] is not a " + valueType + " (" + value + ")."
                 , cause);
     }
+
+    /**
+     * Create a new JSONException in a common format for recursive object definition.
+     * @param key name of the key
+     * @return JSONException that can be thrown.
+     */
+    private static JSONException recursivelyDefinedObjectException(String key) {
+        return new JSONException(
+            "JavaBean object contains recursively defined member variable of key " + quote(key)
+        );
+    }
 }

From 4565bddcbb227ccebc36e145d01966859f0db69b Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 17:23:40 -0600
Subject: [PATCH 045/212] data class for recursive test

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

diff --git a/src/test/java/org/json/junit/data/RecursiveBean.java b/src/test/java/org/json/junit/data/RecursiveBean.java
new file mode 100644
index 0000000..00caf13
--- /dev/null
+++ b/src/test/java/org/json/junit/data/RecursiveBean.java
@@ -0,0 +1,22 @@
+package org.json.junit.data;
+
+/**
+ * test class for verifying if recursively defined bean can be correctly identified
+ * @author Zetmas
+ *
+ */
+public class RecursiveBean {
+    private String name;
+    private Object reference;
+    public String getName() { return name; }
+    public Object getRef() {return reference;}
+
+    public RecursiveBean(String name) {
+        this.name = name;
+        reference = null;
+    }
+    public RecursiveBean(String name, Object refObj) {
+        this.name = name;
+        reference = refObj;
+    }
+}
\ No newline at end of file

From 1ffcf3915c655527dd534474ef004335d00704af Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 19:35:53 -0600
Subject: [PATCH 046/212] successful test

---
 src/main/java/org/json/JSONObject.java        | 30 ++++++++++++++-----
 .../java/org/json/junit/JSONObjectTest.java   |  9 ++++++
 .../org/json/junit/data/RecursiveBean.java    |  1 +
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index c1e3b70..77d509b 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -366,6 +366,11 @@ public class JSONObject {
         this.populateMap(bean);
     }
 
+    private JSONObject(Object bean, Set<Object> objectsRecord) {
+        this();
+        this.populateMap(bean, objectsRecord);
+    }
+
     /**
      * Construct a JSONObject from an Object, using reflection to find the
      * public members. The resulting JSONObject's keys will be the strings from
@@ -1511,11 +1516,6 @@ public class JSONObject {
         return NULL.equals(object) ? defaultValue : object.toString();
     }
 
-    // Set to store the current seen objects in the recursive reaversal
-    // If the next value to be added to this set is a duplicate, a cycle
-    // is found
-    private final Set<Object> objectsRecord = new HashSet<Object>();
-
     /**
      * Populates the internal map of the JSONObject with the bean properties. The
      * bean can not be recursive.
@@ -1526,6 +1526,10 @@ public class JSONObject {
      *            the bean
      */
     private void populateMap(Object bean) {
+        populateMap(bean, new HashSet<Object>());
+    }
+
+    private void populateMap(Object bean, Set<Object> objectsRecord) {
         Class<?> klass = bean.getClass();
 
         // If klass is a System class then set includeSuperClass to false.
@@ -1555,7 +1559,7 @@ public class JSONObject {
                             
                             objectsRecord.add(result);
 
-                            this.map.put(key, wrap(result));
+                            this.map.put(key, wrap(result, objectsRecord));
 
                             objectsRecord.remove(result);
 
@@ -2449,6 +2453,10 @@ public class JSONObject {
      * @return The wrapped value
      */
     public static Object wrap(Object object) {
+        return wrap(object, null);
+    }
+
+    private static Object wrap(Object object, Set<Object> objectsRecord) {
         try {
             if (NULL.equals(object)) {
                 return NULL;
@@ -2483,7 +2491,15 @@ public class JSONObject {
                     || object.getClass().getClassLoader() == null) {
                 return object.toString();
             }
-            return new JSONObject(object);
+            if (objectsRecord != null) {
+                return new JSONObject(object, objectsRecord);
+            }
+            else {
+                return new JSONObject(object);
+            }
+        }
+        catch (JSONException exception) {
+            throw exception;
         } catch (Exception exception) {
             return null;
         }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 94c3e4b..e19a157 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -73,6 +73,7 @@ import org.json.junit.data.MyJsonString;
 import org.json.junit.data.MyNumber;
 import org.json.junit.data.MyNumberContainer;
 import org.json.junit.data.MyPublicClass;
+import org.json.junit.data.RecursiveBean;
 import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
@@ -3218,6 +3219,14 @@ public class JSONObjectTest {
         jsonObject.put(null, new Object());
         fail("Expected an exception");
     }
+    @Test(expected=JSONException.class)
+    public void testSimpleRecursiveObject() {
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB", ObjA);
+        ObjA.setRef(ObjB);
+        JSONObject jsonObject = new JSONObject(ObjA);
+        fail("Expected an exception");
+    }
 
     @Test
     public void testIssue548ObjectWithEmptyJsonArray() {
diff --git a/src/test/java/org/json/junit/data/RecursiveBean.java b/src/test/java/org/json/junit/data/RecursiveBean.java
index 00caf13..18ec8bd 100644
--- a/src/test/java/org/json/junit/data/RecursiveBean.java
+++ b/src/test/java/org/json/junit/data/RecursiveBean.java
@@ -10,6 +10,7 @@ public class RecursiveBean {
     private Object reference;
     public String getName() { return name; }
     public Object getRef() {return reference;}
+    public void setRef(Object refObj) {reference = refObj;}
 
     public RecursiveBean(String name) {
         this.name = name;

From 638273af7a782d8291d87c5d56d4a259ea46bd7b Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 19:41:00 -0600
Subject: [PATCH 047/212] long circle test

---
 src/test/java/org/json/junit/JSONObjectTest.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e19a157..df2144a 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3224,7 +3224,17 @@ public class JSONObjectTest {
         RecursiveBean ObjA = new RecursiveBean("ObjA");
         RecursiveBean ObjB = new RecursiveBean("ObjB", ObjA);
         ObjA.setRef(ObjB);
-        JSONObject jsonObject = new JSONObject(ObjA);
+        new JSONObject(ObjA);
+        fail("Expected an exception");
+    }
+    @Test(expected=JSONException.class)
+    public void testLongRecursiveObject() {
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB", ObjA);
+        RecursiveBean ObjC = new RecursiveBean("ObjB", ObjB);
+        RecursiveBean ObjD = new RecursiveBean("ObjB", ObjC);
+        ObjA.setRef(ObjD);
+        new JSONObject(ObjB);
         fail("Expected an exception");
     }
 

From fb96e870a95ed86c247e73578a75335a0586ac13 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Wed, 17 Nov 2021 20:00:12 -0600
Subject: [PATCH 048/212] add test case and modified old ones

---
 .../java/org/json/junit/JSONObjectTest.java   | 45 +++++++++++++++++--
 .../org/json/junit/data/RecursiveBean.java    |  8 ++--
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index df2144a..cb31c7a 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3221,22 +3221,59 @@ public class JSONObjectTest {
     }
     @Test(expected=JSONException.class)
     public void testSimpleRecursiveObject() {
+        // B -> A -> B ...
         RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB", ObjA);
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        ObjB.setRef(ObjA);
         ObjA.setRef(ObjB);
         new JSONObject(ObjA);
         fail("Expected an exception");
     }
     @Test(expected=JSONException.class)
     public void testLongRecursiveObject() {
+        // D -> C -> B -> A -> D ...
         RecursiveBean ObjA = new RecursiveBean("ObjA");
-        RecursiveBean ObjB = new RecursiveBean("ObjB", ObjA);
-        RecursiveBean ObjC = new RecursiveBean("ObjB", ObjB);
-        RecursiveBean ObjD = new RecursiveBean("ObjB", ObjC);
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        RecursiveBean ObjC = new RecursiveBean("ObjC");
+        RecursiveBean ObjD = new RecursiveBean("ObjD");
+        ObjC.setRef(ObjB);
+        ObjB.setRef(ObjA);
+        ObjD.setRef(ObjC);
         ObjA.setRef(ObjD);
         new JSONObject(ObjB);
         fail("Expected an exception");
     }
+    @Test
+    public void testRepeatObjectNotRecursive() {
+        // C -> B -> A
+        //        -> A
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        RecursiveBean ObjC = new RecursiveBean("ObjC");
+        ObjC.setRef(ObjA);
+        ObjB.setRef(ObjA);
+        ObjB.setRef2(ObjA);
+        new JSONObject(ObjC);
+        new JSONObject(ObjB);
+        new JSONObject(ObjA);
+    }
+    @Test(expected=JSONException.class)
+    public void testRepeatObjectRecursive() {
+        // C -> B -> A -> D -> C
+        //        -> D -> C
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        RecursiveBean ObjC = new RecursiveBean("ObjC");
+        RecursiveBean ObjD = new RecursiveBean("ObjD");
+        ObjC.setRef(ObjB);
+        ObjB.setRef(ObjA);
+        ObjB.setRef2(ObjD);
+        ObjA.setRef(ObjD);
+        ObjD.setRef(ObjC);
+        new JSONObject(ObjC);
+        fail("Expected an exception");
+    }
+
 
     @Test
     public void testIssue548ObjectWithEmptyJsonArray() {
diff --git a/src/test/java/org/json/junit/data/RecursiveBean.java b/src/test/java/org/json/junit/data/RecursiveBean.java
index 18ec8bd..dad6e7a 100644
--- a/src/test/java/org/json/junit/data/RecursiveBean.java
+++ b/src/test/java/org/json/junit/data/RecursiveBean.java
@@ -8,16 +8,16 @@ package org.json.junit.data;
 public class RecursiveBean {
     private String name;
     private Object reference;
+    private Object reference2;
     public String getName() { return name; }
     public Object getRef() {return reference;}
+    public Object getRef2() {return reference2;}
     public void setRef(Object refObj) {reference = refObj;}
+    public void setRef2(Object refObj) {reference2 = refObj;}
 
     public RecursiveBean(String name) {
         this.name = name;
         reference = null;
-    }
-    public RecursiveBean(String name, Object refObj) {
-        this.name = name;
-        reference = refObj;
+        reference2 = null;
     }
 }
\ No newline at end of file

From fca7e17b389912e03f5da405f00ee89f793b3899 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Thu, 18 Nov 2021 14:53:22 -0600
Subject: [PATCH 049/212] Added test cases for self recursion and complex but
 no recursion

---
 .../java/org/json/junit/JSONObjectTest.java   | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index cb31c7a..381c942 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3220,6 +3220,24 @@ public class JSONObjectTest {
         fail("Expected an exception");
     }
     @Test(expected=JSONException.class)
+    public void testSelfRecursiveObject() {
+        // A -> A ...
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        ObjA.setRef(ObjA);
+        new JSONObject(ObjA);
+        fail("Expected an exception");
+    }
+    @Test(expected=JSONException.class)
+    public void testLongSelfRecursiveObject() {
+        // B -> A -> A ...
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        ObjB.setRef(ObjA);
+        ObjA.setRef(ObjA);
+        new JSONObject(ObjB);
+        fail("Expected an exception");
+    }
+    @Test(expected=JSONException.class)
     public void testSimpleRecursiveObject() {
         // B -> A -> B ...
         RecursiveBean ObjA = new RecursiveBean("ObjA");
@@ -3243,6 +3261,22 @@ public class JSONObjectTest {
         new JSONObject(ObjB);
         fail("Expected an exception");
     }
+    @Test(expected=JSONException.class)
+    public void testRepeatObjectRecursive() {
+        // C -> B -> A -> D -> C ...
+        //        -> D -> C ...
+        RecursiveBean ObjA = new RecursiveBean("ObjA");
+        RecursiveBean ObjB = new RecursiveBean("ObjB");
+        RecursiveBean ObjC = new RecursiveBean("ObjC");
+        RecursiveBean ObjD = new RecursiveBean("ObjD");
+        ObjC.setRef(ObjB);
+        ObjB.setRef(ObjA);
+        ObjB.setRef2(ObjD);
+        ObjA.setRef(ObjD);
+        ObjD.setRef(ObjC);
+        new JSONObject(ObjC);
+        fail("Expected an exception");
+    }
     @Test
     public void testRepeatObjectNotRecursive() {
         // C -> B -> A
@@ -3257,21 +3291,25 @@ public class JSONObjectTest {
         new JSONObject(ObjB);
         new JSONObject(ObjA);
     }
-    @Test(expected=JSONException.class)
-    public void testRepeatObjectRecursive() {
-        // C -> B -> A -> D -> C
-        //        -> D -> C
+    @Test
+    public void testLongRepeatObjectNotRecursive() {
+        // C -> B -> A -> D -> E
+        //        -> D -> E
         RecursiveBean ObjA = new RecursiveBean("ObjA");
         RecursiveBean ObjB = new RecursiveBean("ObjB");
         RecursiveBean ObjC = new RecursiveBean("ObjC");
         RecursiveBean ObjD = new RecursiveBean("ObjD");
+        RecursiveBean ObjE = new RecursiveBean("ObjE");
         ObjC.setRef(ObjB);
         ObjB.setRef(ObjA);
         ObjB.setRef2(ObjD);
         ObjA.setRef(ObjD);
-        ObjD.setRef(ObjC);
+        ObjD.setRef(ObjE);
         new JSONObject(ObjC);
-        fail("Expected an exception");
+        new JSONObject(ObjB);
+        new JSONObject(ObjA);
+        new JSONObject(ObjD);
+        new JSONObject(ObjE);
     }
 
 

From e356739a2fa672d4d46a6d10fe49da66cb5b8856 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 19:42:00 -0600
Subject: [PATCH 050/212] Added forceList configuration to
 XMLParserConfiguration

---
 .../java/org/json/XMLParserConfiguration.java | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index af3093b..a1fd63e 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -25,7 +25,9 @@ SOFTWARE.
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -66,6 +68,12 @@ public class XMLParserConfiguration {
      */
     private Map<String, XMLXsiTypeConverter<?>> xsiTypeMap;
 
+    /**
+     * When parsing the XML into JSON, specifies the tags whose values should be converted
+     * to arrays
+     */
+    private Set<String> forceList;
+
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert
      * values), and the CDATA Tag Name is "content".
@@ -75,6 +83,7 @@ public class XMLParserConfiguration {
         this.cDataTagName = "content";
         this.convertNilAttributeToNull = false;
         this.xsiTypeMap = Collections.emptyMap();
+        this.forceList = Collections.emptySet();
     }
 
     /**
@@ -151,13 +160,15 @@ public class XMLParserConfiguration {
      *                                  <code>false</code> to parse values with attribute xsi:nil="true" as {"xsi:nil":true}.
      * @param xsiTypeMap  <code>new HashMap<String, XMLXsiTypeConverter<?>>()</code> to parse values with attribute
      *                   xsi:type="integer" as integer,  xsi:type="string" as string
+     * @param forceList  <code>new HashSet<String>()</code> to parse the provided tags' values as arrays 
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
-            final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap ) {
+            final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList ) {
         this.keepStrings = keepStrings;
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
+        this.forceList = Collections.unmodifiableSet(forceList);
     }
 
     /**
@@ -174,7 +185,8 @@ public class XMLParserConfiguration {
                 this.keepStrings,
                 this.cDataTagName,
                 this.convertNilAttributeToNull,
-                this.xsiTypeMap
+                this.xsiTypeMap,
+                this.forceList
         );
     }
     
@@ -283,4 +295,26 @@ public class XMLParserConfiguration {
         newConfig.xsiTypeMap = Collections.unmodifiableMap(cloneXsiTypeMap);
         return newConfig;
     }
+
+    /**
+     * When parsing the XML into JSON, specifies that tags that will be converted to arrays
+     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays 
+     * @return <code>forceList</code> unmodifiable configuration set.
+     */
+    public Set<String> getForceList() {
+        return this.forceList;
+    }
+
+    /**
+     * When parsing the XML into JSON, specifies that tags that will be converted to arrays
+     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays 
+     * @param forceList  {@code new HashSet<String>()} to parse the provided tags' values as arrays 
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLParserConfiguration withForceList(final Set<String> forceList) {
+        XMLParserConfiguration newConfig = this.clone();
+        Set<String> cloneForceList = new HashSet<String>(forceList);
+        newConfig.forceList = Collections.unmodifiableSet(cloneForceList);
+        return newConfig;
+    }
 }

From fafaeb7aa6f89055c74d93c7dacca14959ec10d6 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 20:32:36 -0600
Subject: [PATCH 051/212] Added simple test case

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

diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 28b20dd..1ff5949 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -35,6 +35,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -903,6 +905,34 @@ public class XMLConfigurationTest {
         Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
 
     }
+
+    /**
+     * Confirm XMLParserConfiguration functionality
+     */
+    @Test
+    public void testSimpleForceList() {
+
+        String xmlStr = 
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+                "<addresses>\n"+
+                "   <address>\n"+
+                "      <name>Sherlock Holmes</name>\n"+
+                "   </address>\n"+
+                "</addresses>";
+
+        String expectedStr = "{\"addresses\":[{\"address\":{\"name\":\"Sherlock Holmes\"}}]}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("addresses");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
     
     
     /**

From a0f90b776d4660083e8844e276f80ff92bce8d5d Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 20:46:15 -0600
Subject: [PATCH 052/212] Passed simple test

---
 src/main/java/org/json/XML.java | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index b7f0c8b..45384d3 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -413,14 +413,26 @@ public class XML {
                         } else if (token == LT) {
                             // Nested element
                             if (parse(x, jsonObject, tagName, config)) {
-                                if (jsonObject.length() == 0) {
-                                    context.accumulate(tagName, "");
-                                } else if (jsonObject.length() == 1
-                                        && jsonObject.opt(config.getcDataTagName()) != null) {
-                                    context.accumulate(tagName, jsonObject.opt(config.getcDataTagName()));
+                                if (config.getForceList().contains(tagName)) {
+                                    if (jsonObject.length() == 0) {
+                                        context.append(tagName, "");
+                                    } else if (jsonObject.length() == 1
+                                            && jsonObject.opt(config.getcDataTagName()) != null) {
+                                        context.append(tagName, jsonObject.opt(config.getcDataTagName()));
+                                    } else {
+                                        context.append(tagName, jsonObject);
+                                    }
                                 } else {
-                                    context.accumulate(tagName, jsonObject);
+                                    if (jsonObject.length() == 0) {
+                                        context.accumulate(tagName, "");
+                                    } else if (jsonObject.length() == 1
+                                            && jsonObject.opt(config.getcDataTagName()) != null) {
+                                        context.accumulate(tagName, jsonObject.opt(config.getcDataTagName()));
+                                    } else {
+                                        context.accumulate(tagName, jsonObject);
+                                    }
                                 }
+                                
                                 return false;
                             }
                         }

From 3f9b53fee4cec631e0d8ecf36ce3588e33ee7ee9 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 20:55:10 -0600
Subject: [PATCH 053/212] longer forcelist tests

---
 .../org/json/junit/XMLConfigurationTest.java  | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 1ff5949..47c588c 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -907,11 +907,10 @@ public class XMLConfigurationTest {
     }
 
     /**
-     * Confirm XMLParserConfiguration functionality
+     * Test forceList parameter
      */
     @Test
     public void testSimpleForceList() {
-
         String xmlStr = 
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
                 "<addresses>\n"+
@@ -933,6 +932,48 @@ public class XMLConfigurationTest {
 
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
+    @Test
+    public void testLongForceList() {
+        String xmlStr = 
+                "<servers>"+
+                    "<server>"+
+                        "<name>host1</name>"+
+                        "<os>Linux</os>"+
+                        "<interfaces>"+
+                            "<interface>"+
+                                "<name>em0</name>"+
+                                "<ip_address>10.0.0.1</ip_address>"+
+                            "</interface>"+
+                        "</interfaces>"+
+                    "</server>"+
+                "</servers>";
+
+        String expectedStr = 
+            "{"+
+            "\"servers\": ["+
+              "{"+
+                "\"server\": {"+
+                  "\"name\": \"host1\","+
+                  "\"os\": \"Linux\","+
+                  "\"interfaces\": ["+
+                   "{"+
+                     "\"interface\": {"+
+                       "\"name\": \"em0\","+
+                       "\"ip_address\": \"10.0.0.1\""+
+                      "}}]}}]}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("servers");
+        forceList.add("interfaces");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
     
     
     /**

From e638955034b4c95849fe3f9ef144b4f8ecaea663 Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 21:05:05 -0600
Subject: [PATCH 054/212] Pass test case for empty tag with forceList

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

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 45384d3..d78ae1f 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -415,7 +415,7 @@ public class XML {
                             if (parse(x, jsonObject, tagName, config)) {
                                 if (config.getForceList().contains(tagName)) {
                                     if (jsonObject.length() == 0) {
-                                        context.append(tagName, "");
+                                        context.put(tagName, new JSONArray());
                                     } else if (jsonObject.length() == 1
                                             && jsonObject.opt(config.getcDataTagName()) != null) {
                                         context.append(tagName, jsonObject.opt(config.getcDataTagName()));
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 47c588c..3008024 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -919,7 +919,8 @@ public class XMLConfigurationTest {
                 "   </address>\n"+
                 "</addresses>";
 
-        String expectedStr = "{\"addresses\":[{\"address\":{\"name\":\"Sherlock Holmes\"}}]}";
+        String expectedStr = 
+                "{\"addresses\":[{\"address\":{\"name\":\"Sherlock Holmes\"}}]}";
         
         Set<String> forceList = new HashSet<String>();
         forceList.add("addresses");
@@ -949,18 +950,18 @@ public class XMLConfigurationTest {
                 "</servers>";
 
         String expectedStr = 
-            "{"+
-            "\"servers\": ["+
-              "{"+
-                "\"server\": {"+
-                  "\"name\": \"host1\","+
-                  "\"os\": \"Linux\","+
-                  "\"interfaces\": ["+
-                   "{"+
-                     "\"interface\": {"+
-                       "\"name\": \"em0\","+
-                       "\"ip_address\": \"10.0.0.1\""+
-                      "}}]}}]}";
+                "{"+
+                    "\"servers\": ["+
+                        "{"+
+                            "\"server\": {"+
+                            "\"name\": \"host1\","+
+                            "\"os\": \"Linux\","+
+                            "\"interfaces\": ["+
+                                "{"+
+                                    "\"interface\": {"+
+                                    "\"name\": \"em0\","+
+                                    "\"ip_address\": \"10.0.0.1\""+
+                                    "}}]}}]}";
         
         Set<String> forceList = new HashSet<String>();
         forceList.add("servers");
@@ -974,7 +975,25 @@ public class XMLConfigurationTest {
 
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
-    
+    @Test
+    public void testEmptyForceList() {
+        String xmlStr = 
+                "<addresses></addresses>";
+
+        String expectedStr = 
+                "{\"addresses\":[]}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("addresses");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
     
     /**
      * Convenience method, given an input string and expected result,

From 5dd78bc0b96eceb77f9ba113e2e5f7867053ee7e Mon Sep 17 00:00:00 2001
From: Zach <zehaom@umich.edu>
Date: Fri, 19 Nov 2021 21:22:38 -0600
Subject: [PATCH 055/212] Test case passed with tags with multiple entries set
 forceList

---
 src/main/java/org/json/XML.java               | 22 ++++--
 .../org/json/junit/XMLConfigurationTest.java  | 77 +++++++++++++++++++
 2 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index d78ae1f..9b2ba89 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -380,12 +380,23 @@ public class XML {
                     if (x.nextToken() != GT) {
                         throw x.syntaxError("Misshaped tag");
                     }
-                    if (nilAttributeFound) {
-                        context.accumulate(tagName, JSONObject.NULL);
-                    } else if (jsonObject.length() > 0) {
-                        context.accumulate(tagName, jsonObject);
+                    if (config.getForceList().contains(tagName)) {
+                        // Force the value to be an array
+                        if (nilAttributeFound) {
+                            context.append(tagName, JSONObject.NULL);
+                        } else if (jsonObject.length() > 0) {
+                            context.append(tagName, jsonObject);
+                        } else {
+                            context.put(tagName, new JSONArray());
+                        }
                     } else {
-                        context.accumulate(tagName, "");
+                        if (nilAttributeFound) {
+                            context.accumulate(tagName, JSONObject.NULL);
+                        } else if (jsonObject.length() > 0) {
+                            context.accumulate(tagName, jsonObject);
+                        } else {
+                            context.accumulate(tagName, "");
+                        }
                     }
                     return false;
 
@@ -414,6 +425,7 @@ public class XML {
                             // Nested element
                             if (parse(x, jsonObject, tagName, config)) {
                                 if (config.getForceList().contains(tagName)) {
+                                    // Force the value to be an array
                                     if (jsonObject.length() == 0) {
                                         context.put(tagName, new JSONArray());
                                     } else if (jsonObject.length() == 1
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 3008024..2ab06be 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -976,6 +976,45 @@ public class XMLConfigurationTest {
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
     @Test
+    public void testMultipleTagForceList() {
+        String xmlStr = 
+                "<addresses>\n"+
+                "   <address>\n"+
+                "      <name>Sherlock Holmes</name>\n"+
+                "      <name>John H. Watson</name>\n"+
+                "   </address>\n"+
+                "</addresses>";
+
+        String expectedStr = 
+                "{"+
+                    "\"addresses\":["+
+                    "{"+
+                        "\"address\":["+
+                            "{"+
+                                "\"name\":["+
+                                "\"Sherlock Holmes\","+
+                                "\"John H. Watson\""+
+                                "]"+
+                            "}"+
+                        "]"+
+                    "}"+
+                    "]"+
+                "}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("addresses");
+        forceList.add("address");
+        forceList.add("name");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
+    @Test
     public void testEmptyForceList() {
         String xmlStr = 
                 "<addresses></addresses>";
@@ -994,6 +1033,44 @@ public class XMLConfigurationTest {
 
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
+    @Test
+    public void testContentForceList() {
+        String xmlStr = 
+                "<addresses>Baker Street</addresses>";
+
+        String expectedStr = 
+                "{\"addresses\":[\"Baker Street\"]}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("addresses");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
+    @Test
+    public void testEmptyTagForceList() {
+        String xmlStr = 
+                "<addresses />";
+
+        String expectedStr = 
+                "{\"addresses\":[]}";
+        
+        Set<String> forceList = new HashSet<String>();
+        forceList.add("addresses");
+
+        XMLParserConfiguration config = 
+                new XMLParserConfiguration()
+                        .withForceList(forceList);
+        JSONObject jsonObject = XML.toJSONObject(xmlStr, config);
+        JSONObject expetedJsonObject = new JSONObject(expectedStr);
+
+        Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
+    }
     
     /**
      * Convenience method, given an input string and expected result,

From 812955e39d5324780c3867e582f33c531466b7f3 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Fri, 26 Nov 2021 20:07:21 -0500
Subject: [PATCH 056/212] Use IdentityHashSet for cycle detection

Fixes https://github.com/stleary/JSON-java/issues/650
---
 src/main/java/org/json/JSONObject.java        |  5 +--
 .../java/org/json/junit/JSONObjectTest.java   | 16 +++++++++
 .../json/junit/data/RecursiveBeanEquals.java  | 33 +++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/json/junit/data/RecursiveBeanEquals.java

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 77d509b..99a0750 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -37,9 +37,10 @@ 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.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
@@ -1526,7 +1527,7 @@ public class JSONObject {
      *            the bean
      */
     private void populateMap(Object bean) {
-        populateMap(bean, new HashSet<Object>());
+        populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()));
     }
 
     private void populateMap(Object bean, Set<Object> objectsRecord) {
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 381c942..7f4fb72 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -74,6 +74,7 @@ import org.json.junit.data.MyNumber;
 import org.json.junit.data.MyNumberContainer;
 import org.json.junit.data.MyPublicClass;
 import org.json.junit.data.RecursiveBean;
+import org.json.junit.data.RecursiveBeanEquals;
 import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
@@ -3311,6 +3312,21 @@ public class JSONObjectTest {
         new JSONObject(ObjD);
         new JSONObject(ObjE);
     }
+    @Test(expected=JSONException.class)
+    public void testRecursiveEquals() {
+        RecursiveBeanEquals a = new RecursiveBeanEquals("same");
+        a.setRef(a);
+        new JSONObject(a);
+    }
+    @Test
+    public void testNotRecursiveEquals() {
+        RecursiveBeanEquals a = new RecursiveBeanEquals("same");
+        RecursiveBeanEquals b = new RecursiveBeanEquals("same");
+        RecursiveBeanEquals c = new RecursiveBeanEquals("same");
+        a.setRef(b);
+        b.setRef(c);
+        new JSONObject(a);
+    }
 
 
     @Test
diff --git a/src/test/java/org/json/junit/data/RecursiveBeanEquals.java b/src/test/java/org/json/junit/data/RecursiveBeanEquals.java
new file mode 100644
index 0000000..1016648
--- /dev/null
+++ b/src/test/java/org/json/junit/data/RecursiveBeanEquals.java
@@ -0,0 +1,33 @@
+package org.json.junit.data;
+
+/** test class for verifying if recursively defined bean can be correctly identified */
+public class RecursiveBeanEquals {
+  private final String name;
+  private Object reference;
+
+  public RecursiveBeanEquals(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public Object getRef() {
+    return reference;
+  }
+
+  public void setRef(Object refObj) {
+    reference = refObj;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other instanceof RecursiveBeanEquals && name.equals(((RecursiveBeanEquals) other).name);
+  }
+
+  @Override
+  public int hashCode() {
+    return name.hashCode();
+  }
+}

From 48b6aa3e4cdc36193f1c5fc981cc16097910521b Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 5 Dec 2021 09:10:32 -0600
Subject: [PATCH 057/212] Update RELEASES.md

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 0fda8b9..7662d13 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20211205    Recent commits and some bug fixes for similar()
+
 20210307    Recent commits and potentially breaking fix to JSONPointer
 
 20201115    Recent commits and first release after project structure change

From 8ef8e1463d92f8d164b4cd629b67dd55a5198597 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 5 Dec 2021 09:12:55 -0600
Subject: [PATCH 058/212] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 643bea5..fac7a2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20210307</version>
+    <version>20211205</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From f1b0210b8acdbc5f5316bc5507e2f3630506a9a3 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 5 Dec 2021 10:36:03 -0600
Subject: [PATCH 059/212] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6f0bdd9..471bf43 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20210307/json-20210307.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20211205/json-20211205.jar)**
 
 
 # Overview
@@ -106,4 +106,4 @@ For more information on files, please see [FILES.md](https://github.com/stleary/
 
 # Release history:
 
-For the release history, please see [RELEASES.md](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
\ No newline at end of file
+For the release history, please see [RELEASES.md](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)

From 7a124d857dc8da1165c87fa788e53359a317d0f7 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Wed, 26 Jan 2022 12:19:53 -0500
Subject: [PATCH 060/212] Add test cases for invalid input

---
 build.gradle                                  |   2 +-
 src/main/java/org/json/JSONObject.java        |   7 +
 src/main/java/org/json/JSONTokener.java       |  18 +-
 src/test/java/org/json/junit/CDLTest.java     |   2 +-
 .../java/org/json/junit/JSONArrayTest.java    |  16 +
 .../java/org/json/junit/JSONObjectTest.java   |  47 +
 .../resources/Issue654WellFormedArray.json    | 822 ++++++++++++++++++
 .../resources/Issue654WellFormedObject.json   | 822 ++++++++++++++++++
 8 files changed, 1732 insertions(+), 4 deletions(-)
 create mode 100644 src/test/resources/Issue654WellFormedArray.json
 create mode 100644 src/test/resources/Issue654WellFormedObject.json

diff --git a/build.gradle b/build.gradle
index 3b403ec..63a31a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20200429-SNAPSHOT'
+version = 'v20211205-SNAPSHOT'
 description = 'JSON in Java'
 sourceCompatibility = '1.7'
 
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 99a0750..5c37249 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -225,12 +225,19 @@ public class JSONObject {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
+            char prev = x.getPrevious();
             c = x.nextClean();
             switch (c) {
             case 0:
                 throw x.syntaxError("A JSONObject text must end with '}'");
             case '}':
                 return;
+            case '{':
+            case '[':
+                if(prev=='{') {
+                    throw x.syntaxError("A JSON Object can not directly nest another JSON Object or JSON Array.");
+                }
+                // fall through
             default:
                 x.back();
                 key = x.nextValue().toString();
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index e6821de..7f0c86a 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -209,6 +209,12 @@ public class JSONTokener {
         this.previous = (char) c;
         return this.previous;
     }
+    
+    /**
+     * Get the last character read from the input or '\0' if nothing has been read yet.
+     * @return the last character read from the input.
+     */
+    protected char getPrevious() { return this.previous;}
 
     /**
      * Increments the internal indexes according to the previous character
@@ -428,10 +434,18 @@ public class JSONTokener {
             return this.nextString(c);
         case '{':
             this.back();
-            return new JSONObject(this);
+            try {
+                return new JSONObject(this);
+            } catch (StackOverflowError e) {
+                throw new JSONException("JSON Array or Object depth too large to process.", e);
+            }
         case '[':
             this.back();
-            return new JSONArray(this);
+            try {
+                return new JSONArray(this);
+            } catch (StackOverflowError e) {
+                throw new JSONException("JSON Array or Object depth too large to process.", e);
+            }
         }
 
         /*
diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
index 48586b7..b8bdede 100644
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
@@ -190,7 +190,7 @@ public class CDLTest {
                    CDL.toJSONArray(badLine);
                    fail("Expecting an exception");
                } catch (JSONException e) {
-            	   System.out.println("Message" + e.getMessage());
+            	   //System.out.println("Message" + e.getMessage());
                    assertEquals("Expecting an exception message",
                            "Bad character 'V' (86). at 20 [character 9 line 2]",
                            e.getMessage());
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index eafda51..2e32632 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -29,8 +29,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -47,6 +49,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONTokener;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -1282,4 +1285,17 @@ public class JSONArrayTest {
 		assertTrue("expected jsonArray.length() == 0", jsonArray.length() == 0); //Check if its length is 0
 		jsonArray.getInt(0); //Should throws org.json.JSONException: JSONArray[0] not found
 	}
+
+    /**
+    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
+    */
+    @Test(expected = JSONException.class)
+    public void issue654StackOverflowInputWellFormed() {
+        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
+        final InputStream resourceAsStream = JSONObjectTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedArray.json");
+        JSONTokener tokener = new JSONTokener(resourceAsStream);
+        JSONArray json_input = new JSONArray(tokener);
+        assertNotNull(json_input);
+        fail("Excepected Exception.");
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 7f4fb72..b91fccb 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -35,6 +35,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -3351,4 +3352,50 @@ public class JSONObjectTest {
         assertTrue("expected jsonObject.length() == 0", jsonObject.length() == 0); //Check if its length is 0
         jsonObject.getInt("key1"); //Should throws org.json.JSONException: JSONObject["asd"] not found
     }
+
+    /**
+    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
+    */
+    @Test(expected = JSONException.class)
+    public void issue654StackOverflowInput() {
+        //String base64Bytes ="eyJHWiI6Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMCkwLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3sJe3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTApMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7ewl7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7c3t7e3t7e3vPAAAAAAAAAHt7e3t7e3t7e3t7e3t7e3t7e3t7e1ste3t7e3t7e3t7e3t7e3t7e3t7e3t7CXt7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3tbLTAtMCx7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e1stMC0wLHt7e3t7e3t7e3t7e3t7e3t7e88AAAAAAAAAe3t7e3t7e3t7e3t7e3t7e3t7e3t7Wy0wLTAse3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7e3t7f3syMv//e3t7e3t7e3t7e3t7e3sx//////8=";
+        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
+        String input = "{\"GZ\":[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{  {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{    {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0)0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{   {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{{{{{{{{{{{{{{{{{{{{[-0-0,{{{{{{{{{{s{{{{{{{";
+        JSONObject json_input = new JSONObject(input);
+        assertNotNull(json_input);
+        fail("Excepected Exception.");
+    }
+
+    /**
+    * Tests for incorrect object/array nesting. See https://github.com/stleary/JSON-java/issues/654
+    */
+    @Test(expected = JSONException.class)
+    public void issue654IncorrectNestingNoKey1() {
+        JSONObject json_input = new JSONObject("{{\"a\":0}}");
+        assertNotNull(json_input);
+        fail("Excepected Exception.");
+    }
+
+    /**
+    * Tests for incorrect object/array nesting. See https://github.com/stleary/JSON-java/issues/654
+    */
+    @Test(expected = JSONException.class)
+    public void issue654IncorrectNestingNoKey2() {
+        JSONObject json_input = new JSONObject("{[\"a\"]}");
+        assertNotNull(json_input);
+        fail("Excepected Exception.");
+    }
+    
+    /**
+    * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
+    */
+    @Test(expected = JSONException.class)
+    public void issue654StackOverflowInputWellFormed() {
+        //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
+        final InputStream resourceAsStream = JSONObjectTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedObject.json");
+        JSONTokener tokener = new JSONTokener(resourceAsStream);
+        JSONObject json_input = new JSONObject(tokener);
+        assertNotNull(json_input);
+        fail("Excepected Exception.");
+    }
 }
diff --git a/src/test/resources/Issue654WellFormedArray.json b/src/test/resources/Issue654WellFormedArray.json
new file mode 100644
index 0000000..513e1b4
--- /dev/null
+++ b/src/test/resources/Issue654WellFormedArray.json
@@ -0,0 +1,822 @@
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",
+["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",["a",[]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
+]]]]]]]]]]]]
diff --git a/src/test/resources/Issue654WellFormedObject.json b/src/test/resources/Issue654WellFormedObject.json
new file mode 100644
index 0000000..70344c1
--- /dev/null
+++ b/src/test/resources/Issue654WellFormedObject.json
@@ -0,0 +1,822 @@
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":
+{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}
+}}}}}}}}}}}}

From 5cfe216ffd1e668a7e39ac85c8add71e68bc26c6 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Fri, 4 Feb 2022 08:08:41 -0600
Subject: [PATCH 061/212] Update codeql-analysis.yml

...
---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b57d361..4afee84 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,4 +1,4 @@
-name: "CodeQL"
+name: "CodeQL" 
 
 on:
   push:

From 4f78ec666af6480d985bc437c183512bbbbe74da Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 20 Mar 2022 09:25:53 -0500
Subject: [PATCH 062/212] Update RELEASES.md

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 7662d13..3e265ff 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20220320    Recent commits
+
 20211205    Recent commits and some bug fixes for similar()
 
 20210307    Recent commits and potentially breaking fix to JSONPointer

From 04a765647ed5f9301d3fec13c4e539072f207a61 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 20 Mar 2022 09:27:38 -0500
Subject: [PATCH 063/212] Update README.md

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

diff --git a/README.md b/README.md
index 471bf43..69869cd 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20211205/json-20211205.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20220320/json-20220320.jar)**
 
 
 # Overview

From c0a1d5f741154948e9201e99876bb4bb131110b5 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 20 Mar 2022 09:28:19 -0500
Subject: [PATCH 064/212] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fac7a2e..e4a3503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20211205</version>
+    <version>20220320</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From 9abb35ad396497972df716b460c79ed1bd32c3b3 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 20 Mar 2022 09:34:12 -0500
Subject: [PATCH 065/212] Update RELEASES.md

---
 docs/RELEASES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 3e265ff..149525d 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,7 +5,7 @@ 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)
 
 ~~~
-20220320    Recent commits
+20220320    Wrap StackOverflow with JSONException
 
 20211205    Recent commits and some bug fixes for similar()
 

From a6423293140a7ed2fb2617394081f313b2941f40 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 21 Mar 2022 12:48:25 -0400
Subject: [PATCH 066/212] Updates value error messages to be consistent.

Provide both the type and value that failed conversion. Tries not to
"toString" large value types like Arrays or Maps. For those types it
will just output the type and not a value.
---
 src/main/java/org/json/JSONArray.java  | 51 +++++++++----------
 src/main/java/org/json/JSONObject.java | 69 ++++++++++++--------------
 src/main/java/org/json/XML.java        |  1 -
 3 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 7e95a96..2b33e1d 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -288,7 +288,7 @@ public class JSONArray implements Iterable<Object> {
                         .equalsIgnoreCase("true"))) {
             return true;
         }
-        throw wrongValueFormatException(index, "boolean", null);
+        throw wrongValueFormatException(index, "boolean", object, null);
     }
 
     /**
@@ -309,7 +309,7 @@ public class JSONArray implements Iterable<Object> {
         try {
             return Double.parseDouble(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(index, "double", e);
+            throw wrongValueFormatException(index, "double", object, e);
         }
     }
 
@@ -331,7 +331,7 @@ public class JSONArray implements Iterable<Object> {
         try {
             return Float.parseFloat(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(index, "float", e);
+            throw wrongValueFormatException(index, "float", object, e);
         }
     }
 
@@ -353,7 +353,7 @@ public class JSONArray implements Iterable<Object> {
             }
             return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(index, "number", e);
+            throw wrongValueFormatException(index, "number", object, e);
         }
     }
 
@@ -378,7 +378,7 @@ public class JSONArray implements Iterable<Object> {
             // If it did, I would re-implement this with the Enum.valueOf
             // method and place any thrown exception in the JSONException
             throw wrongValueFormatException(index, "enum of type "
-                    + JSONObject.quote(clazz.getSimpleName()), null);
+                    + JSONObject.quote(clazz.getSimpleName()), opt(index), null);
         }
         return val;
     }
@@ -441,7 +441,7 @@ public class JSONArray implements Iterable<Object> {
         try {
             return Integer.parseInt(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(index, "int", e);
+            throw wrongValueFormatException(index, "int", object, e);
         }
     }
 
@@ -460,7 +460,7 @@ public class JSONArray implements Iterable<Object> {
         if (object instanceof JSONArray) {
             return (JSONArray) object;
         }
-        throw wrongValueFormatException(index, "JSONArray", null);
+        throw wrongValueFormatException(index, "JSONArray", object, null);
     }
 
     /**
@@ -478,7 +478,7 @@ public class JSONArray implements Iterable<Object> {
         if (object instanceof JSONObject) {
             return (JSONObject) object;
         }
-        throw wrongValueFormatException(index, "JSONObject", null);
+        throw wrongValueFormatException(index, "JSONObject", object, null);
     }
 
     /**
@@ -499,7 +499,7 @@ public class JSONArray implements Iterable<Object> {
         try {
             return Long.parseLong(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(index, "long", e);
+            throw wrongValueFormatException(index, "long", object, e);
         }
     }
 
@@ -517,7 +517,7 @@ public class JSONArray implements Iterable<Object> {
         if (object instanceof String) {
             return (String) object;
         }
-        throw wrongValueFormatException(index, "String", null);
+        throw wrongValueFormatException(index, "String", object, null);
     }
 
     /**
@@ -1464,6 +1464,7 @@ public class JSONArray implements Iterable<Object> {
      *         &nbsp;<small>(right bracket)</small>.
      * @throws JSONException if a called function fails
      */
+    @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter sw = new StringWriter();
         synchronized (sw.getBuffer()) {
@@ -1513,6 +1514,7 @@ public class JSONArray implements Iterable<Object> {
      * @return The writer.
      * @throws JSONException if a called function fails or unable to write
      */
+    @SuppressWarnings("resource")
     public Writer write(Writer writer, int indentFactor, int indent)
             throws JSONException {
         try {
@@ -1680,22 +1682,6 @@ public class JSONArray implements Iterable<Object> {
         }
     }
     
-    /**
-     * Create a new JSONException in a common format for incorrect conversions.
-     * @param idx index of the item
-     * @param valueType the type of value being coerced to
-     * @param cause optional cause of the coercion failure
-     * @return JSONException that can be thrown.
-     */
-    private static JSONException wrongValueFormatException(
-            int idx,
-            String valueType,
-            Throwable cause) {
-        return new JSONException(
-                "JSONArray[" + idx + "] is not a " + valueType + "."
-                , cause);
-    }
-    
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param idx index of the item
@@ -1708,8 +1694,19 @@ public class JSONArray implements Iterable<Object> {
             String valueType,
             Object value,
             Throwable cause) {
+        if(value == null) {
+            return new JSONException(
+                    "JSONArray[" + idx + "] is not a " + valueType + " (null)."
+                    , cause);
+        }
+        // don't try to toString collections or known object types that could be large.
+        if(value instanceof Map || value instanceof Iterable || value instanceof JSONObject) {
+            return new JSONException(
+                    "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + ")."
+                    , cause);
+        }
         return new JSONException(
-                "JSONArray[" + idx + "] is not a " + valueType + " (" + value + ")."
+                "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + " : " + value + ")."
                 , cause);
     }
 
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 5c37249..ea549e3 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -609,7 +609,7 @@ public class JSONObject {
             // JSONException should really take a throwable argument.
             // If it did, I would re-implement this with the Enum.valueOf
             // method and place any thrown exception in the JSONException
-            throw wrongValueFormatException(key, "enum of type " + quote(clazz.getSimpleName()), null);
+            throw wrongValueFormatException(key, "enum of type " + quote(clazz.getSimpleName()), opt(key), null);
         }
         return val;
     }
@@ -635,7 +635,7 @@ public class JSONObject {
                         .equalsIgnoreCase("true"))) {
             return true;
         }
-        throw wrongValueFormatException(key, "Boolean", null);
+        throw wrongValueFormatException(key, "Boolean", object, null);
     }
 
     /**
@@ -697,7 +697,7 @@ public class JSONObject {
         try {
             return Double.parseDouble(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(key, "double", e);
+            throw wrongValueFormatException(key, "double", object, e);
         }
     }
 
@@ -719,7 +719,7 @@ public class JSONObject {
         try {
             return Float.parseFloat(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(key, "float", e);
+            throw wrongValueFormatException(key, "float", object, e);
         }
     }
 
@@ -741,7 +741,7 @@ public class JSONObject {
             }
             return stringToNumber(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(key, "number", e);
+            throw wrongValueFormatException(key, "number", object, e);
         }
     }
 
@@ -763,7 +763,7 @@ public class JSONObject {
         try {
             return Integer.parseInt(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(key, "int", e);
+            throw wrongValueFormatException(key, "int", object, e);
         }
     }
 
@@ -781,7 +781,7 @@ public class JSONObject {
         if (object instanceof JSONArray) {
             return (JSONArray) object;
         }
-        throw wrongValueFormatException(key, "JSONArray", null);
+        throw wrongValueFormatException(key, "JSONArray", object, null);
     }
 
     /**
@@ -798,7 +798,7 @@ public class JSONObject {
         if (object instanceof JSONObject) {
             return (JSONObject) object;
         }
-        throw wrongValueFormatException(key, "JSONObject", null);
+        throw wrongValueFormatException(key, "JSONObject", object, null);
     }
 
     /**
@@ -819,7 +819,7 @@ public class JSONObject {
         try {
             return Long.parseLong(object.toString());
         } catch (Exception e) {
-            throw wrongValueFormatException(key, "long", e);
+            throw wrongValueFormatException(key, "long", object, e);
         }
     }
 
@@ -875,7 +875,7 @@ public class JSONObject {
         if (object instanceof String) {
             return (String) object;
         }
-        throw wrongValueFormatException(key, "string", null);
+        throw wrongValueFormatException(key, "string", object, null);
     }
 
     /**
@@ -1201,12 +1201,11 @@ public class JSONObject {
             }
             if (exact) {
                 return new BigDecimal(((Number)val).doubleValue());
-            }else {
-                // use the string constructor so that we maintain "nice" values for doubles and floats
-                // the double constructor will translate doubles to "exact" values instead of the likely
-                // intended representation
-                return new BigDecimal(val.toString());
             }
+            // use the string constructor so that we maintain "nice" values for doubles and floats
+            // the double constructor will translate doubles to "exact" values instead of the likely
+            // intended representation
+            return new BigDecimal(val.toString());
         }
         if (val instanceof Long || val instanceof Integer
                 || val instanceof Short || val instanceof Byte){
@@ -2021,6 +2020,7 @@ public class JSONObject {
      *            A String
      * @return A String correctly formatted for insertion in a JSON text.
      */
+    @SuppressWarnings("resource")
     public static String quote(String string) {
         StringWriter sw = new StringWriter();
         synchronized (sw.getBuffer()) {
@@ -2141,7 +2141,7 @@ public class JSONObject {
                 } else if (valueThis instanceof Number && valueOther instanceof Number) {
                     if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
                     	return false;
-                    };
+                    }
                 } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
@@ -2409,6 +2409,7 @@ public class JSONObject {
      * @throws JSONException
      *             If the object contains an invalid number.
      */
+    @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter w = new StringWriter();
         synchronized (w.getBuffer()) {
@@ -2502,9 +2503,7 @@ public class JSONObject {
             if (objectsRecord != null) {
                 return new JSONObject(object, objectsRecord);
             }
-            else {
-                return new JSONObject(object);
-            }
+            return new JSONObject(object);
         }
         catch (JSONException exception) {
             throw exception;
@@ -2527,6 +2526,7 @@ public class JSONObject {
         return this.write(writer, 0, 0);
     }
 
+    @SuppressWarnings("resource")
     static final Writer writeValue(Writer writer, Object value,
             int indentFactor, int indent) throws JSONException, IOException {
         if (value == null || value.equals(null)) {
@@ -2604,6 +2604,7 @@ public class JSONObject {
      * @throws JSONException if a called function has an error or a write error
      * occurs
      */
+    @SuppressWarnings("resource")
     public Writer write(Writer writer, int indentFactor, int indent)
             throws JSONException {
         try {
@@ -2686,22 +2687,6 @@ public class JSONObject {
         return results;
     }
 
-    /**
-     * Create a new JSONException in a common format for incorrect conversions.
-     * @param key name of the key
-     * @param valueType the type of value being coerced to
-     * @param cause optional cause of the coercion failure
-     * @return JSONException that can be thrown.
-     */
-    private static JSONException wrongValueFormatException(
-            String key,
-            String valueType,
-            Throwable cause) {
-        return new JSONException(
-                "JSONObject[" + quote(key) + "] is not a " + valueType + "."
-                , cause);
-    }
-
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param key name of the key
@@ -2714,8 +2699,20 @@ public class JSONObject {
             String valueType,
             Object value,
             Throwable cause) {
+        if(value == null) {
+
+            return new JSONException(
+                    "JSONObject[" + quote(key) + "] is not a " + valueType + " (null)."
+                    , cause);
+        }
+        // don't try to toString collections or known object types that could be large.
+        if(value instanceof Map || value instanceof Iterable || value instanceof JSONObject) {
+            return new JSONException(
+                    "JSONObject[" + quote(key) + "] is not a " + valueType + " (" + value.getClass() + ")."
+                    , cause);
+        }
         return new JSONException(
-                "JSONObject[" + quote(key) + "] is not a " + valueType + " (" + value + ")."
+                "JSONObject[" + quote(key) + "] is not a " + valueType + " (" + value.getClass() + " : " + value + ")."
                 , cause);
     }
 
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 9b2ba89..33838a1 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import java.io.Reader;
 import java.io.StringReader;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Iterator;

From beae279b2122c85868c04bad9c6282b772606dae Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 21 Mar 2022 13:06:19 -0400
Subject: [PATCH 067/212] Updates tests to have updated message expectations

---
 src/test/java/org/json/junit/JSONArrayTest.java  | 14 +++++++-------
 src/test/java/org/json/junit/JSONMLTest.java     |  2 +-
 src/test/java/org/json/junit/JSONObjectTest.java | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 2e32632..987891e 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -412,7 +412,7 @@ public class JSONArrayTest {
             assertTrue("expected getBoolean to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a boolean.",e.getMessage());
+                    "JSONArray[4] is not a boolean (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.get(-1);
@@ -426,42 +426,42 @@ public class JSONArrayTest {
             assertTrue("expected getDouble to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a double.",e.getMessage());
+                    "JSONArray[4] is not a double (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.getInt(4);
             assertTrue("expected getInt to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a int.",e.getMessage());
+                    "JSONArray[4] is not a int (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.getJSONArray(4);
             assertTrue("expected getJSONArray to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a JSONArray.",e.getMessage());
+                    "JSONArray[4] is not a JSONArray (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.getJSONObject(4);
             assertTrue("expected getJSONObject to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a JSONObject.",e.getMessage());
+                    "JSONArray[4] is not a JSONObject (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.getLong(4);
             assertTrue("expected getLong to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a long.",e.getMessage());
+                    "JSONArray[4] is not a long (class java.lang.String : hello).",e.getMessage());
         }
         try {
             jsonArray.getString(5);
             assertTrue("expected getString to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[5] is not a String.",e.getMessage());
+                    "JSONArray[5] is not a String (class java.math.BigDecimal : 0.002345).",e.getMessage());
         }
     }
 
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 8f3de42..390cbd8 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -158,7 +158,7 @@ public class JSONMLTest {
             assertTrue("Expecting an exception", false);
         } catch (JSONException e) {
             assertEquals("Expecting an exception message",
-                "JSONArray[0] is not a String.",
+                "JSONArray[0] is not a String (class org.json.JSONArray).",
                 e.getMessage());
         }
     }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index b91fccb..2ba58bf 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1090,7 +1090,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a Boolean.",
+                    "JSONObject[\"stringKey\"] is not a Boolean (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1106,7 +1106,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"trueKey\"] is not a string.",
+                    "JSONObject[\"trueKey\"] is not a string (class java.lang.Boolean : true).",
                     e.getMessage());
         }
         try {
@@ -1122,7 +1122,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a double.",
+                    "JSONObject[\"stringKey\"] is not a double (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1138,7 +1138,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a float.",
+                    "JSONObject[\"stringKey\"] is not a float (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1154,7 +1154,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a int.",
+                    "JSONObject[\"stringKey\"] is not a int (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1170,7 +1170,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a long.",
+                    "JSONObject[\"stringKey\"] is not a long (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1186,7 +1186,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a JSONArray.",
+                    "JSONObject[\"stringKey\"] is not a JSONArray (class java.lang.String : hello world!).",
                     e.getMessage());
         }
         try {
@@ -1202,7 +1202,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a JSONObject.",
+                    "JSONObject[\"stringKey\"] is not a JSONObject (class java.lang.String : hello world!).",
                     e.getMessage());
         }
     }

From 89f16ad0af9f7c1097a4336c8fda02afd4b87563 Mon Sep 17 00:00:00 2001
From: Scott Paffrath <33729384+spaffrath@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:00:33 -0700
Subject: [PATCH 068/212] Issue 682 JSONString similarity

---
 src/main/java/org/json/JSONArray.java         |  4 ++++
 src/main/java/org/json/JSONObject.java        |  4 ++++
 .../java/org/json/junit/JSONArrayTest.java    | 24 +++++++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 22 +++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 2b33e1d..7f09114 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1386,6 +1386,10 @@ public class JSONArray implements Iterable<Object> {
                 if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
                 	return false;
                 }
+            } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+                if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
+                    return false;
+                }
             } else if (!valueThis.equals(valueOther)) {
                 return false;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ea549e3..859b3e5 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2142,6 +2142,10 @@ public class JSONObject {
                     if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
                     	return false;
                     }
+                } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+                    if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
+                    	return false;
+                    }
                 } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 987891e..959954b 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -26,6 +26,7 @@ SOFTWARE.
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -49,7 +50,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.junit.data.MyJsonString;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -1298,4 +1301,25 @@ public class JSONArrayTest {
         assertNotNull(json_input);
         fail("Excepected Exception.");
     }
+
+    @Test
+    public void testIssue682SimilarityOfJSONString() {
+        JSONArray ja1 = new JSONArray()
+                .put(new MyJsonString())
+                .put(2);
+        JSONArray ja2 = new JSONArray()
+                .put(new MyJsonString())
+                .put(2);
+        assertTrue(ja1.similar(ja2));
+
+        JSONArray ja3 = new JSONArray()
+                .put(new JSONString() {
+                    @Override
+                    public String toJSONString() {
+                        return "\"different value\"";
+                    }
+                })
+                .put(2);
+        assertFalse(ja1.similar(ja3));
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2ba58bf..d244f2f 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -57,6 +57,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONString;
 import org.json.JSONTokener;
 import org.json.XML;
 import org.json.junit.data.BrokenToString;
@@ -3398,4 +3399,25 @@ public class JSONObjectTest {
         assertNotNull(json_input);
         fail("Excepected Exception.");
     }
+
+    @Test
+    public void testIssue682SimilarityOfJSONString() {
+        JSONObject jo1 = new JSONObject()
+                .put("a", new MyJsonString())
+                .put("b", 2);
+        JSONObject jo2 = new JSONObject()
+                .put("a", new MyJsonString())
+                .put("b", 2);
+        assertTrue(jo1.similar(jo2));
+
+        JSONObject jo3 = new JSONObject()
+                .put("a", new JSONString() {
+                    @Override
+                    public String toJSONString() {
+                        return "\"different value\"";
+                    }
+                })
+                .put("b", 2);
+        assertFalse(jo1.similar(jo3));
+    }
 }

From b4036e6a8e0b10fbec9d59a52e4f64508a3b3870 Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Sat, 13 Aug 2022 12:50:10 -0500
Subject: [PATCH 069/212] pipeline-fix-1 remove v7 build from pipeline

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

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index ce91174..08352a0 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 1.7, 8, 11 ]
+        java: [ 8, 11 ]
     name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v2

From e0534b3ec75fb6dbaddb3c16b0fd6c0aabd6d6ee Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Sat, 20 Aug 2022 16:14:34 -0500
Subject: [PATCH 070/212] initial attempt to test for inconsistent map types in
 JSONObject

---
 src/main/java/org/json/JSONObject.java        |   4 +
 .../java/org/json/junit/JSONArrayTest.java    |  78 ++++-
 .../java/org/json/junit/JSONObjectTest.java   | 331 ++++++++++++------
 src/test/java/org/json/junit/Util.java        | 103 +++++-
 4 files changed, 393 insertions(+), 123 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ea549e3..782f8a4 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -166,6 +166,10 @@ public class JSONObject {
      */
     private final Map<String, Object> map;
 
+    public Class<? extends Map> getMapType() {
+        return map.getClass();
+    }
+
     /**
      * It is sometimes more convenient and less ambiguous to have a
      * <code>NULL</code> object than to use Java's <code>null</code> value.
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 987891e..946f407 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -237,6 +237,10 @@ public class JSONArrayTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaObj));
+        Util.checkJSONArrayMaps(expected);
+        Util.checkJSONArrayMaps(jaObj);
+        Util.checkJSONArrayMaps(jaRaw);
+        Util.checkJSONArrayMaps(jaInt);
     }
 
     /**
@@ -275,6 +279,7 @@ public class JSONArrayTest {
                          myList.get(i),
                          jsonArray.getString(myInts.length + i));
         }
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -308,6 +313,9 @@ public class JSONArrayTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaInt));
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                jaRaw, jaObj, jaInt
+        )));
     }
 
     
@@ -351,6 +359,9 @@ public class JSONArrayTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaObjObj));
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                expected, jaRaw, jaStrObj, jaStrInt, jaObjObj
+        )));
     }
 
     /**
@@ -397,6 +408,7 @@ public class JSONArrayTest {
                 new Long(-1).equals(jsonArray.getLong(12)));
 
         assertTrue("Array value null", jsonArray.isNull(-1));
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -463,6 +475,7 @@ public class JSONArrayTest {
             assertEquals("Expected an exception message",
                     "JSONArray[5] is not a String (class java.math.BigDecimal : 0.002345).",e.getMessage());
         }
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -499,6 +512,7 @@ public class JSONArrayTest {
         assertTrue("expected value4", "value4".equals(jsonArray.query("/10/key4")));
         assertTrue("expected 0", Integer.valueOf(0).equals(jsonArray.query("/11")));
         assertTrue("expected \"-1\"", "-1".equals(jsonArray.query("/12")));
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -512,6 +526,9 @@ public class JSONArrayTest {
         assertTrue("expected JSONArray length 13. instead found "+jsonArray.length(), jsonArray.length() == 13);
         JSONArray nestedJsonArray = jsonArray.getJSONArray(9);
         assertTrue("expected JSONArray length 1", nestedJsonArray.length() == 1);
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                jsonArray, nestedJsonArray
+        )));
     }
 
     /**
@@ -587,6 +604,10 @@ public class JSONArrayTest {
                 "hello".equals(jsonArray.optString(4)));
         assertTrue("Array opt string default implicit",
                 "".equals(jsonArray.optString(-1)));
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                jsonArray, nestedJsonArray
+        )));
+        Util.checkJSONObjectMaps(nestedJsonObject);
     }
     
     /**
@@ -601,7 +622,9 @@ public class JSONArrayTest {
         assertTrue("unexpected optLong value",ja.optLong(0,0)==123);
         assertTrue("unexpected optDouble value",ja.optDouble(0,0.0)==123.0);
         assertTrue("unexpected optBigInteger value",ja.optBigInteger(0,BigInteger.ZERO).compareTo(new BigInteger("123"))==0);
-        assertTrue("unexpected optBigDecimal value",ja.optBigDecimal(0,BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);    }
+        assertTrue("unexpected optBigDecimal value",ja.optBigDecimal(0,BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
+        Util.checkJSONArrayMaps(ja);
+    }
 
     /**
      * Exercise the JSONArray.put(value) method with various parameters
@@ -677,6 +700,8 @@ public class JSONArrayTest {
         assertTrue("expected 2 items in [9]", ((List<?>)(JsonPath.read(doc, "$[9]"))).size() == 2);
         assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/9/0")));
         assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1")));
+        Util.checkJSONArrayMaps(jsonArray);
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -756,6 +781,8 @@ public class JSONArrayTest {
         assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1")));
         assertTrue("expected 1 item in [10]", ((Map<?,?>)(JsonPath.read(doc, "$[10]"))).size() == 1);
         assertTrue("expected v1", "v1".equals(jsonArray.query("/10/k1")));
+        Util.checkJSONObjectMaps(jsonObject);
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -772,6 +799,7 @@ public class JSONArrayTest {
         jsonArray.remove(0);
         assertTrue("array should be empty", null == jsonArray.remove(5));
         assertTrue("jsonArray should be empty", jsonArray.isEmpty());
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -811,6 +839,12 @@ public class JSONArrayTest {
         otherJsonArray.put("world");
         assertTrue("arrays values differ",
                 !jsonArray.similar(otherJsonArray));
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                jsonArray, otherJsonArray
+        )));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject, otherJsonObject
+        )));
     }
 
     /**
@@ -894,6 +928,7 @@ public class JSONArrayTest {
         for (String s : jsonArray4Strs) {
             list.contains(s);
         }
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -905,6 +940,9 @@ public class JSONArrayTest {
         JSONArray jsonArray = new JSONArray();
         assertTrue("toJSONObject should return null",
                 null == jsonArray.toJSONObject(names));
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                names, jsonArray
+        )));
     }
 
     /**
@@ -926,6 +964,7 @@ public class JSONArrayTest {
         assertTrue("expected 5", Integer.valueOf(5).equals(jsonArray.query("/4")));
         assertTrue("expected 6", Integer.valueOf(6).equals(jsonArray.query("/5")));
         assertTrue("expected 7", Integer.valueOf(7).equals(jsonArray.query("/6")));
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -968,6 +1007,10 @@ public class JSONArrayTest {
         assertTrue("Array value string long",
                 new Long(-1).equals(Long.parseLong((String) it.next())));
         assertTrue("should be at end of array", !it.hasNext());
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                jsonArray, nestedJsonArray
+        )));
+        Util.checkJSONObjectMaps(nestedJsonObject);
     }
     
     @Test(expected = JSONPointerException.class)
@@ -1010,6 +1053,7 @@ public class JSONArrayTest {
         } finally {
             stringWriter.close();
         }
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -1069,9 +1113,11 @@ public class JSONArrayTest {
                 && actualStr.contains("\"key2\": false")
                 && actualStr.contains("\"key3\": 3.14")
             );
+            Util.checkJSONArrayMaps(finalArray);
         } finally {
             stringWriter.close();
         }
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -1182,6 +1228,7 @@ public class JSONArrayTest {
         // assert that the new list is mutable
         assertTrue("Removing an entry should succeed", list.remove(2) != null);
         assertTrue("List should have 2 elements", list.size() == 2);
+        Util.checkJSONArrayMaps(jsonArray);
     }
 
     /**
@@ -1190,13 +1237,13 @@ public class JSONArrayTest {
      */
     @Test
     public void testJSONArrayInt() {
-    	assertNotNull(new JSONArray(0));
-    	assertNotNull(new JSONArray(5));
-    	// Check Size -> Even though the capacity of the JSONArray can be specified using a positive
-    	// integer but the length of JSONArray always reflects upon the items added into it.
-    	assertEquals(0l, new JSONArray(10).length());
+        assertNotNull(new JSONArray(0));
+        assertNotNull(new JSONArray(5));
+        // Check Size -> Even though the capacity of the JSONArray can be specified using a positive
+        // integer but the length of JSONArray always reflects upon the items added into it.
+        // assertEquals(0l, new JSONArray(10).length());
         try {
-        	assertNotNull("Should throw an exception", new JSONArray(-1));
+            assertNotNull("Should throw an exception", new JSONArray(-1));
         } catch (JSONException e) {
             assertEquals("Expected an exception message", 
                     "JSONArray initial capacity cannot be negative.",
@@ -1223,8 +1270,8 @@ public class JSONArrayTest {
         ((Collection<Object>)o).add("test");
         ((Collection<Object>)o).add(false);
         try {
-            a = new JSONArray(o);
-            assertNull("Should error", a);
+            JSONArray a0 = new JSONArray(o);
+            assertNull("Should error", a0);
         } catch (JSONException ex) {
         }
 
@@ -1232,10 +1279,11 @@ public class JSONArrayTest {
         // this is required for backwards compatibility
         o = a;
         try {
-            a = new JSONArray(o);
-            assertNull("Should error", a);
+            JSONArray a1 = new JSONArray(o);
+            assertNull("Should error", a1);
         } catch (JSONException ex) {
         }
+        Util.checkJSONArrayMaps(a);
     }
     
     /**
@@ -1252,6 +1300,9 @@ public class JSONArrayTest {
         for(int i = 0; i < a1.length(); i++) {
             assertEquals("index " + i + " are equal", a1.get(i), a2.get(i));
         }
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                a1, a2
+        )));
     }
     
     /**
@@ -1269,6 +1320,9 @@ public class JSONArrayTest {
         for(int i = 0; i < a1.length(); i++) {
             assertEquals("index " + i + " are equal", a1.get(i), a2.get(i));
         }
+        Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
+                a1, a2
+        )));
     }
 
     /**
@@ -1284,6 +1338,7 @@ public class JSONArrayTest {
 		jsonArray.clear(); //Clears the JSONArray
 		assertTrue("expected jsonArray.length() == 0", jsonArray.length() == 0); //Check if its length is 0
 		jsonArray.getInt(0); //Should throws org.json.JSONException: JSONArray[0] not found
+        Util.checkJSONArrayMaps(jsonArray);
 	}
 
     /**
@@ -1297,5 +1352,6 @@ public class JSONArrayTest {
         JSONArray json_input = new JSONArray(tokener);
         assertNotNull(json_input);
         fail("Excepected Exception.");
+        Util.checkJSONArrayMaps(json_input);
     }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2ba58bf..3681148 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -41,14 +41,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
@@ -80,6 +73,7 @@ import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
 import org.junit.Test;
+import org.json.junit.Util;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
@@ -140,8 +134,12 @@ public class JSONObjectTest {
         JSONObject first = new JSONObject("{\"a\": 1, \"b\": 2, \"c\": 3}");
         JSONObject second = new JSONObject("{\"a\": 1, \"b\": 2.0, \"c\": 4}");
         assertFalse("first-second should eval to false", first.similar(second));
+        List<JSONObject> jsonObjects = new ArrayList<JSONObject>(
+                Arrays.asList(obj1, obj2, obj3, obj4, obj5)
+        );
+        Util.checkJSONObjectsMaps(jsonObjects);
     }
-    
+
     @Test
     public void timeNumberParsing() {
         // test data to use
@@ -214,7 +212,9 @@ public class JSONObjectTest {
      */
     @Test(expected=NullPointerException.class)
     public void jsonObjectByNullBean() {
-        assertNull("Expected an exception",new JSONObject((MyBean)null));
+        JSONObject jsonObject = new JSONObject((MyBean)null);
+        assertNull("Expected an exception", jsonObject);
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -232,6 +232,7 @@ public class JSONObjectTest {
         assertTrue("expected value1", textStr.contains("\"value1\""));
         assertTrue("expected key2", textStr.contains("\"key2\""));
         assertTrue("expected 42", textStr.contains("42"));
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     @Test
@@ -252,6 +253,7 @@ public class JSONObjectTest {
         final String actualString = json.optString("key");
         assert str.equals(actualString) : "Incorrect key value. Got "
                 + actualString + " expected " + str;
+        Util.checkJSONObjectMaps(json);
     }
     
     /**
@@ -261,6 +263,7 @@ public class JSONObjectTest {
     public void emptyJsonObject() {
         JSONObject jsonObject = new JSONObject();
         assertTrue("jsonObject should be empty", jsonObject.isEmpty());
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -291,6 +294,7 @@ public class JSONObjectTest {
         assertTrue("expected \"nullKey\":null", JSONObject.NULL.equals(jsonObjectByName.query("/nullKey")));
         assertTrue("expected \"stringKey\":\"hello world!\"", "hello world!".equals(jsonObjectByName.query("/stringKey")));
         assertTrue("expected \"doubleKey\":-23.45e67", new BigDecimal("-23.45e67").equals(jsonObjectByName.query("/doubleKey")));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(jsonObject, jsonObjectByName)));
     }
 
     /**
@@ -304,6 +308,7 @@ public class JSONObjectTest {
         Map<String, Object> map = null;
         JSONObject jsonObject = new JSONObject(map);
         assertTrue("jsonObject should be empty", jsonObject.isEmpty());
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -329,6 +334,7 @@ public class JSONObjectTest {
         assertTrue("expected \"stringKey\":\"hello world!\"", "hello world!".equals(jsonObject.query("/stringKey")));
         assertTrue("expected \"escapeStringKey\":\"h\be\tllo w\u1234orld!\"", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
         assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -367,6 +373,9 @@ public class JSONObjectTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaObjObj));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(
+                Arrays.asList(jaRaw, jaStrObj, jaStrInt, jaObjObj))
+        );
     }
     
     /**
@@ -384,8 +393,8 @@ public class JSONObjectTest {
          * The only getter is getNumber (key=number), whose return value is
          * BigDecimal(42). 
          */
-        JSONObject jsonObject = new JSONObject(new MyNumberContainer());
-        String actual = jsonObject.toString();
+        JSONObject jsonObject0 = new JSONObject(new MyNumberContainer());
+        String actual = jsonObject0.toString();
         String expected = "{\"myNumber\":{\"number\":42}}";
         assertEquals("Equal", expected , actual);
         
@@ -397,9 +406,9 @@ public class JSONObjectTest {
          * The MyNumber.toString() method is responsible for
          * returning a reasonable value: the string '42'.
          */
-        jsonObject = new JSONObject();
-        jsonObject.put("myNumber", new MyNumber());
-        actual = jsonObject.toString();
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("myNumber", new MyNumber());
+        actual = jsonObject1.toString();
         expected = "{\"myNumber\":42}";
         assertEquals("Equal", expected , actual);
 
@@ -411,8 +420,8 @@ public class JSONObjectTest {
          * wrap() inserts the value as a string. That is why 42 comes back
          * wrapped in quotes.
          */
-        jsonObject = new JSONObject(Collections.singletonMap("myNumber", new AtomicInteger(42)));
-        actual = jsonObject.toString();
+        JSONObject jsonObject2 = new JSONObject(Collections.singletonMap("myNumber", new AtomicInteger(42)));
+        actual = jsonObject2.toString();
         expected = "{\"myNumber\":\"42\"}";
         assertEquals("Equal", expected , actual);
 
@@ -422,9 +431,9 @@ public class JSONObjectTest {
          * AtomicInteger is recognized as a Number, and converted via
          * numberToString() into the unquoted string '42'.
          */
-        jsonObject = new JSONObject();
-        jsonObject.put("myNumber", new AtomicInteger(42));
-        actual = jsonObject.toString();
+        JSONObject jsonObject3 = new JSONObject();
+        jsonObject3.put("myNumber", new AtomicInteger(42));
+        actual = jsonObject3.toString();
         expected = "{\"myNumber\":42}";
         assertEquals("Equal", expected , actual);
 
@@ -435,11 +444,11 @@ public class JSONObjectTest {
          * bean and inserted into a contained JSONObject. It has 2 getters,
          * for numerator and denominator. 
          */
-        jsonObject = new JSONObject(Collections.singletonMap("myNumber", new Fraction(4,2)));
-        assertEquals(1, jsonObject.length());
-        assertEquals(2, ((JSONObject)(jsonObject.get("myNumber"))).length());
-        assertEquals("Numerator", BigInteger.valueOf(4) , jsonObject.query("/myNumber/numerator"));
-        assertEquals("Denominator", BigInteger.valueOf(2) , jsonObject.query("/myNumber/denominator"));
+        JSONObject jsonObject4 = new JSONObject(Collections.singletonMap("myNumber", new Fraction(4,2)));
+        assertEquals(1, jsonObject4.length());
+        assertEquals(2, ((JSONObject)(jsonObject4.get("myNumber"))).length());
+        assertEquals("Numerator", BigInteger.valueOf(4) , jsonObject4.query("/myNumber/numerator"));
+        assertEquals("Denominator", BigInteger.valueOf(2) , jsonObject4.query("/myNumber/denominator"));
 
         /**
          * JSONObject.put() inserts the Fraction directly into the
@@ -449,11 +458,15 @@ public class JSONObjectTest {
          * BigDecimal sanity check fails, so writeValue() defaults
          * to returning a safe JSON quoted string. Pretty slick!
          */
-        jsonObject = new JSONObject();
-        jsonObject.put("myNumber", new Fraction(4,2));
-        actual = jsonObject.toString();
+        JSONObject jsonObject5 = new JSONObject();
+        jsonObject5.put("myNumber", new Fraction(4,2));
+        actual = jsonObject5.toString();
         expected = "{\"myNumber\":\"4/2\"}"; // valid JSON, bug fixed
         assertEquals("Equal", expected , actual);
+
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject0, jsonObject1, jsonObject2, jsonObject3, jsonObject4, jsonObject5
+        )));
     }
 
     /**
@@ -488,6 +501,10 @@ public class JSONObjectTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaInt));
+
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jaRaw, jaObj, jaInt
+        )));
     }
 
     
@@ -531,6 +548,10 @@ public class JSONObjectTest {
         assertTrue(
                 "The RAW Collection should give me the same as the Typed Collection",
                 expected.similar(jaObjObj));
+
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jaRaw, jaStrObj, jaStrInt, jaStrObj
+        )));
     }
 
 
@@ -553,6 +574,7 @@ public class JSONObjectTest {
         assertTrue("expected 2 top level items", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 2);
         assertTrue("expected 0 key1 items", ((Map<?,?>)(JsonPath.read(doc, "$.key1"))).size() == 0);
         assertTrue("expected \"key2\":java.lang.Exception","java.lang.Exception".equals(jsonObject.query("/key2")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -580,6 +602,7 @@ public class JSONObjectTest {
         assertTrue("expected \"escapeStringKey\":\"h\be\tllo w\u1234orld!\"", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
         assertTrue("expected \"intKey\":42", Long.valueOf("42").equals(jsonObject.query("/intKey")));
         assertTrue("expected \"doubleKey\":-23.45e67", Double.valueOf("-23.45e67").equals(jsonObject.query("/doubleKey")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -620,6 +643,7 @@ public class JSONObjectTest {
         assertTrue("expected 2 callbacks items", ((List<?>)(JsonPath.read(doc, "$.callbacks"))).size() == 2);
         assertTrue("expected 0 handler items", ((Map<?,?>)(JsonPath.read(doc, "$.callbacks[0].handler"))).size() == 0);
         assertTrue("expected 0 callbacks[1] items", ((Map<?,?>)(JsonPath.read(doc, "$.callbacks[1]"))).size() == 0);
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -655,6 +679,7 @@ public class JSONObjectTest {
         // InterfaceField replaces someFloat property name via user-defined annotation
         assertTrue("Overridden String field name (InterfaceField) should have been found",
                 jsonObject.has("InterfaceField"));
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -705,6 +730,7 @@ public class JSONObjectTest {
         // property name able was replaced by Getable via user-defined annotation
         assertTrue("Overridden boolean field name (Getable) should have been found",
                 jsonObject.has("Getable"));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -725,6 +751,7 @@ public class JSONObjectTest {
         assertTrue("expected 2 top level items", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 2);
         assertTrue("expected \"publicString\":\"abc\"", "abc".equals(jsonObject.query("/publicString")));
         assertTrue("expected \"publicInt\":42", Integer.valueOf(42).equals(jsonObject.query("/publicInt")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -746,6 +773,7 @@ public class JSONObjectTest {
         assertTrue("expected 2 farewells items", ((Map<?,?>)(JsonPath.read(doc, "$.farewells"))).size() == 2);
         assertTrue("expected \"later\":\"Later, \"", "Later, ".equals(jsonObject.query("/farewells/later")));
         assertTrue("expected \"world\":\"World!\"", "Alligator!".equals(jsonObject.query("/farewells/gator")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -778,6 +806,7 @@ public class JSONObjectTest {
         assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/myArray/3")));
         assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/myArray/4")));
         assertTrue("expected -23.45e7", Double.valueOf(-23.45e7).equals(jsonObject.query("/myArray/5")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -809,6 +838,7 @@ public class JSONObjectTest {
         assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/myArray/3")));
         assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/myArray/4")));
         assertTrue("expected -23.45e7", Double.valueOf(-23.45e7).equals(jsonObject.query("/myArray/5")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -944,6 +974,7 @@ public class JSONObjectTest {
         JSONObject jsonObjectInner = jsonObject.getJSONObject("objectKey");
         assertTrue("objectKey should be JSONObject", 
                 jsonObjectInner.get("myKey").equals("myVal"));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1006,6 +1037,7 @@ public class JSONObjectTest {
         obj = jsonObject.get( "largeExponent" );
         assertTrue("largeExponent should evaluate as a BigDecimal",
                 new BigDecimal("-23.45e2327").equals(obj));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1054,6 +1086,7 @@ public class JSONObjectTest {
                 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);
     }
 
     /**
@@ -1205,6 +1238,7 @@ public class JSONObjectTest {
                     "JSONObject[\"stringKey\"] is not a JSONObject (class java.lang.String : hello world!).",
                     e.getMessage());
         }
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1232,6 +1266,7 @@ public class JSONObjectTest {
         assertTrue("3.0 can still be interpreted as a double",
                 deserialized.getDouble(key30) == 3.0);
         assertTrue("3.1 remains a double", deserialized.getDouble(key31) == 3.1);
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1247,9 +1282,9 @@ public class JSONObjectTest {
          * value is stored. This should be fixed.
          */
         BigInteger bigInteger = new BigInteger("123456789012345678901234567890");
-        JSONObject jsonObject = new JSONObject(bigInteger);
-        Object obj = jsonObject.get("lowestSetBit");
-        assertTrue("JSONObject only has 1 value", jsonObject.length() == 1);
+        JSONObject jsonObject0 = new JSONObject(bigInteger);
+        Object obj = jsonObject0.get("lowestSetBit");
+        assertTrue("JSONObject only has 1 value", jsonObject0.length() == 1);
         assertTrue("JSONObject parses BigInteger as the Integer lowestBitSet",
                 obj instanceof Integer);
         assertTrue("this bigInteger lowestBitSet happens to be 1",
@@ -1262,57 +1297,57 @@ public class JSONObjectTest {
          */
         BigDecimal bigDecimal = new BigDecimal(
                 "123456789012345678901234567890.12345678901234567890123456789");
-        jsonObject = new JSONObject(bigDecimal);
-        assertTrue("large bigDecimal is not stored", jsonObject.isEmpty());
+        JSONObject jsonObject1 = new JSONObject(bigDecimal);
+        assertTrue("large bigDecimal is not stored", jsonObject1.isEmpty());
 
         /**
          * JSONObject put(String, Object) method stores and serializes
          * bigInt and bigDec correctly. Nothing needs to change. 
          */
-        jsonObject = new JSONObject();
-        jsonObject.put("bigInt", bigInteger);
+        JSONObject jsonObject2 = new JSONObject();
+        jsonObject2.put("bigInt", bigInteger);
         assertTrue("jsonObject.put() handles bigInt correctly",
-                jsonObject.get("bigInt").equals(bigInteger));
+                jsonObject2.get("bigInt").equals(bigInteger));
         assertTrue("jsonObject.getBigInteger() handles bigInt correctly",
-                jsonObject.getBigInteger("bigInt").equals(bigInteger));
+                jsonObject2.getBigInteger("bigInt").equals(bigInteger));
         assertTrue("jsonObject.optBigInteger() handles bigInt correctly",
-                jsonObject.optBigInteger("bigInt", BigInteger.ONE).equals(bigInteger));
+                jsonObject2.optBigInteger("bigInt", BigInteger.ONE).equals(bigInteger));
         assertTrue("jsonObject serializes bigInt correctly",
-                jsonObject.toString().equals("{\"bigInt\":123456789012345678901234567890}"));
+                jsonObject2.toString().equals("{\"bigInt\":123456789012345678901234567890}"));
         assertTrue("BigInteger as BigDecimal",
-                jsonObject.getBigDecimal("bigInt").equals(new BigDecimal(bigInteger)));
+                jsonObject2.getBigDecimal("bigInt").equals(new BigDecimal(bigInteger)));
 
         
-        jsonObject = new JSONObject();
-        jsonObject.put("bigDec", bigDecimal);
+        JSONObject jsonObject3 = new JSONObject();
+        jsonObject3.put("bigDec", bigDecimal);
         assertTrue("jsonObject.put() handles bigDec correctly",
-                jsonObject.get("bigDec").equals(bigDecimal));
+                jsonObject3.get("bigDec").equals(bigDecimal));
         assertTrue("jsonObject.getBigDecimal() handles bigDec correctly",
-                jsonObject.getBigDecimal("bigDec").equals(bigDecimal));
+                jsonObject3.getBigDecimal("bigDec").equals(bigDecimal));
         assertTrue("jsonObject.optBigDecimal() handles bigDec correctly",
-                jsonObject.optBigDecimal("bigDec", BigDecimal.ONE).equals(bigDecimal));
+                jsonObject3.optBigDecimal("bigDec", BigDecimal.ONE).equals(bigDecimal));
         assertTrue("jsonObject serializes bigDec correctly",
-                jsonObject.toString().equals(
+                jsonObject3.toString().equals(
                 "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
 
         assertTrue("BigDecimal as BigInteger",
-                jsonObject.getBigInteger("bigDec").equals(bigDecimal.toBigInteger()));
+                jsonObject3.getBigInteger("bigDec").equals(bigDecimal.toBigInteger()));
         /**
          * exercise some exceptions
          */
         try {
             // bigInt key does not exist
-            jsonObject.getBigDecimal("bigInt");
+            jsonObject3.getBigDecimal("bigInt");
             fail("expected an exeption");
         } catch (JSONException ignored) {}
-        obj = jsonObject.optBigDecimal("bigInt", BigDecimal.ONE);
+        obj = jsonObject3.optBigDecimal("bigInt", BigDecimal.ONE);
         assertTrue("expected BigDecimal", obj.equals(BigDecimal.ONE));
-        jsonObject.put("stringKey",  "abc");
+        jsonObject3.put("stringKey",  "abc");
         try {
-            jsonObject.getBigDecimal("stringKey");
+            jsonObject3.getBigDecimal("stringKey");
             fail("expected an exeption");
         } catch (JSONException ignored) {}
-        obj = jsonObject.optBigInteger("bigDec", BigInteger.ONE);
+        obj = jsonObject3.optBigInteger("bigDec", BigInteger.ONE);
         assertTrue("expected BigInteger", obj instanceof BigInteger);
         assertEquals(bigDecimal.toBigInteger(), obj);
 
@@ -1345,79 +1380,79 @@ public class JSONObjectTest {
         // bigInt map ctor 
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("bigInt", bigInteger);
-        jsonObject = new JSONObject(map);
-        String actualFromMapStr = jsonObject.toString();
+        JSONObject jsonObject4 = new JSONObject(map);
+        String actualFromMapStr = jsonObject4.toString();
         assertTrue("bigInt in map (or array or bean) is a string",
                 actualFromMapStr.equals(
                 "{\"bigInt\":123456789012345678901234567890}"));
         // bigInt put
-        jsonObject = new JSONObject();
-        jsonObject.put("bigInt", bigInteger);
-        String actualFromPutStr = jsonObject.toString();
+        JSONObject jsonObject5 = new JSONObject();
+        jsonObject5.put("bigInt", bigInteger);
+        String actualFromPutStr = jsonObject5.toString();
         assertTrue("bigInt from put is a number",
                 actualFromPutStr.equals(
                 "{\"bigInt\":123456789012345678901234567890}"));
         // bigDec map ctor
         map = new HashMap<String, Object>();
         map.put("bigDec", bigDecimal);
-        jsonObject = new JSONObject(map);
-        actualFromMapStr = jsonObject.toString();
+        JSONObject jsonObject6 = new JSONObject(map);
+        actualFromMapStr = jsonObject6.toString();
         assertTrue("bigDec in map (or array or bean) is a bigDec",
                 actualFromMapStr.equals(
                 "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
         // bigDec put
-        jsonObject = new JSONObject();
-        jsonObject.put("bigDec", bigDecimal);
-        actualFromPutStr = jsonObject.toString();
+        JSONObject jsonObject7 = new JSONObject();
+        jsonObject7.put("bigDec", bigDecimal);
+        actualFromPutStr = jsonObject7.toString();
         assertTrue("bigDec from put is a number",
                 actualFromPutStr.equals(
                 "{\"bigDec\":123456789012345678901234567890.12345678901234567890123456789}"));
         // bigInt,bigDec put 
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.put(bigInteger);
-        jsonArray.put(bigDecimal);
-        actualFromPutStr = jsonArray.toString();
+        JSONArray jsonArray0 = new JSONArray();
+        jsonArray0.put(bigInteger);
+        jsonArray0.put(bigDecimal);
+        actualFromPutStr = jsonArray0.toString();
         assertTrue("bigInt, bigDec from put is a number",
                 actualFromPutStr.equals(
                 "[123456789012345678901234567890,123456789012345678901234567890.12345678901234567890123456789]"));
-        assertTrue("getBigInt is bigInt", jsonArray.getBigInteger(0).equals(bigInteger));
-        assertTrue("getBigDec is bigDec", jsonArray.getBigDecimal(1).equals(bigDecimal));
-        assertTrue("optBigInt is bigInt", jsonArray.optBigInteger(0, BigInteger.ONE).equals(bigInteger));
-        assertTrue("optBigDec is bigDec", jsonArray.optBigDecimal(1, BigDecimal.ONE).equals(bigDecimal));
-        jsonArray.put(Boolean.TRUE);
+        assertTrue("getBigInt is bigInt", jsonArray0.getBigInteger(0).equals(bigInteger));
+        assertTrue("getBigDec is bigDec", jsonArray0.getBigDecimal(1).equals(bigDecimal));
+        assertTrue("optBigInt is bigInt", jsonArray0.optBigInteger(0, BigInteger.ONE).equals(bigInteger));
+        assertTrue("optBigDec is bigDec", jsonArray0.optBigDecimal(1, BigDecimal.ONE).equals(bigDecimal));
+        jsonArray0.put(Boolean.TRUE);
         try {
-            jsonArray.getBigInteger(2);
+            jsonArray0.getBigInteger(2);
             fail("should not be able to get big int");
         } catch (Exception ignored) {}
         try {
-            jsonArray.getBigDecimal(2);
+            jsonArray0.getBigDecimal(2);
             fail("should not be able to get big dec");
         } catch (Exception ignored) {}
-        assertTrue("optBigInt is default", jsonArray.optBigInteger(2, BigInteger.ONE).equals(BigInteger.ONE));
-        assertTrue("optBigDec is default", jsonArray.optBigDecimal(2, BigDecimal.ONE).equals(BigDecimal.ONE));
+        assertTrue("optBigInt is default", jsonArray0.optBigInteger(2, BigInteger.ONE).equals(BigInteger.ONE));
+        assertTrue("optBigDec is default", jsonArray0.optBigDecimal(2, BigDecimal.ONE).equals(BigDecimal.ONE));
 
         // bigInt,bigDec list ctor
         List<Object> list = new ArrayList<Object>();
         list.add(bigInteger);
         list.add(bigDecimal);
-        jsonArray = new JSONArray(list);
-        String actualFromListStr = jsonArray.toString();
+        JSONArray jsonArray1 = new JSONArray(list);
+        String actualFromListStr = jsonArray1.toString();
         assertTrue("bigInt, bigDec in list is a bigInt, bigDec",
                 actualFromListStr.equals(
                 "[123456789012345678901234567890,123456789012345678901234567890.12345678901234567890123456789]"));
         // bigInt bean ctor
         MyBigNumberBean myBigNumberBean = mock(MyBigNumberBean.class);
         when(myBigNumberBean.getBigInteger()).thenReturn(new BigInteger("123456789012345678901234567890"));
-        jsonObject = new JSONObject(myBigNumberBean);
-        String actualFromBeanStr = jsonObject.toString();
+        JSONObject jsonObject8 = new JSONObject(myBigNumberBean);
+        String actualFromBeanStr = jsonObject8.toString();
         // can't do a full string compare because mockery adds an extra key/value
         assertTrue("bigInt from bean ctor is a bigInt",
                 actualFromBeanStr.contains("123456789012345678901234567890"));
         // bigDec bean ctor
         myBigNumberBean = mock(MyBigNumberBean.class);
         when(myBigNumberBean.getBigDecimal()).thenReturn(new BigDecimal("123456789012345678901234567890.12345678901234567890123456789"));
-        jsonObject = new JSONObject(myBigNumberBean);
-        actualFromBeanStr = jsonObject.toString();
+        jsonObject8 = new JSONObject(myBigNumberBean);
+        actualFromBeanStr = jsonObject8.toString();
         // can't do a full string compare because mockery adds an extra key/value
         assertTrue("bigDec from bean ctor is a bigDec",
                 actualFromBeanStr.contains("123456789012345678901234567890.12345678901234567890123456789"));
@@ -1426,7 +1461,12 @@ public class JSONObjectTest {
         assertTrue("wrap() returns big num",obj.equals(bigInteger));
         obj = JSONObject.wrap(bigDecimal);
         assertTrue("wrap() returns string",obj.equals(bigDecimal));
-
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject0, jsonObject1, jsonObject2, jsonObject3, jsonObject4,
+                jsonObject5, jsonObject6, jsonObject7, jsonObject8
+        )));
+        Util.checkJSONArrayMaps(jsonArray0, jsonObject0.getMapType());
+        Util.checkJSONArrayMaps(jsonArray1, jsonObject0.getMapType());
     }
 
     /**
@@ -1438,7 +1478,6 @@ public class JSONObjectTest {
      */
     @Test
     public void jsonObjectNames() {
-        JSONObject jsonObject;
 
         // getNames() from null JSONObject
         assertTrue("null names from null Object", 
@@ -1449,16 +1488,16 @@ public class JSONObjectTest {
                 null == JSONObject.getNames(new MyJsonString()));
 
         // getNames from new JSONOjbect
-        jsonObject = new JSONObject();
-        String [] names = JSONObject.getNames(jsonObject);
+        JSONObject jsonObject0 = new JSONObject();
+        String [] names = JSONObject.getNames(jsonObject0);
         assertTrue("names should be null", names == null);
 
         
         // getNames() from empty JSONObject
         String emptyStr = "{}";
-        jsonObject = new JSONObject(emptyStr);
+        JSONObject jsonObject1 = new JSONObject(emptyStr);
         assertTrue("empty JSONObject should have null names",
-                null == JSONObject.getNames(jsonObject));
+                null == JSONObject.getNames(jsonObject1));
 
         // getNames() from JSONObject
         String str = 
@@ -1467,13 +1506,13 @@ public class JSONObjectTest {
                 "\"falseKey\":false,"+
                 "\"stringKey\":\"hello world!\","+
             "}";
-        jsonObject = new JSONObject(str);
-        names = JSONObject.getNames(jsonObject);
-        JSONArray jsonArray = new JSONArray(names);
+        JSONObject jsonObject2 = new JSONObject(str);
+        names = JSONObject.getNames(jsonObject2);
+        JSONArray jsonArray0 = new JSONArray(names);
 
         // validate JSON
         Object doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray.toString());
+                .parse(jsonArray0.toString());
         List<?> docList = JsonPath.read(doc, "$");
         assertTrue("expected 3 items", docList.size() == 3);
         assertTrue(
@@ -1494,9 +1533,9 @@ public class JSONObjectTest {
         names = JSONObject.getNames(myEnumField);
 
         // validate JSON
-        jsonArray = new JSONArray(names);
+        JSONArray jsonArray1 = new JSONArray(names);
         doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray.toString());
+                .parse(jsonArray1.toString());
         docList = JsonPath.read(doc, "$");
         assertTrue("expected 3 items", docList.size() == 3);
         assertTrue(
@@ -1518,9 +1557,9 @@ public class JSONObjectTest {
         names = JSONObject.getNames(myPublicClass);
 
         // validate JSON
-        jsonArray = new JSONArray(names);
+        JSONArray jsonArray2 = new JSONArray(names);
         doc = Configuration.defaultConfiguration().jsonProvider()
-                .parse(jsonArray.toString());
+                .parse(jsonArray2.toString());
         docList = JsonPath.read(doc, "$");
         assertTrue("expected 2 items", docList.size() == 2);
         assertTrue(
@@ -1529,6 +1568,12 @@ public class JSONObjectTest {
         assertTrue(
                 "expected to find publicInt",
                 ((List<?>) JsonPath.read(doc, "$[?(@=='publicInt')]")).size() == 1);
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject0, jsonObject1, jsonObject2
+        )));
+        Util.checkJSONArrayMaps(jsonArray0, jsonObject0.getMapType());
+        Util.checkJSONArrayMaps(jsonArray1, jsonObject0.getMapType());
+        Util.checkJSONArrayMaps(jsonArray2, jsonObject0.getMapType());
     }
 
     /**
@@ -1540,6 +1585,8 @@ public class JSONObjectTest {
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = jsonObject.names();
         assertTrue("jsonArray should be null", jsonArray == null);
+        Util.checkJSONObjectMaps(jsonObject);
+        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
     }
 
     /**
@@ -1564,6 +1611,8 @@ public class JSONObjectTest {
         assertTrue("expected to find trueKey", ((List<?>) JsonPath.read(doc, "$[?(@=='trueKey')]")).size() == 1);
         assertTrue("expected to find falseKey", ((List<?>) JsonPath.read(doc, "$[?(@=='falseKey')]")).size() == 1);
         assertTrue("expected to find stringKey", ((List<?>) JsonPath.read(doc, "$[?(@=='stringKey')]")).size() == 1);
+        Util.checkJSONObjectMaps(jsonObject);
+        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
     }
 
     /**
@@ -1682,7 +1731,9 @@ public class JSONObjectTest {
         // this.put(key, new Float((Float) value + 1)); 
         // Probably it would be better to deprecate the method and remove some day, while convenient processing the "payload" is not
         // really in the scope of a JSON-library (IMHO.)
-
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject, inc
+        )));
     }
 
     /**
@@ -1780,6 +1831,12 @@ public class JSONObjectTest {
         JSONObject bCompareArrayJsonObject = new JSONObject(bCompareArrayStr);
         assertTrue("different nested JSONArrays should not be similar",
                 !aCompareArrayJsonObject.similar(bCompareArrayJsonObject));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject, expectedJsonObject, aCompareValueJsonObject,
+                aCompareArrayJsonObject, aCompareObjectJsonObject, aCompareArrayJsonObject,
+                bCompareValueJsonObject, bCompareArrayJsonObject, bCompareObjectJsonObject,
+                bCompareArrayJsonObject
+        )));
     }
 
     /**
@@ -1815,6 +1872,7 @@ public class JSONObjectTest {
         assertTrue("expected myVal2", "myVal2".equals(jsonObject.query("/objectKey/myKey2")));
         assertTrue("expected myVal3", "myVal3".equals(jsonObject.query("/objectKey/myKey3")));
         assertTrue("expected myVal4", "myVal4".equals(jsonObject.query("/objectKey/myKey4")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1888,6 +1946,9 @@ public class JSONObjectTest {
         
         JSONObject jo = new JSONObject().put("TABLE", new JSONObject().put("yhoo", new JSONObject()));
         assertEquals("toString(2)","{\"TABLE\": {\"yhoo\": {}}}", jo.toString(2));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject, jo
+        )));
     }
 
     /**
@@ -1909,6 +1970,7 @@ public class JSONObjectTest {
         assertTrue("expected 1 top level item", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 1);
         assertTrue("expected 1 key item", ((Map<?,?>)(JsonPath.read(doc, "$.key"))).size() == 1);
         assertTrue("expected def", "def".equals(jsonObject.query("/key/abc")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1931,6 +1993,7 @@ public class JSONObjectTest {
         assertTrue("expected 1 top level item", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 1);
         assertTrue("expected 1 key item", ((List<?>)(JsonPath.read(doc, "$.key"))).size() == 1);
         assertTrue("expected abc", "abc".equals(jsonObject.query("/key/0")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -1978,7 +2041,9 @@ public class JSONObjectTest {
                 jsonArray.toString().equals(JSONObject.valueToString(collection))); 
         Integer[] array = { new Integer(1), new Integer(2), new Integer(3) };
         assertTrue("array valueToString() incorrect",
-                jsonArray.toString().equals(JSONObject.valueToString(array))); 
+                jsonArray.toString().equals(JSONObject.valueToString(array)));
+        Util.checkJSONObjectMaps(jsonObject);
+        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
     }
 
     /**
@@ -2082,6 +2147,11 @@ public class JSONObjectTest {
         assertTrue("expected val1", "val1".equals(mapJsonObject.query("/key1")));
         assertTrue("expected val2", "val2".equals(mapJsonObject.query("/key2")));
         assertTrue("expected val3", "val3".equals(mapJsonObject.query("/key3")));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObject, mapJsonObject
+        )));
+        Util.checkJSONArrayMaps(jsonArray, jsonObject.getMapType());
+        Util.checkJSONArrayMaps(integerArrayJsonArray, jsonObject.getMapType());
     }
 
     
@@ -2096,6 +2166,7 @@ public class JSONObjectTest {
             try {
                 JSONObject jo = new JSONObject(source);
                 assertTrue("Expected "+charString+"("+i+") in the JSON Object but did not find it.",charString.equals(jo.getString("key")));
+                Util.checkJSONObjectMaps(jo);
             } catch (JSONException ex) {
                 assertTrue("Only \\0 (U+0000), \\n (U+000A), and \\r (U+000D) should cause an error. Instead "+charString+"("+i+") caused an error",
                         i=='\0' || i=='\n' || i=='\r'
@@ -2395,6 +2466,7 @@ public class JSONObjectTest {
         assertTrue("jsonObject should be empty", jsonObject.isEmpty());
         jsonObject.putOnce(null, "");
         assertTrue("jsonObject should be empty", jsonObject.isEmpty());
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -2430,6 +2502,7 @@ public class JSONObjectTest {
                 42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
         assertTrue("optString() should return default string",
                 "hi".equals(jsonObject.optString("hiKey", "hi")));
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -2466,6 +2539,7 @@ public class JSONObjectTest {
                  42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
          assertTrue("optString() should return default string",
                  "hi".equals(jsonObject.optString("hiKey", "hi")));
+         Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -2484,6 +2558,7 @@ public class JSONObjectTest {
         assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
         assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
         assertTrue("unexpected optNumber value",jo.optNumber("int",BigInteger.ZERO).longValue()==123l);
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -2518,6 +2593,7 @@ public class JSONObjectTest {
         assertNotEquals((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optInt("largeNumberStr"));
         assertEquals(19007199254740992l, (long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
         assertEquals(2147483647, (int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -2540,6 +2616,7 @@ public class JSONObjectTest {
         assertNull(jo.optBigDecimal("nullVal", null));
         assertEquals(jo.optBigDecimal("float", null),jo.getBigDecimal("float"));
         assertEquals(jo.optBigDecimal("double", null),jo.getBigDecimal("double"));
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -2560,6 +2637,7 @@ public class JSONObjectTest {
         assertEquals(new BigInteger("1234"),jo.optBigInteger("bigInteger", null));
         assertEquals(new BigInteger("1234"),jo.optBigInteger("bigDecimal", null));
         assertNull(jo.optBigDecimal("nullVal", null));
+        Util.checkJSONObjectMaps(jo);
     }
 
     /**
@@ -2577,8 +2655,9 @@ public class JSONObjectTest {
         JSONObject jsonObjectPutNull = new JSONObject(str);
         jsonObjectPutNull.put("myKey", (Object) null);
         assertTrue("jsonObject should be empty", jsonObjectPutNull.isEmpty());
-
-
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObjectRemove, jsonObjectPutNull
+        )));
     }
 
     /**
@@ -2663,6 +2742,7 @@ public class JSONObjectTest {
         } finally {
             stringWriter.close();
         }
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -2745,7 +2825,7 @@ public class JSONObjectTest {
                 writer.close();
             } catch (Exception e) {}
         }
-       
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
 
@@ -2813,6 +2893,7 @@ public class JSONObjectTest {
                 stringWriter.close();
             } catch (Exception e) {}
         }
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -2855,6 +2936,7 @@ public class JSONObjectTest {
         JSONObject aJsonObject = new JSONObject(str);
         assertTrue("Same JSONObject should be equal to itself",
                 aJsonObject.equals(aJsonObject));
+        Util.checkJSONObjectMaps(aJsonObject);
     }
 
     /**
@@ -2940,6 +3022,9 @@ public class JSONObjectTest {
                 "<key>null</key>".equals(sJONull));
         String sNull = XML.toString(jsonObjectNull);
         assertTrue("null should emit an empty string", "".equals(sNull));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jsonObjectJONull, jsonObjectNull
+        )));
     }
     
     @Test(expected = JSONPointerException.class)
@@ -3037,6 +3122,7 @@ public class JSONObjectTest {
         // assert that the new map is mutable
         assertTrue("Removing a key should succeed", map.remove("key3") != null);
         assertTrue("Map should have 2 elements", map.size() == 2);
+        Util.checkJSONObjectMaps(jsonObject);
     }
     
     /**
@@ -3061,6 +3147,9 @@ public class JSONObjectTest {
         // ensure our original jo hasn't changed.
         assertEquals(0, jo.get("someInt"));
         assertEquals(null, jo.opt("someString"));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jo, jo2
+        )));
     }
 
     /**
@@ -3085,6 +3174,9 @@ public class JSONObjectTest {
         // ensure our original jo hasn't changed.
         assertEquals(0, jo.get("someInt"));
         assertEquals(null, jo.opt("someString"));
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                jo, jo2
+        )));
     }
     
     /**
@@ -3100,6 +3192,7 @@ public class JSONObjectTest {
         assertEquals("Expected the getter to only be called once",
                 1, bean.genericGetCounter);
         assertEquals(0, bean.genericSetCounter);
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -3115,6 +3208,7 @@ public class JSONObjectTest {
         assertEquals("Expected the getter to only be called once",
                 1, bean.genericGetCounter);
         assertEquals(0, bean.genericSetCounter);
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -3133,6 +3227,7 @@ public class JSONObjectTest {
         assertEquals("Expected 1 key to be mapped. Instead found: "+jo.keySet().toString(),
                 1, jo.length());
         assertNotNull(jo.get("ALL"));
+        Util.checkJSONObjectMaps(jo);
     }
     
     /**
@@ -3150,6 +3245,8 @@ public class JSONObjectTest {
         BigDecimal wantedValue = BigDecimal.valueOf(value);
 
         assertEquals(current, wantedValue);
+        Util.checkJSONObjectMaps(jsonObject);
+        Util.checkJSONArrayMaps(array, jsonObject.getMapType());
      }
     
     /**
@@ -3163,6 +3260,7 @@ public class JSONObjectTest {
                 1, jo.length());
         assertTrue(jo.get("closeable") instanceof JSONObject);
         assertTrue(jo.getJSONObject("closeable").has("string"));
+        Util.checkJSONObjectMaps(jo);
     }
     
     @Test(expected=NullPointerException.class)
@@ -3289,9 +3387,12 @@ public class JSONObjectTest {
         ObjC.setRef(ObjA);
         ObjB.setRef(ObjA);
         ObjB.setRef2(ObjA);
-        new JSONObject(ObjC);
-        new JSONObject(ObjB);
-        new JSONObject(ObjA);
+        JSONObject j0 = new JSONObject(ObjC);
+        JSONObject j1 = new JSONObject(ObjB);
+        JSONObject j2 = new JSONObject(ObjA);
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                j0, j1, j2
+        )));
     }
     @Test
     public void testLongRepeatObjectNotRecursive() {
@@ -3307,17 +3408,21 @@ public class JSONObjectTest {
         ObjB.setRef2(ObjD);
         ObjA.setRef(ObjD);
         ObjD.setRef(ObjE);
-        new JSONObject(ObjC);
-        new JSONObject(ObjB);
-        new JSONObject(ObjA);
-        new JSONObject(ObjD);
-        new JSONObject(ObjE);
+        JSONObject j0 = new JSONObject(ObjC);
+        JSONObject j1 = new JSONObject(ObjB);
+        JSONObject j2 = new JSONObject(ObjA);
+        JSONObject j3 = new JSONObject(ObjD);
+        JSONObject j4 = new JSONObject(ObjE);
+        Util.checkJSONObjectsMaps(new ArrayList<JSONObject>(Arrays.asList(
+                j0, j1, j2, j3, j4
+        )));
     }
     @Test(expected=JSONException.class)
     public void testRecursiveEquals() {
         RecursiveBeanEquals a = new RecursiveBeanEquals("same");
         a.setRef(a);
-        new JSONObject(a);
+        JSONObject j0 = new JSONObject(a);
+        Util.checkJSONObjectMaps(j0);
     }
     @Test
     public void testNotRecursiveEquals() {
@@ -3326,7 +3431,8 @@ public class JSONObjectTest {
         RecursiveBeanEquals c = new RecursiveBeanEquals("same");
         a.setRef(b);
         b.setRef(c);
-        new JSONObject(a);
+        JSONObject j0 = new JSONObject(a);
+        Util.checkJSONObjectMaps(j0);
     }
 
 
@@ -3336,6 +3442,7 @@ public class JSONObjectTest {
         assertTrue("missing expected key 'empty_json_array'", jsonObject.has("empty_json_array"));
         assertNotNull("'empty_json_array' should be an array", jsonObject.getJSONArray("empty_json_array"));
         assertEquals("'empty_json_array' should have a length of 0", 0, jsonObject.getJSONArray("empty_json_array").length());
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -3351,6 +3458,7 @@ public class JSONObjectTest {
         jsonObject.clear(); //Clears the JSONObject
         assertTrue("expected jsonObject.length() == 0", jsonObject.length() == 0); //Check if its length is 0
         jsonObject.getInt("key1"); //Should throws org.json.JSONException: JSONObject["asd"] not found
+        Util.checkJSONObjectMaps(jsonObject);
     }
 
     /**
@@ -3364,6 +3472,7 @@ public class JSONObjectTest {
         JSONObject json_input = new JSONObject(input);
         assertNotNull(json_input);
         fail("Excepected Exception.");
+        Util.checkJSONObjectMaps(json_input);
     }
 
     /**
@@ -3373,7 +3482,7 @@ public class JSONObjectTest {
     public void issue654IncorrectNestingNoKey1() {
         JSONObject json_input = new JSONObject("{{\"a\":0}}");
         assertNotNull(json_input);
-        fail("Excepected Exception.");
+        fail("Expected Exception.");
     }
 
     /**
diff --git a/src/test/java/org/json/junit/Util.java b/src/test/java/org/json/junit/Util.java
index 8dc27dd..a4d0e22 100644
--- a/src/test/java/org/json/junit/Util.java
+++ b/src/test/java/org/json/junit/Util.java
@@ -78,7 +78,6 @@ public class Util {
      * or something else.
      * @param value created by the code to be tested
      * @param expectedValue created specifically for comparing
-     * @param key key to the jsonObject entry to be compared
      */
     private static void compareActualVsExpectedObjects(Object value,
             Object expectedValue) {
@@ -117,4 +116,106 @@ public class Util {
             );
         }
     }
+
+    /**
+     * Asserts that all JSONObject maps are the same as the default ctor
+     * @param jsonObjects list of objects to be tested
+     */
+    public static void checkJSONObjectsMaps(List<JSONObject> jsonObjects) {
+        if (jsonObjects == null || jsonObjects.size() == 0) {
+            return;
+        }
+        Class<? extends Map> mapType = new JSONObject().getMapType();
+        for (JSONObject jsonObject : jsonObjects) {
+            if (jsonObject != null) {
+                assertTrue(mapType == jsonObject.getMapType());
+                checkJSONObjectMaps(jsonObject, mapType);
+            }
+        }
+    }
+
+    /**
+     * Asserts that all JSONObject maps are the same as the default ctor
+     * @param jsonObject the object to be tested
+     */
+    public static void checkJSONObjectMaps(JSONObject jsonObject) {
+        if (jsonObject != null) {
+            checkJSONObjectMaps(jsonObject, jsonObject.getMapType());
+        }
+    }
+
+    /**
+     * Asserts that all JSONObject maps are the same as mapType
+     * @param jsonObject object to be tested
+     * @param mapType mapType to test against
+     */
+    public static void checkJSONObjectMaps(JSONObject jsonObject, Class<? extends Map> mapType) {
+        if (mapType == null) {
+            mapType = new JSONObject().getMapType();
+        }
+        Set<String> keys = jsonObject.keySet();
+        for (String key : keys) {
+            Object val = jsonObject.get(key);
+            if (val instanceof JSONObject) {
+                JSONObject jsonObjectVal = (JSONObject) val;
+                assertTrue(mapType == ((JSONObject) val).getMapType());
+                checkJSONObjectMaps(jsonObjectVal, mapType);
+            } else if (val instanceof JSONArray) {
+                JSONArray jsonArrayVal = (JSONArray)val;
+                checkJSONArrayMaps(jsonArrayVal, mapType);
+            }
+        }
+    }
+
+    /**
+     * Asserts that all JSONObject maps in the JSONArray object match the default map
+     * @param jsonArrays list of JSONArray objects to be tested
+     */
+    public static void checkJSONArraysMaps(List<JSONArray> jsonArrays) {
+        if (jsonArrays == null || jsonArrays.size() == 0) {
+            return;
+        }
+        Class<? extends Map> mapType = new JSONObject().getMapType();
+        for (JSONArray jsonArray : jsonArrays) {
+            if (jsonArray != null) {
+                checkJSONArrayMaps(jsonArray, mapType);
+            }
+        }
+    }
+
+    /**
+     * Asserts that all JSONObject maps in the JSONArray object match mapType
+     * @param jsonArray object to be tested
+     * @param mapType map type to be tested against
+     */
+    public static void checkJSONArrayMaps(JSONArray jsonArray, Class<? extends Map> mapType) {
+        if (jsonArray == null) {
+            return;
+        }
+        if (mapType == null) {
+            mapType = new JSONObject().getMapType();
+        }
+        Iterator<Object> it = jsonArray.iterator();
+        while (it.hasNext()) {
+            Object val = it.next();
+            if (val instanceof JSONObject) {
+                JSONObject jsonObjectVal = (JSONObject)val;
+                checkJSONObjectMaps(jsonObjectVal, mapType);
+            } else if (val instanceof JSONArray) {
+                JSONArray jsonArrayVal = (JSONArray)val;
+                checkJSONArrayMaps(jsonArrayVal, mapType);
+            }
+        }
+    }
+
+    /**
+     * Asserts that all JSONObject maps nested in the JSONArray match
+     * the default mapType
+     * @param jsonArray the object to be tested
+     */
+    public static void checkJSONArrayMaps(JSONArray jsonArray) {
+        if (jsonArray != null) {
+            checkJSONArrayMaps(jsonArray, null);
+        }
+    }
 }

From 3eecd67a3b4f84c7f2c498613de9dbdec0b227ad Mon Sep 17 00:00:00 2001
From: Joshua Schwartz <schw1804@umn.edu>
Date: Tue, 23 Aug 2022 15:00:01 -0500
Subject: [PATCH 071/212] Fix typo

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

diff --git a/Examples.md b/Examples.md
index 3f45e78..8f28461 100644
--- a/Examples.md
+++ b/Examples.md
@@ -218,7 +218,7 @@ import java.util.Properties;
 	}
 ```	
 <h2>Part 2: Conversion methods</h2>
-<p>We don't need to have a JSON docuemnt to work. This project also admits conversions from other type of files.</p>
+<p>We don't need to have a JSON document to work. This project also admits conversions from other type of files.</p>
 <p>Secondly, we can also convert from JSON to those type of files.</p>
 	
 <h3>Extra: Conversion to JSONArray</h3>

From 6daabb43ab2d32974f2a8ea79d713f67f4c22d30 Mon Sep 17 00:00:00 2001
From: stleary <stleary@gmail.com>
Date: Tue, 23 Aug 2022 20:00:25 -0500
Subject: [PATCH 072/212] update-copyright - Replace copyright and license
 restrictions with Public Domain

---
 LICENSE                                       | 23 +---------------
 README.md                                     |  2 --
 pom.xml                                       | 27 ++-----------------
 src/main/java/org/json/CDL.java               | 22 +--------------
 src/main/java/org/json/Cookie.java            | 22 +--------------
 src/main/java/org/json/CookieList.java        | 22 +--------------
 src/main/java/org/json/HTTP.java              | 22 +--------------
 src/main/java/org/json/HTTPTokener.java       | 22 +--------------
 src/main/java/org/json/JSONArray.java         | 22 +--------------
 src/main/java/org/json/JSONException.java     | 22 +--------------
 src/main/java/org/json/JSONML.java            | 22 +--------------
 src/main/java/org/json/JSONObject.java        | 27 +++----------------
 src/main/java/org/json/JSONPointer.java       | 22 +--------------
 .../java/org/json/JSONPointerException.java   | 22 +--------------
 .../java/org/json/JSONPropertyIgnore.java     | 22 +--------------
 src/main/java/org/json/JSONPropertyName.java  | 22 +--------------
 src/main/java/org/json/JSONString.java        | 22 +--------------
 src/main/java/org/json/JSONStringer.java      | 22 +--------------
 src/main/java/org/json/JSONTokener.java       | 22 +--------------
 src/main/java/org/json/JSONWriter.java        | 22 +--------------
 src/main/java/org/json/Property.java          | 22 +--------------
 src/main/java/org/json/XML.java               | 22 +--------------
 .../java/org/json/XMLParserConfiguration.java | 22 +--------------
 src/main/java/org/json/XMLTokener.java        | 22 +--------------
 .../java/org/json/XMLXsiTypeConverter.java    | 22 +--------------
 src/test/java/org/json/junit/CDLTest.java     | 22 +--------------
 .../java/org/json/junit/CookieListTest.java   | 22 +--------------
 src/test/java/org/json/junit/CookieTest.java  | 22 +--------------
 src/test/java/org/json/junit/EnumTest.java    | 22 +--------------
 src/test/java/org/json/junit/HTTPTest.java    | 22 +--------------
 .../java/org/json/junit/JSONArrayTest.java    | 22 +--------------
 src/test/java/org/json/junit/JSONMLTest.java  | 22 +--------------
 .../org/json/junit/JSONObjectLocaleTest.java  | 22 +--------------
 .../java/org/json/junit/JSONObjectTest.java   | 22 +--------------
 .../java/org/json/junit/JSONPointerTest.java  | 22 +--------------
 .../java/org/json/junit/JSONStringTest.java   | 22 +--------------
 .../java/org/json/junit/JSONStringerTest.java | 22 +--------------
 .../java/org/json/junit/JSONTokenerTest.java  | 22 +--------------
 .../java/org/json/junit/PropertyTest.java     | 22 +--------------
 src/test/java/org/json/junit/Util.java        | 22 +--------------
 .../org/json/junit/XMLConfigurationTest.java  | 22 +--------------
 src/test/java/org/json/junit/XMLTest.java     | 22 +--------------
 42 files changed, 44 insertions(+), 871 deletions(-)

diff --git a/LICENSE b/LICENSE
index 6cfb9b2..2ef9799 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,23 +1,2 @@
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 
diff --git a/README.md b/README.md
index 69869cd..9d1ead9 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,6 @@ Project goals include:
 
 The files in this package implement JSON encoders and decoders. The package can also convert between JSON and XML, HTTP headers, Cookies, and CDL.
 
-The license includes this restriction: ["The software shall be used for good, not evil."](https://en.wikipedia.org/wiki/Douglas_Crockford#%22Good,_not_Evil%22) If your conscience cannot live with that, then choose a different package.
-
 # If you would like to contribute to this project
 
 For more information on contributions, please see [CONTRIBUTING.md](https://github.com/stleary/JSON-java/blob/master/docs/CONTRIBUTING.md)
diff --git a/pom.xml b/pom.xml
index e4a3503..1a93b34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,6 @@
         This is a reference implementation. There is a large number of JSON packages
         in Java. Perhaps someday the Java community will standardize on one. Until
         then, choose carefully.
-
-        The license includes this restriction: "The software shall be used for good,
-        not evil." If your conscience cannot live with that, then choose a different
-        package.
     </description>
     <url>https://github.com/douglascrockford/JSON-java</url>
 
@@ -39,28 +35,9 @@
 
     <licenses>
         <license>
-            <name>The JSON License</name>
-            <url>http://json.org/license.html</url>
+            <name>Public Domain</name>
+            <url>https://github.com/stleary/JSON-java/blob/master/LICENSE</url>
             <distribution>repo</distribution>
-            <comments>Copyright (c) 2002 JSON.org
-
-                Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-                associated documentation files (the "Software"), to deal in the Software without restriction, including
-                without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-                copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
-                following conditions:
-
-                The above copyright notice and this permission notice shall be included in all copies or substantial
-                portions of the Software.
-
-                The Software shall be used for Good, not Evil.
-
-                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-                LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-                NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-                WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-                SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-            </comments>
         </license>
     </licenses>
 
diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index f12cfc0..848831d 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
  */
 
 /**
diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 1c5fb78..7a7e028 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -3,27 +3,7 @@ package org.json;
 import java.util.Locale;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index 83b2630..8ad8b58 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
  */
 
 /**
diff --git a/src/main/java/org/json/HTTP.java b/src/main/java/org/json/HTTP.java
index cc01167..6fee6ba 100644
--- a/src/main/java/org/json/HTTP.java
+++ b/src/main/java/org/json/HTTP.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.util.Locale;
diff --git a/src/main/java/org/json/HTTPTokener.java b/src/main/java/org/json/HTTPTokener.java
index 16c7081..48cad31 100644
--- a/src/main/java/org/json/HTTPTokener.java
+++ b/src/main/java/org/json/HTTPTokener.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 2b33e1d..18e57e6 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
- Copyright (c) 2002 JSON.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+Public Domain.
  */
 
 import java.io.IOException;
diff --git a/src/main/java/org/json/JSONException.java b/src/main/java/org/json/JSONException.java
index ab7ff77..02c29f3 100644
--- a/src/main/java/org/json/JSONException.java
+++ b/src/main/java/org/json/JSONException.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
  */
 
 /**
diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index aafdf72..2f9b840 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2008 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 782f8a4..9f6ee5f 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1,31 +1,10 @@
 package org.json;
 
-import java.io.Closeable;
-
 /*
- Copyright (c) 2002 JSON.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
- */
+Public Domain.
+*/
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index f1f7f33..963fdec 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -10,27 +10,7 @@ import java.util.Collections;
 import java.util.List;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/org/json/JSONPointerException.java
index 0ce1aeb..a0e128c 100644
--- a/src/main/java/org/json/JSONPointerException.java
+++ b/src/main/java/org/json/JSONPointerException.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/org/json/JSONPropertyIgnore.java
index 682de74..7c5fa53 100644
--- a/src/main/java/org/json/JSONPropertyIgnore.java
+++ b/src/main/java/org/json/JSONPropertyIgnore.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2018 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java
index a1bcd58..a66f4ad 100644
--- a/src/main/java/org/json/JSONPropertyName.java
+++ b/src/main/java/org/json/JSONPropertyName.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2018 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/src/main/java/org/json/JSONString.java b/src/main/java/org/json/JSONString.java
index bcd9a81..cd8d184 100644
--- a/src/main/java/org/json/JSONString.java
+++ b/src/main/java/org/json/JSONString.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
  */
 
 /**
diff --git a/src/main/java/org/json/JSONStringer.java b/src/main/java/org/json/JSONStringer.java
index d2a4dfb..2f6cf9e 100644
--- a/src/main/java/org/json/JSONStringer.java
+++ b/src/main/java/org/json/JSONStringer.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.io.StringWriter;
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 7f0c86a..8c98c77 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -8,27 +8,7 @@ import java.io.Reader;
 import java.io.StringReader;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
  */
 
 /**
diff --git a/src/main/java/org/json/JSONWriter.java b/src/main/java/org/json/JSONWriter.java
index dafb1b2..11f4a5c 100644
--- a/src/main/java/org/json/JSONWriter.java
+++ b/src/main/java/org/json/JSONWriter.java
@@ -5,27 +5,7 @@ import java.util.Collection;
 import java.util.Map;
 
 /*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/main/java/org/json/Property.java b/src/main/java/org/json/Property.java
index 7caeebb..83694c0 100644
--- a/src/main/java/org/json/Property.java
+++ b/src/main/java/org/json/Property.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.util.Enumeration;
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 33838a1..69782cb 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2015 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.io.Reader;
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index a1fd63e..9f00710 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -1,26 +1,6 @@
 package org.json;
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.util.Collections;
diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
index 3bbd382..957498c 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/XMLTokener.java
@@ -1,27 +1,7 @@
 package org.json;
 
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.io.Reader;
diff --git a/src/main/java/org/json/XMLXsiTypeConverter.java b/src/main/java/org/json/XMLXsiTypeConverter.java
index 0f8a8c3..0011eff 100644
--- a/src/main/java/org/json/XMLXsiTypeConverter.java
+++ b/src/main/java/org/json/XMLXsiTypeConverter.java
@@ -1,26 +1,6 @@
 package org.json;
 /*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 /**
diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
index b8bdede..f3364fb 100644
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/CookieListTest.java b/src/test/java/org/json/junit/CookieListTest.java
index c3f647f..0af9640 100644
--- a/src/test/java/org/json/junit/CookieListTest.java
+++ b/src/test/java/org/json/junit/CookieListTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/CookieTest.java b/src/test/java/org/json/junit/CookieTest.java
index 7e7b62b..edd8a7e 100644
--- a/src/test/java/org/json/junit/CookieTest.java
+++ b/src/test/java/org/json/junit/CookieTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/EnumTest.java b/src/test/java/org/json/junit/EnumTest.java
index 6867123..1496a63 100644
--- a/src/test/java/org/json/junit/EnumTest.java
+++ b/src/test/java/org/json/junit/EnumTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/HTTPTest.java b/src/test/java/org/json/junit/HTTPTest.java
index 8182b60..703d5ad 100644
--- a/src/test/java/org/json/junit/HTTPTest.java
+++ b/src/test/java/org/json/junit/HTTPTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 946f407..e98259c 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 390cbd8..34bc9f0 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/JSONObjectLocaleTest.java b/src/test/java/org/json/junit/JSONObjectLocaleTest.java
index 5112bf5..1cdaf74 100755
--- a/src/test/java/org/json/junit/JSONObjectLocaleTest.java
+++ b/src/test/java/org/json/junit/JSONObjectLocaleTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 3681148..32f4a42 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 4ea7434..d88803e 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/JSONStringTest.java b/src/test/java/org/json/junit/JSONStringTest.java
index a199611..b4fee3e 100644
--- a/src/test/java/org/json/junit/JSONStringTest.java
+++ b/src/test/java/org/json/junit/JSONStringTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/JSONStringerTest.java b/src/test/java/org/json/junit/JSONStringerTest.java
index a99db3b..0ecb9d6 100644
--- a/src/test/java/org/json/junit/JSONStringerTest.java
+++ b/src/test/java/org/json/junit/JSONStringerTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
index e8e0f98..da716b8 100644
--- a/src/test/java/org/json/junit/JSONTokenerTest.java
+++ b/src/test/java/org/json/junit/JSONTokenerTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/PropertyTest.java b/src/test/java/org/json/junit/PropertyTest.java
index e1a9b8d..eee482f 100644
--- a/src/test/java/org/json/junit/PropertyTest.java
+++ b/src/test/java/org/json/junit/PropertyTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import java.util.*;
diff --git a/src/test/java/org/json/junit/Util.java b/src/test/java/org/json/junit/Util.java
index a4d0e22..b676045 100644
--- a/src/test/java/org/json/junit/Util.java
+++ b/src/test/java/org/json/junit/Util.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 2ab06be..f9d24a6 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 0155472..906924d 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1,27 +1,7 @@
 package org.json.junit;
 
 /*
-Copyright (c) 2020 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Public Domain.
 */
 
 import static org.junit.Assert.assertEquals;

From a30d71fdca1a2bf3c1d1d15038cb904d01ad6264 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sat, 24 Sep 2022 16:11:12 -0500
Subject: [PATCH 073/212] Update README.md

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

diff --git a/README.md b/README.md
index 9d1ead9..5181b8b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20220320/json-20220320.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20220924/json-20220924.jar)**
 
 
 # Overview

From a6bdd081eb673509e73b712bd0936e0e52409aea Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sat, 24 Sep 2022 16:13:11 -0500
Subject: [PATCH 074/212] Update RELEASES.md

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 149525d..0d49331 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20220924    New License - public domain, and some minor updates
+
 20220320    Wrap StackOverflow with JSONException
 
 20211205    Recent commits and some bug fixes for similar()

From 8439039da75eb539efb21a04442cfa8330740bda Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sat, 24 Sep 2022 16:25:18 -0500
Subject: [PATCH 075/212] Update pom.xml

For the 20220924 release
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1a93b34..4ef85a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20220320</version>
+    <version>20220924</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From 1915aab7c4bcaefb973e99889e4126320b1e2263 Mon Sep 17 00:00:00 2001
From: hendrixjoseph <hendixjoseph@aol.com>
Date: Tue, 4 Oct 2022 14:32:41 -0400
Subject: [PATCH 076/212] create unit tests for various number formats

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

diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
new file mode 100644
index 0000000..f6e13c6
--- /dev/null
+++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java
@@ -0,0 +1,126 @@
+package org.json.junit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(value = Parameterized.class)
+public class JSONObjectNumberTest {
+    private final String objectString;
+    private Integer value = 50;
+
+    @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}
+            // JSON does not support octal or hex numbers;
+            // see https://stackoverflow.com/a/52671839/6323312
+            // "{value:062}", // octal 50
+            // "{value:0x32}" // hex 50
+        });
+    }
+
+    public JSONObjectNumberTest(String objectString, int resultIsNegative) {
+        this.objectString = objectString;
+        this.value *= resultIsNegative;
+    }
+
+    private JSONObject object;
+
+    @Before
+    public void setJsonObject() {
+        object = new JSONObject(objectString);
+    }
+
+    @Test
+    public void testGetNumber() {
+        assertEquals(value.intValue(), object.getNumber("value").intValue());
+    }
+
+    @Test
+    public void testGetBigDecimal() {
+        assertTrue(BigDecimal.valueOf(value).compareTo(object.getBigDecimal("value")) == 0);
+    }
+
+    @Test
+    public void testGetBigInteger() {
+        assertEquals(BigInteger.valueOf(value), object.getBigInteger("value"));
+    }
+
+    @Test
+    public void testGetFloat() {
+        assertEquals(value.floatValue(), object.getFloat("value"), 0.0f);
+    }
+
+    @Test
+    public void testGetDouble() {
+        assertEquals(value.doubleValue(), object.getDouble("value"), 0.0d);
+    }
+
+    @Test
+    public void testGetInt() {
+        assertEquals(value.intValue(), object.getInt("value"));
+    }
+
+    @Test
+    public void testGetLong() {
+        assertEquals(value.longValue(), object.getLong("value"));
+    }
+
+    @Test
+    public void testOptNumber() {
+        assertEquals(value.intValue(), object.optNumber("value").intValue());
+    }
+
+    @Test
+    public void testOptBigDecimal() {
+        assertTrue(BigDecimal.valueOf(value).compareTo(object.optBigDecimal("value", null)) == 0);
+    }
+
+    @Test
+    public void testOptBigInteger() {
+        assertEquals(BigInteger.valueOf(value), object.optBigInteger("value", null));
+    }
+
+    @Test
+    public void testOptFloat() {
+        assertEquals(value.floatValue(), object.optFloat("value"), 0.0f);
+    }
+
+    @Test
+    public void testOptDouble() {
+        assertEquals(value.doubleValue(), object.optDouble("value"), 0.0d);
+    }
+
+    @Test
+    public void testOptInt() {
+        assertEquals(value.intValue(), object.optInt("value"));
+    }
+
+    @Test
+    public void testOptLong() {
+        assertEquals(value.longValue(), object.optLong("value"));
+    }
+}

From 61801c623e8fe51827b1e03a5ffebcebbb708994 Mon Sep 17 00:00:00 2001
From: TheCommandBlock <95651685+InACommandBlock@users.noreply.github.com>
Date: Thu, 6 Oct 2022 00:48:34 +0200
Subject: [PATCH 077/212] Minor Adjustments Example.md

Added syntax highlighting, standardised indentation
---
 Examples.md | 570 ++++++++++++++++++++++++++--------------------------
 1 file changed, 285 insertions(+), 285 deletions(-)

diff --git a/Examples.md b/Examples.md
index 8f28461..2671d1d 100644
--- a/Examples.md
+++ b/Examples.md
@@ -1,7 +1,7 @@
 <h1>Examples</h1>
 <p>Imports used in the examples: </p>
 
-```
+```java
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -14,208 +14,208 @@ import java.util.Properties;
 
 <h3>Using JSONArray</h3>
 
-```
-	private static void JSONExampleArray1() {
-		//We create a JSONObject from a String containing an array using JSONArray
-		//Firstly, we declare an Array in a String
+```java
+private static void JSONExampleArray1() {
+	//We create a JSONObject from a String containing an array using JSONArray
+	//Firstly, we declare an Array in a String
 
-		 String arrayStr = 
-		            "["+"true,"+"false,"+ "\"true\","+ "\"false\","+"\"hello\","+"23.45e-4,"+
-		                "\"23.45\","+"42,"+"\"43\","+"["+"\"world\""+"],"+
-		            		"{"+
-		                    "\"key1\":\"value1\","+
-		                    "\"key2\":\"value2\","+
-		                    "\"key3\":\"value3\","+
-		                    "\"key4\":\"value4\""+
-		                "},"+
-		                "0,"+"\"-1\""+
-		            "]";
+	String arrayStr = 
+		    "["+"true,"+"false,"+ "\"true\","+ "\"false\","+"\"hello\","+"23.45e-4,"+
+			"\"23.45\","+"42,"+"\"43\","+"["+"\"world\""+"],"+
+				"{"+
+			    "\"key1\":\"value1\","+
+			    "\"key2\":\"value2\","+
+			    "\"key3\":\"value3\","+
+			    "\"key4\":\"value4\""+
+			"},"+
+			"0,"+"\"-1\""+
+		    "]";
 
-		 //Then, we initializate the JSONArray thanks to its constructor
+	//Then, we initializate the JSONArray thanks to its constructor
 
-		  JSONArray array = new JSONArray(arrayStr);
-		  System.out.println("Values array: "+ array);
+	JSONArray array = new JSONArray(arrayStr);
+	System.out.println("Values array: "+ array);
 
-		  //We convert that array into a JSONObject, but first, we need the labels, so we need another JSONArray with the labels.
-		  //Here we will use an auxiliary function to get one for the example.
+	//We convert that array into a JSONObject, but first, we need the labels, so we need another JSONArray with the labels.
+	//Here we will use an auxiliary function to get one for the example.
 
-		  JSONArray list = listNumberArray(array.length());
-		  System.out.println("Label Array: "+ list.toString());
-		  //Now, we construct the JSONObject using both the  value array and the label array.
-		  JSONObject object = array.toJSONObject(list);
-		  System.out.println("Final JSONOBject: " + object);
-	}
-
-	//This method creates an JSONArray of labels in which those are generated by their positions
-
-	private static JSONArray listNumberArray(int max){
-		 JSONArray res = new JSONArray();
-		for (int i=0; i<max;i++) {
-			//The value of the labels must be an String in order to make it work
-			res.put(String.valueOf(i));
-		}
-		return res;
+	JSONArray list = listNumberArray(array.length());
+	System.out.println("Label Array: "+ list.toString());
+	//Now, we construct the JSONObject using both the  value array and the label array.
+	JSONObject object = array.toJSONObject(list);
+	System.out.println("Final JSONOBject: " + object);
+}
+
+//This method creates an JSONArray of labels in which those are generated by their positions
+
+private static JSONArray listNumberArray(int max){
+	JSONArray res = new JSONArray();
+	for (int i=0; i<max;i++) {
+		//The value of the labels must be an String in order to make it work
+		res.put(String.valueOf(i));
 	}
+	return res;
+}
 ```
-```
-	private static void JSONExampleArray2() {
+```java
+private static void JSONExampleArray2() {
 
-		//We can also create an Array without a String by creating an empty array and adding elements to it
+	//We can also create an Array without a String by creating an empty array and adding elements to it
 
-		  JSONArray array = new JSONArray();
+	JSONArray array = new JSONArray();
 
-		//Adding elements with .put()
+	//Adding elements with .put()
 
-		array.put("value");
-		array.put(5);
-		array.put(-23.45e67);
-		array.put(true);
-		
-		//We convert it to JSONObject providing a label arrray like last time
+	array.put("value");
+	array.put(5);
+	array.put(-23.45e67);
+	array.put(true);
 
-		 JSONArray list = listNumberArray(array.length());
-		 JSONObject object = array.toJSONObject(list);
-		 System.out.println("Final JSONOBject: " + object);
-	}
+	//We convert it to JSONObject providing a label arrray like last time
+
+	JSONArray list = listNumberArray(array.length());
+	JSONObject object = array.toJSONObject(list);
+	System.out.println("Final JSONOBject: " + object);
+}
 ```
 
 <h3>Using JSONStringer</h3>
 
-```
-	private static void JSONExampleStringer() {
+```java
+private static void JSONExampleStringer() {
 
-		//We initializate the JSONStringer
+	//We initializate the JSONStringer
 
-		JSONStringer jsonStringer = new JSONStringer();
+	JSONStringer jsonStringer = new JSONStringer();
 
-		//Now we start the process of adding elements with .object()
+	//Now we start the process of adding elements with .object()
 
-        jsonStringer.object();
+	jsonStringer.object();
 
-        //We can now add elements as keys and values with .values () and .key()
+	//We can now add elements as keys and values with .values () and .key()
 
-        jsonStringer.key("trueValue").value(true);
-        jsonStringer.key("falseValue").value(false);
-        jsonStringer.key("nullValue").value(null);
-        jsonStringer.key("stringValue").value("hello world!");
-        jsonStringer.key("complexStringValue").value("h\be\tllo w\u1234orld!");
-        jsonStringer.key("intValue").value(42);
-        jsonStringer.key("doubleValue").value(-23.45e67);
+	jsonStringer.key("trueValue").value(true);
+	jsonStringer.key("falseValue").value(false);
+	jsonStringer.key("nullValue").value(null);
+	jsonStringer.key("stringValue").value("hello world!");
+	jsonStringer.key("complexStringValue").value("h\be\tllo w\u1234orld!");
+	jsonStringer.key("intValue").value(42);
+	jsonStringer.key("doubleValue").value(-23.45e67);
 
-        //We end this prcedure with .ednObject
+	//We end this prcedure with .ednObject
 
-        jsonStringer.endObject();
+	jsonStringer.endObject();
 
-       //Once we have a JSONStringer, we convert it to JSONObject generating a String and using JSONObject's contructor.
+	//Once we have a JSONStringer, we convert it to JSONObject generating a String and using JSONObject's contructor.
 
-        String str = jsonStringer.toString();
-        JSONObject jsonObject = new JSONObject(str);
-        
-       System.out.println("Final JSONOBject: " + jsonObject);
-	}
+	String str = jsonStringer.toString();
+	JSONObject jsonObject = new JSONObject(str);
+
+	System.out.println("Final JSONOBject: " + jsonObject);
+}
 ```
 <h3>Using JSONObject</h3>
 
+```java
+private static void JSONExampleObject1() {
+
+	//We can create a JSONObject from a String with the class builder
+
+	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+	JSONObject example = new JSONObject(string);
+	System.out.println("Final JSONObject: " + example);
+
+}
 ```
-	private static void JSONExampleObject1() {
+```java
+private static void JSONExampleObject2() {
 
-		//We can create a JSONObject from a String with the class builder
+	//We can also create a JSONObject directly without messing around with any of the other functions.
 
-		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
-		JSONObject example = new JSONObject(string);
-		System.out.println("Final JSONObject: " + example);
-		
-	}
+	JSONObject example = new JSONObject();
+
+
+	//Now we add the keys and values in a similar way as the Stringer method
+	example.put("key", "value");
+
+	//As you can see, the first entry is the key and the second would be its associeted value.
+
+	example.put("key2", 5);
+	example.put("key3", -23.45e67);
+	example.put("trueValue", true);
+
+	//We can't add null values thougth
+
+	//example.put("nullValue", null); //This is not possible
+
+	 System.out.println("Final JSONOBject: " + example);
+}
 ```
-```
-	private static void JSONExampleObject2() {
+```java
+private static void JSONExampleObject3() {
 
-		//We can also create a JSONObject directly without messing around with any of the other functions.
+	//We can also create a JSONObject with a Java Map
+	//YoU will need a Map whose keys are Strings. The values can be whatever you want
 
-		JSONObject example = new JSONObject();
+	Map<String,Double> map = new HashMap<String, Double>();
 
+	map.put("key1", 1.0);
+	map.put("key2", -23.45e67);
 
-		//Now we add the keys and values in a similar way as the Stringer method
-		example.put("key", "value");
+	//We create the JSONObject with the map with its class builder
 
-		//As you can see, the first entry is the key and the second would be its associeted value.
-
-		example.put("key2", 5);
-		example.put("key3", -23.45e67);
-		example.put("trueValue", true);
-
-		//We can't add null values thougth
-
-		//example.put("nullValue", null); //This is not possible
-		
-		 System.out.println("Final JSONOBject: " + example);
-	}
-```
-```
-	private static void JSONExampleObject3() {
-
-		//We can also create a JSONObject with a Java Map
-		//YoU will need a Map whose keys are Strings. The values can be whatever you want
-
-		Map<String,Double> map = new HashMap<String, Double>();
-		
-		map.put("key1", 1.0);
-		map.put("key2", -23.45e67);
-		
-		//We create the JSONObject with the map with its class builder
-
-		JSONObject example = new JSONObject(map);
-		 System.out.println("Final JSONOBject: " + example);
-	}
+	JSONObject example = new JSONObject(map);
+	 System.out.println("Final JSONOBject: " + example);
+}
 ```
 <h3>Using JSONWriter</h3>
 
-```	
-	private static void JSONExamplWriter() {
+```java
+private static void JSONExamplWriter() {
 
-		//This method works in a very similar way to Object  and Stringer in the construction of the JSON.
-		//The difference is that it needs a Java object called "Appendable" like StringBuilder
+	//This method works in a very similar way to Object  and Stringer in the construction of the JSON.
+	//The difference is that it needs a Java object called "Appendable" like StringBuilder
 
-		StringBuilder write = new StringBuilder();
-		JSONWriter jsonWriter = new JSONWriter(write);
+	StringBuilder write = new StringBuilder();
+	JSONWriter jsonWriter = new JSONWriter(write);
 
-		//We behave now the same way as Stringer
+	//We behave now the same way as Stringer
 
-		jsonWriter.object();
-		
-		jsonWriter.key("trueValue").value(true);
-		jsonWriter.key("falseValue").value(false);
-		jsonWriter.key("nullValue").value(null);
-		jsonWriter.key("stringValue").value("hello world!");
-		jsonWriter.key("complexStringValue").value("h\be\tllo w\u1234orld!");
-		jsonWriter.key("intValue").value(42);
-		jsonWriter.key("doubleValue").value(-23.45e67);
-		
-		jsonWriter.endObject();
-		
-		//The resoult should be in the "write" object
-		
-		System.out.println("JSON: " + write.toString());
-		
-		//The difference is that we don't get a JSONObject in this one.
-		
-		
-	}
+	jsonWriter.object();
+
+	jsonWriter.key("trueValue").value(true);
+	jsonWriter.key("falseValue").value(false);
+	jsonWriter.key("nullValue").value(null);
+	jsonWriter.key("stringValue").value("hello world!");
+	jsonWriter.key("complexStringValue").value("h\be\tllo w\u1234orld!");
+	jsonWriter.key("intValue").value(42);
+	jsonWriter.key("doubleValue").value(-23.45e67);
+
+	jsonWriter.endObject();
+
+	//The resoult should be in the "write" object
+
+	System.out.println("JSON: " + write.toString());
+
+	//The difference is that we don't get a JSONObject in this one.
+
+
+}
 ```
-```	
-	private static void JSONExampleTokener() {
+```java
+private static void JSONExampleTokener() {
 
-		//A partir de una String podemos crear un JSONTokener, que lo podemos usar alternativamente para JSONArray,JSONObject
+	//A partir de una String podemos crear un JSONTokener, que lo podemos usar alternativamente para JSONArray,JSONObject
 
-		String string = "this is not a valid JSON string";
-		JSONTokener token = new JSONTokener(string);
-		
-		//Now you can use the token in JSONObject and Array the same way as a String
+	String string = "this is not a valid JSON string";
+	JSONTokener token = new JSONTokener(string);
 
-		JSONObject object = new JSONObject(token);
-		JSONArray array = new JSONArray(token);
-		
-	}
+	//Now you can use the token in JSONObject and Array the same way as a String
+
+	JSONObject object = new JSONObject(token);
+	JSONArray array = new JSONArray(token);
+
+}
 ```	
 <h2>Part 2: Conversion methods</h2>
 <p>We don't need to have a JSON document to work. This project also admits conversions from other type of files.</p>
@@ -223,144 +223,144 @@ import java.util.Properties;
 	
 <h3>Extra: Conversion to JSONArray</h3>
 
-```
-	private static void JSONObjectToArray() {
-		//We start with a JSONObject
+```java
+private static void JSONObjectToArray() {
+	//We start with a JSONObject
 
-		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
 
-		JSONObject example = new JSONObject(string);
-		
-		//We need a list of key strings like the reverse operation
-		
-		JSONArray keyStrings = listNumberArray(example.length());
-		
-		//Then we convert to the Array using both elelements
-		
-		JSONArray array = example.toJSONArray(keyStrings);
-		
-		System.out.println("Final JSONArray: " + array);
-	}
+	JSONObject example = new JSONObject(string);
+
+	//We need a list of key strings like the reverse operation
+
+	JSONArray keyStrings = listNumberArray(example.length());
+
+	//Then we convert to the Array using both elelements
+
+	JSONArray array = example.toJSONArray(keyStrings);
+
+	System.out.println("Final JSONArray: " + array);
+}
 ```
 <h3>XML Conversions</h3>
 
-```		
-	private static void XMLToExampleConversion() {
+```java
+private static void XMLToExampleConversion() {
 
-		//We start with a JSONObject
-		
-		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
-		JSONObject example = new JSONObject(string);
+	//We start with a JSONObject
 
-		//We obtain a String with XML format with toString()
+	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+	JSONObject example = new JSONObject(string);
 
-		String output = XML.toString(example);
-		System.out.println("Final XML: " + output);
-	}
+	//We obtain a String with XML format with toString()
+
+	String output = XML.toString(example);
+	System.out.println("Final XML: " + output);
+}
 ```
-```	
-	private static void XMLFromExampleConversion() {
+```java
+private static void XMLFromExampleConversion() {
 
-		//We start with a string with  the XML format
+	//We start with a string with  the XML format
 
-		String string = "<0>value</0><1>5</1><2>-2.345E+68</2><3>true</3>";
+	String string = "<0>value</0><1>5</1><2>-2.345E+68</2><3>true</3>";
 
-		//We obtain a JSONObject with toJSONOBject()
+	//We obtain a JSONObject with toJSONOBject()
 
-		JSONObject output = XML.toJSONObject(string);
-		
-		System.out.println("Final JSONObject: " + output);
-	}
+	JSONObject output = XML.toJSONObject(string);
+
+	System.out.println("Final JSONObject: " + output);
+}
 ```
 <h3>Cookie Conversions</h3>
 
+```java
+private static void CookieToExampleConversion() {
+
+	//We start with a JSONObject
+	//The JSONOBject needs to entries that gives the cookie a name and gives the field "name" a name too.
+	//The Cokkie format doesn't support booleans
+
+	String string = "{\"name\":\"Cookie-Name\",\"value\":\"name\",\"1\":5,\"2\":-2.345E68,\"3\":'true'}";
+	JSONObject example = new JSONObject(string);
+
+	//We obtain a String with Cookie format with toString()
+
+	String output = Cookie.toString(example);
+	System.out.println("Final Cookie: " + output);
+}
 ```
-	private static void CookieToExampleConversion() {
+```java
+private static void CookieFromExampleConversion() {
 
-		//We start with a JSONObject
-		//The JSONOBject needs to entries that gives the cookie a name and gives the field "name" a name too.
-		//The Cokkie format doesn't support booleans
+	//We start with a string with  the Cookie format
 
-		String string = "{\"name\":\"Cookie-Name\",\"value\":\"name\",\"1\":5,\"2\":-2.345E68,\"3\":'true'}";
-		JSONObject example = new JSONObject(string);
-		
-		//We obtain a String with Cookie format with toString()
+	String string = "Cookie-Name=name;1=5;2=-2.345E%2b68;3=true";
 
-		String output = Cookie.toString(example);
-		System.out.println("Final Cookie: " + output);
-	}
-```
-```
-	private static void CookieFromExampleConversion() {
+	//We obtain a JSONObject with toJSONOBject()
 
-		//We start with a string with  the Cookie format
-
-		String string = "Cookie-Name=name;1=5;2=-2.345E%2b68;3=true";
-
-		//We obtain a JSONObject with toJSONOBject()
-
-		JSONObject output = Cookie.toJSONObject(string);
-		System.out.println("Final JSONObject: " + output);
-	}
+	JSONObject output = Cookie.toJSONObject(string);
+	System.out.println("Final JSONObject: " + output);
+}
 ```
 
 <h3>HTTP Conversions</h3>
 
+```java
+private static void HTTPToExampleConversion() {
+
+	//We start with a JSONObject
+	//The JSONObject must have the minimun header for a HTTP request or header
+
+	String string = "{\"Method\":\"POST\",\"Request-URI\":'/',\"HTTP-Version\":'HTTP/1.1',\"Value1\":true,\"Value2\":2,\"Value3\":-2.345E68}";
+
+	JSONObject example = new JSONObject(string);
+
+	//We obtain a String with HTTP format with toString()
+
+	String output = HTTP.toString(example);
+	System.out.println("Final HTTP: " + output);
+}
 ```
-	private static void HTTPToExampleConversion() {
+```java
+private static void HTTPFromExampleConversion() {
 
-		//We start with a JSONObject
-		//The JSONObject must have the minimun header for a HTTP request or header
+	//We start with a string with  the HTTP format
 
-		String string = "{\"Method\":\"POST\",\"Request-URI\":'/',\"HTTP-Version\":'HTTP/1.1',\"Value1\":true,\"Value2\":2,\"Value3\":-2.345E68}";
+	String string = "Final HTTP: POST '/' HTTP/1.1 Value3: -2.345E+68 Value1: true Value2: 2";
 
-		JSONObject example = new JSONObject(string);
+	//We obtain a JSONObject with toJSONOBject()
 
-		//We obtain a String with HTTP format with toString()
-
-		String output = HTTP.toString(example);
-		System.out.println("Final HTTP: " + output);
-	}
-```
-```	
-	private static void HTTPFromExampleConversion() {
-
-		//We start with a string with  the HTTP format
-
-		String string = "Final HTTP: POST '/' HTTP/1.1 Value3: -2.345E+68 Value1: true Value2: 2";
-
-		//We obtain a JSONObject with toJSONOBject()
-
-		JSONObject output = HTTP.toJSONObject(string);
-		System.out.println("Final JSONObject: " + output);
-	}
+	JSONObject output = HTTP.toJSONObject(string);
+	System.out.println("Final JSONObject: " + output);
+}
 ```
 <h3>CDL Conversions</h3>
 
-```	
+```java
 private static void CDLToExampleConversion() {
 
-		//We start with some JSONObjects with the same values in the keys but different values in the "values"
+	//We start with some JSONObjects with the same values in the keys but different values in the "values"
 
-		String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
-		JSONObject example = new JSONObject(string);
-		
-		String string2 = "{\"0\":\"value2\",\"1\":6,\"2\":-8.345E68,\"3\":false}";
-		JSONObject example2 = new JSONObject(string2);
-		
-		//We need now a JSONArray with those JSONObjects
+	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
+	JSONObject example = new JSONObject(string);
 
-		JSONArray array = new JSONArray();
-		array.put(example);
-		array.put(example2);
+	String string2 = "{\"0\":\"value2\",\"1\":6,\"2\":-8.345E68,\"3\":false}";
+	JSONObject example2 = new JSONObject(string2);
 
-		//We obtain a String with XML format with toString()
+	//We need now a JSONArray with those JSONObjects
 
-		String output = CDL.toString(array);
-		System.out.println("Final CDL: \r\n" + output);
-	}
-```	
+	JSONArray array = new JSONArray();
+	array.put(example);
+	array.put(example2);
+
+	//We obtain a String with XML format with toString()
+
+	String output = CDL.toString(array);
+	System.out.println("Final CDL: \r\n" + output);
+}
 ```	
+```java
 private static void CDLFromExampleConversion() {
 
 	//We start wtih a String with the CDL format
@@ -368,7 +368,7 @@ private static void CDLFromExampleConversion() {
 	String string = "0,1,2,3\n"
 			+ "value,5,-2.345E+68,true\n"
 			+ "value2,6,-8.345E+68,false";
-	
+
 	//We obtain a JSONArray with toJSONOBject()
 
 	JSONArray output = CDL.toJSONArray(string);
@@ -377,8 +377,8 @@ private static void CDLFromExampleConversion() {
 ```
 <h3>Properties Conversions</h3>
 
-```
-	private static Properties PropertyToExampleConversion() {
+```java
+private static Properties PropertyToExampleConversion() {
 
 	//We start with a JSONObject
 
@@ -391,43 +391,43 @@ private static void CDLFromExampleConversion() {
 	System.out.println("Final Properties: " + output);
 
 	return output;
-	}
+}
 ```
-```	
-	private static void PropertyFromExampleConversion() {
+```java
+private static void PropertyFromExampleConversion() {
 
-		//We start with a Properties object
+	//We start with a Properties object
 
-		Properties input = PropertyToExampleConversion();
+	Properties input = PropertyToExampleConversion();
 
-		//We obtain a JSONObject with toJSONOBject()
+	//We obtain a JSONObject with toJSONOBject()
 
-		JSONObject output = Property.toJSONObject(input);
-		System.out.println("Final JSONObject: " + output);
-	}
+	JSONObject output = Property.toJSONObject(input);
+	System.out.println("Final JSONObject: " + output);
+}
 ```
 <h2>List of all examples methods</h2>
 
-```
-	public static void main(String[] args) {
-		//JSONObjectToArray();
-		//JSONExampleArray1();
-		//JSONExampleArray2();
-		//JSONExampleStringer();
-		//JSONExampleObject1();
-		//JSONExampleObject2();
-		//JSONExampleObject3();
-		//JSONExamplWriter();
-		//XMLToExampleConversion();
-		//XMLFromExampleConversion();
-		//CookieToExampleConversion();
-		//CookieFromExampleConversion(); 
-		//HTTPToExampleConversion();
-		//HTTPFromExampleConversion();
-		//CDLToExampleConversion();
-		//CDLFromExampleConversion();
-		//PropertyToExampleConversion();
-		//PropertyFromExampleConversion();
-	}
+```java
+public static void main(String[] args) {
+	//JSONObjectToArray();
+	//JSONExampleArray1();
+	//JSONExampleArray2();
+	//JSONExampleStringer();
+	//JSONExampleObject1();
+	//JSONExampleObject2();
+	//JSONExampleObject3();
+	//JSONExamplWriter();
+	//XMLToExampleConversion();
+	//XMLFromExampleConversion();
+	//CookieToExampleConversion();
+	//CookieFromExampleConversion(); 
+	//HTTPToExampleConversion();
+	//HTTPFromExampleConversion();
+	//CDLToExampleConversion();
+	//CDLFromExampleConversion();
+	//PropertyToExampleConversion();
+	//PropertyFromExampleConversion();
+}
 ```
 

From 12411b7981e47a3541d1ec27694ca2bc0507a7ba Mon Sep 17 00:00:00 2001
From: TheCommandBlock <95651685+InACommandBlock@users.noreply.github.com>
Date: Thu, 6 Oct 2022 03:18:03 +0200
Subject: [PATCH 078/212] Update Examples.md

Co-authored-by: JAYSE <104235500+JayseMayne@users.noreply.github.com>
---
 Examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples.md b/Examples.md
index 2671d1d..fb010d5 100644
--- a/Examples.md
+++ b/Examples.md
@@ -406,7 +406,7 @@ private static void PropertyFromExampleConversion() {
 	System.out.println("Final JSONObject: " + output);
 }
 ```
-<h2>List of all examples methods</h2>
+ <h2>List of all examples methods</h2>
 
 ```java
 public static void main(String[] args) {

From b7f708b22299501305c2bd8577eb7b5bbdbbb8f4 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Thu, 6 Oct 2022 12:01:13 +0100
Subject: [PATCH 079/212] Altered XML toString to allow indentation param

---
 src/main/java/org/json/XML.java           | 97 +++++++++++++++++++++--
 src/test/java/org/json/junit/XMLTest.java | 78 ++++++++++++++++++
 2 files changed, 167 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 69782cb..28a292f 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -752,6 +752,11 @@ public class XML {
      */
     public static String toString(final Object object, final String tagName, final XMLParserConfiguration config)
             throws JSONException {
+        return toString(object, tagName, config, 0, 0);
+    }
+
+    private static String toString(final Object object, final String tagName, final XMLParserConfiguration config, int indentFactor, int indent)
+            throws JSONException {
         StringBuilder sb = new StringBuilder();
         JSONArray ja;
         JSONObject jo;
@@ -761,9 +766,14 @@ public class XML {
 
             // Emit <tagName>
             if (tagName != null) {
+                sb.append(indent(indent));
                 sb.append('<');
                 sb.append(tagName);
                 sb.append('>');
+                if(indentFactor > 0){
+                    sb.append("\n");
+                    indent += indentFactor;
+                }
             }
 
             // Loop thru the keys.
@@ -806,31 +816,39 @@ public class XML {
                             sb.append('<');
                             sb.append(key);
                             sb.append('>');
-                            sb.append(toString(val, null, config));
+                            sb.append(toString(val, null, config, indentFactor, indent));
                             sb.append("</");
                             sb.append(key);
                             sb.append('>');
                         } else {
-                            sb.append(toString(val, key, config));
+                            sb.append(toString(val, key, config, indentFactor, indent));
                         }
                     }
                 } else if ("".equals(value)) {
+                    sb.append(indent(indent));
                     sb.append('<');
                     sb.append(key);
                     sb.append("/>");
+                    if(indentFactor > 0){
+                        sb.append("\n");
+                    }
 
                     // Emit a new tag <k>
 
                 } else {
-                    sb.append(toString(value, key, config));
+                    sb.append(toString(value, key, config, indentFactor, indent));
                 }
             }
             if (tagName != null) {
 
                 // Emit the </tagName> close tag
+                sb.append(indent(indent - indentFactor));
                 sb.append("</");
                 sb.append(tagName);
                 sb.append('>');
+                if(indentFactor > 0){
+                    sb.append("\n");
+                }
             }
             return sb.toString();
 
@@ -849,15 +867,78 @@ public class XML {
                 // XML does not have good support for arrays. If an array
                 // appears in a place where XML is lacking, synthesize an
                 // <array> element.
-                sb.append(toString(val, tagName == null ? "array" : tagName, config));
+                sb.append(toString(val, tagName == null ? "array" : tagName, config, indentFactor, indent));
             }
             return sb.toString();
         }
 
-        string = (object == null) ? "null" : escape(object.toString());
-        return (tagName == null) ? "\"" + string + "\""
-                : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName
-                        + ">" + string + "</" + tagName + ">";
 
+        string = (object == null) ? "null" : escape(object.toString());
+
+        if(tagName == null){
+            return indent(indent) + "\"" + string + "\"" + ((indentFactor > 0) ? "\n" : "");
+        } else if(string.length() == 0){
+            return indent(indent) + "<" + tagName + "/>" + ((indentFactor > 0) ? "\n" : "");
+        } else {
+            return indent(indent) + "<" + tagName
+                    + ">" + string + "</" + tagName + ">" + ((indentFactor > 0) ? "\n" : "");
+        }
+    }
+
+    /**
+     * Convert a JSONObject into a well-formed, pretty printed element-normal XML string.
+     *
+     * @param object
+     *            A JSONObject.
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @return A string.
+     * @throws JSONException Thrown if there is an error parsing the string
+     */
+    public static String toString(Object object, int indentFactor){
+        return toString(object, null, XMLParserConfiguration.ORIGINAL, indentFactor);
+    }
+
+    /**
+     * Convert a JSONObject into a well-formed, pretty printed element-normal XML string.
+     *
+     * @param object
+     *            A JSONObject.
+     * @param tagName
+     *            The optional name of the enclosing tag.
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @return A string.
+     * @throws JSONException Thrown if there is an error parsing the string
+     */
+    public static String toString(final Object object, final String tagName, int indentFactor) {
+        return toString(object, tagName, XMLParserConfiguration.ORIGINAL, indentFactor);
+    }
+
+    /**
+     * Convert a JSONObject into a well-formed, pretty printed element-normal XML string.
+     *
+     * @param object
+     *            A JSONObject.
+     * @param tagName
+     *            The optional name of the enclosing tag.
+     * @param config
+     *            Configuration that can control output to XML.
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @return A string.
+     * @throws JSONException Thrown if there is an error parsing the string
+     */
+    public static String toString(final Object object, final String tagName, final XMLParserConfiguration config, int indentFactor)
+            throws JSONException {
+        return toString(object, tagName, config, indentFactor, 0);
+    }
+
+    private static final String indent(int indent) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < indent; i++) {
+            sb.append(' ');
+        }
+        return sb.toString();
     }
 }
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 906924d..9ba2279 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1049,4 +1049,82 @@ public class XMLTest {
             fail("Expected to be unable to modify the config");
         } catch (Exception ignored) { }
     }
+
+    @Test
+    public void testXmlToStringWithIndent(){
+        String str = "{\n" +
+                "  \"success\": true,\n" +
+                "  \"error\": null,\n" +
+                "  \"response\": [\n" +
+                "    {\n" +
+                "      \"timestamp\": 1664917200,\n" +
+                "      \"dateTimeISO\": \"2022-10-05T00:00:00+03:00\",\n" +
+                "      \"loc\": {\n" +
+                "        \"lat\": 39.91987,\n" +
+                "        \"long\": 32.85427\n" +
+                "      },\n" +
+                "      \"place\": {\n" +
+                "        \"name\": \"ankara\",\n" +
+                "        \"state\": \"an\",\n" +
+                "        \"country\": \"tr\"\n" +
+                "      },\n" +
+                "      \"profile\": {\n" +
+                "        \"tz\": \"Europe/Istanbul\"\n" +
+                "      },\n" +
+                "      \"sun\": {\n" +
+                "        \"rise\": 1664941721,\n" +
+                "        \"riseISO\": \"2022-10-05T06:48:41+03:00\",\n" +
+                "        \"set\": 1664983521,\n" +
+                "        \"setISO\": \"2022-10-05T18:25:21+03:00\",\n" +
+                "        \"transit\": 1664962621,\n" +
+                "        \"transitISO\": \"2022-10-05T12:37:01+03:00\",\n" +
+                "        \"midnightSun\": false,\n" +
+                "        \"polarNight\": false,\n" +
+                "        \"twilight\": {\n" +
+                "          \"civilBegin\": 1664940106,\n" +
+                "          \"civilBeginISO\": \"2022-10-05T06:21:46+03:00\",\n" +
+                "          \"civilEnd\": 1664985136,\n" +
+                "          \"civilEndISO\": \"2022-10-05T18:52:16+03:00\",\n" +
+                "          \"nauticalBegin\": 1664938227,\n" +
+                "          \"nauticalBeginISO\": \"2022-10-05T05:50:27+03:00\",\n" +
+                "          \"nauticalEnd\": 1664987015,\n" +
+                "          \"nauticalEndISO\": \"2022-10-05T19:23:35+03:00\",\n" +
+                "          \"astronomicalBegin\": 1664936337,\n" +
+                "          \"astronomicalBeginISO\": \"2022-10-05T05:18:57+03:00\",\n" +
+                "          \"astronomicalEnd\": 1664988905,\n" +
+                "          \"astronomicalEndISO\": \"2022-10-05T19:55:05+03:00\"\n" +
+                "        }\n" +
+                "      },\n" +
+                "      \"moon\": {\n" +
+                "        \"rise\": 1664976480,\n" +
+                "        \"riseISO\": \"2022-10-05T16:28:00+03:00\",\n" +
+                "        \"set\": 1664921520,\n" +
+                "        \"setISO\": \"2022-10-05T01:12:00+03:00\",\n" +
+                "        \"transit\": 1664994240,\n" +
+                "        \"transitISO\": \"2022-10-05T21:24:00+03:00\",\n" +
+                "        \"underfoot\": 1664949360,\n" +
+                "        \"underfootISO\": \"2022-10-05T08:56:00+03:00\",\n" +
+                "        \"phase\": {\n" +
+                "          \"phase\": 0.3186,\n" +
+                "          \"name\": \"waxing gibbous\",\n" +
+                "          \"illum\": 71,\n" +
+                "          \"age\": 9.41,\n" +
+                "          \"angle\": 0.55\n" +
+                "        }\n" +
+                "      }\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}" ;
+        JSONObject jsonObject = new JSONObject(str);
+        String xmlString = XML.toString(jsonObject, "Outer", 1);
+        System.out.println(xmlString);
+        System.out.println(XML.toIndentedXmlString(xmlString, 2, true));
+
+
+    }
+
+
 }
+
+
+

From fa457a4113d34fe768ebdc6ee39cdcd122ba1596 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Thu, 6 Oct 2022 12:01:26 +0100
Subject: [PATCH 080/212] Test cases for XML toString indentation

---
 src/test/java/org/json/junit/XMLTest.java | 1507 ++++++++++++++++++++-
 1 file changed, 1502 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 9ba2279..8d25b7e 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1051,7 +1051,7 @@ public class XMLTest {
     }
 
     @Test
-    public void testXmlToStringWithIndent(){
+    public void testIndentComplicatedJsonObject(){
         String str = "{\n" +
                 "  \"success\": true,\n" +
                 "  \"error\": null,\n" +
@@ -1116,14 +1116,1511 @@ public class XMLTest {
                 "  ]\n" +
                 "}" ;
         JSONObject jsonObject = new JSONObject(str);
-        String xmlString = XML.toString(jsonObject, "Outer", 1);
-        System.out.println(xmlString);
-        System.out.println(XML.toIndentedXmlString(xmlString, 2, true));
+        String actualIndentedXmlString = XML.toString(jsonObject, 1);
+        String expected = "<success>true</success>\n" +
+                "<response>\n" +
+                " <dateTimeISO>2022-10-05T00:00:00+03:00</dateTimeISO>\n" +
+                " <loc>\n" +
+                "  <lat>39.91987</lat>\n" +
+                "  <long>32.85427</long>\n" +
+                " </loc>\n" +
+                " <moon>\n" +
+                "  <phase>\n" +
+                "   <phase>0.3186</phase>\n" +
+                "   <name>waxing gibbous</name>\n" +
+                "   <angle>0.55</angle>\n" +
+                "   <illum>71</illum>\n" +
+                "   <age>9.41</age>\n" +
+                "  </phase>\n" +
+                "  <setISO>2022-10-05T01:12:00+03:00</setISO>\n" +
+                "  <underfoot>1664949360</underfoot>\n" +
+                "  <set>1664921520</set>\n" +
+                "  <transit>1664994240</transit>\n" +
+                "  <transitISO>2022-10-05T21:24:00+03:00</transitISO>\n" +
+                "  <riseISO>2022-10-05T16:28:00+03:00</riseISO>\n" +
+                "  <rise>1664976480</rise>\n" +
+                "  <underfootISO>2022-10-05T08:56:00+03:00</underfootISO>\n" +
+                " </moon>\n" +
+                " <profile>\n" +
+                "  <tz>Europe/Istanbul</tz>\n" +
+                " </profile>\n" +
+                " <place>\n" +
+                "  <country>tr</country>\n" +
+                "  <name>ankara</name>\n" +
+                "  <state>an</state>\n" +
+                " </place>\n" +
+                " <sun>\n" +
+                "  <setISO>2022-10-05T18:25:21+03:00</setISO>\n" +
+                "  <midnightSun>false</midnightSun>\n" +
+                "  <set>1664983521</set>\n" +
+                "  <transit>1664962621</transit>\n" +
+                "  <polarNight>false</polarNight>\n" +
+                "  <transitISO>2022-10-05T12:37:01+03:00</transitISO>\n" +
+                "  <riseISO>2022-10-05T06:48:41+03:00</riseISO>\n" +
+                "  <rise>1664941721</rise>\n" +
+                "  <twilight>\n" +
+                "   <civilEnd>1664985136</civilEnd>\n" +
+                "   <astronomicalBegin>1664936337</astronomicalBegin>\n" +
+                "   <astronomicalEnd>1664988905</astronomicalEnd>\n" +
+                "   <astronomicalBeginISO>2022-10-05T05:18:57+03:00</astronomicalBeginISO>\n" +
+                "   <civilBegin>1664940106</civilBegin>\n" +
+                "   <nauticalEndISO>2022-10-05T19:23:35+03:00</nauticalEndISO>\n" +
+                "   <astronomicalEndISO>2022-10-05T19:55:05+03:00</astronomicalEndISO>\n" +
+                "   <nauticalBegin>1664938227</nauticalBegin>\n" +
+                "   <nauticalEnd>1664987015</nauticalEnd>\n" +
+                "   <nauticalBeginISO>2022-10-05T05:50:27+03:00</nauticalBeginISO>\n" +
+                "   <civilBeginISO>2022-10-05T06:21:46+03:00</civilBeginISO>\n" +
+                "   <civilEndISO>2022-10-05T18:52:16+03:00</civilEndISO>\n" +
+                "  </twilight>\n" +
+                " </sun>\n" +
+                " <timestamp>1664917200</timestamp>\n" +
+                "</response>\n" +
+                "<error>null</error>\n";
+        assertEquals(actualIndentedXmlString, expected);
+
+
+    }
+    @Test
+    public void testIndentSimpleJsonObject(){
+        String str = "{    \"employee\": {  \n" +
+                "        \"name\":       \"sonoo\",   \n" +
+                "        \"salary\":      56000,   \n" +
+                "        \"married\":    true  \n" +
+                "    }}";
+        JSONObject jsonObject = new JSONObject(str);
+        String actual = XML.toString(jsonObject, "Test", 2);
+        String expected = "<Test>\n" +
+                "  <employee>\n" +
+                "    <name>sonoo</name>\n" +
+                "    <salary>56000</salary>\n" +
+                "    <married>true</married>\n" +
+                "  </employee>\n" +
+                "</Test>\n";
+        assertEquals(actual, expected);
+    }
+
+    @Test
+    public void testIndentSimpleJsonArray(){
+        String str = "[  \n" +
+                "    {\"name\":\"Ram\", \"email\":\"Ram@gmail.com\"},  \n" +
+                "    {\"name\":\"Bob\", \"email\":\"bob32@gmail.com\"}  \n" +
+                "]  ";
+        JSONArray jsonObject = new JSONArray(str);
+        String actual = XML.toString(jsonObject, 2);
+        String expected = "<array>\n" +
+                "  <name>Ram</name>\n" +
+                "  <email>Ram@gmail.com</email>\n" +
+                "</array>\n" +
+                "<array>\n" +
+                "  <name>Bob</name>\n" +
+                "  <email>bob32@gmail.com</email>\n" +
+                "</array>\n";
+        assertEquals(actual, expected);
 
 
     }
 
-
+    @Test
+    public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
+        String str = "{\n" +
+                "  \"success\": true,\n" +
+                "  \"error\": null,\n" +
+                "  \"response\": [\n" +
+                "    {\n" +
+                "      \"loc\": {\n" +
+                "        \"long\": 31.25,\n" +
+                "        \"lat\": 30.063\n" +
+                "      },\n" +
+                "      \"interval\": \"day\",\n" +
+                "      \"place\": {\n" +
+                "        \"name\": \"cairo\",\n" +
+                "        \"state\": \"qh\",\n" +
+                "        \"country\": \"eg\"\n" +
+                "      },\n" +
+                "      \"periods\": [\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665032400,\n" +
+                "          \"validTime\": \"2022-10-06T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-06T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 32,\n" +
+                "          \"maxTempF\": 90,\n" +
+                "          \"minTempC\": 19,\n" +
+                "          \"minTempF\": 66,\n" +
+                "          \"avgTempC\": 25,\n" +
+                "          \"avgTempF\": 78,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 32,\n" +
+                "          \"maxFeelslikeF\": 89,\n" +
+                "          \"minFeelslikeC\": 21,\n" +
+                "          \"minFeelslikeF\": 70,\n" +
+                "          \"avgFeelslikeC\": 26,\n" +
+                "          \"avgFeelslikeF\": 80,\n" +
+                "          \"feelslikeC\": 21,\n" +
+                "          \"feelslikeF\": 70,\n" +
+                "          \"maxDewpointC\": 17,\n" +
+                "          \"maxDewpointF\": 63,\n" +
+                "          \"minDewpointC\": 11,\n" +
+                "          \"minDewpointF\": 52,\n" +
+                "          \"avgDewpointC\": 14,\n" +
+                "          \"avgDewpointF\": 58,\n" +
+                "          \"dewpointC\": 17,\n" +
+                "          \"dewpointF\": 63,\n" +
+                "          \"maxHumidity\": 77,\n" +
+                "          \"minHumidity\": 29,\n" +
+                "          \"humidity\": 77,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1015,\n" +
+                "          \"pressureIN\": 29.97,\n" +
+                "          \"windDir\": \"N\",\n" +
+                "          \"windDirDEG\": 353,\n" +
+                "          \"windSpeedKTS\": 5,\n" +
+                "          \"windSpeedKPH\": 9,\n" +
+                "          \"windSpeedMPH\": 6,\n" +
+                "          \"windGustKTS\": 21,\n" +
+                "          \"windGustKPH\": 40,\n" +
+                "          \"windGustMPH\": 25,\n" +
+                "          \"windDirMax\": \"NNW\",\n" +
+                "          \"windDirMaxDEG\": 342,\n" +
+                "          \"windSpeedMaxKTS\": 9,\n" +
+                "          \"windSpeedMaxKPH\": 16,\n" +
+                "          \"windSpeedMaxMPH\": 10,\n" +
+                "          \"windDirMin\": \"N\",\n" +
+                "          \"windDirMinDEG\": 353,\n" +
+                "          \"windSpeedMinKTS\": 1,\n" +
+                "          \"windSpeedMinKPH\": 2,\n" +
+                "          \"windSpeedMinMPH\": 1,\n" +
+                "          \"windDir80m\": \"N\",\n" +
+                "          \"windDir80mDEG\": 11,\n" +
+                "          \"windSpeed80mKTS\": 12,\n" +
+                "          \"windSpeed80mKPH\": 22,\n" +
+                "          \"windSpeed80mMPH\": 13,\n" +
+                "          \"windGust80mKTS\": 22,\n" +
+                "          \"windGust80mKPH\": 41,\n" +
+                "          \"windGust80mMPH\": 25,\n" +
+                "          \"windDirMax80m\": \"NNW\",\n" +
+                "          \"windDirMax80mDEG\": 343,\n" +
+                "          \"windSpeedMax80mKTS\": 22,\n" +
+                "          \"windSpeedMax80mKPH\": 41,\n" +
+                "          \"windSpeedMax80mMPH\": 25,\n" +
+                "          \"windDirMin80m\": \"E\",\n" +
+                "          \"windDirMin80mDEG\": 95,\n" +
+                "          \"windSpeedMin80mKTS\": 8,\n" +
+                "          \"windSpeedMin80mKPH\": 15,\n" +
+                "          \"windSpeedMin80mMPH\": 10,\n" +
+                "          \"sky\": 22,\n" +
+                "          \"cloudsCoded\": \"FW\",\n" +
+                "          \"weather\": \"Mostly Sunny\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
+                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
+                "          \"icon\": \"fair.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": 6,\n" +
+                "          \"solradWM2\": 5608,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 778,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665028274,\n" +
+                "          \"sunset\": 1665070502,\n" +
+                "          \"sunriseISO\": \"2022-10-06T05:51:14+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-06T17:35:02+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665118800,\n" +
+                "          \"validTime\": \"2022-10-07T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-07T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 30,\n" +
+                "          \"maxTempF\": 86,\n" +
+                "          \"minTempC\": 19,\n" +
+                "          \"minTempF\": 66,\n" +
+                "          \"avgTempC\": 24,\n" +
+                "          \"avgTempF\": 76,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 29,\n" +
+                "          \"maxFeelslikeF\": 85,\n" +
+                "          \"minFeelslikeC\": 19,\n" +
+                "          \"minFeelslikeF\": 67,\n" +
+                "          \"avgFeelslikeC\": 24,\n" +
+                "          \"avgFeelslikeF\": 76,\n" +
+                "          \"feelslikeC\": 19,\n" +
+                "          \"feelslikeF\": 67,\n" +
+                "          \"maxDewpointC\": 15,\n" +
+                "          \"maxDewpointF\": 60,\n" +
+                "          \"minDewpointC\": 10,\n" +
+                "          \"minDewpointF\": 50,\n" +
+                "          \"avgDewpointC\": 12,\n" +
+                "          \"avgDewpointF\": 54,\n" +
+                "          \"dewpointC\": 15,\n" +
+                "          \"dewpointF\": 60,\n" +
+                "          \"maxHumidity\": 77,\n" +
+                "          \"minHumidity\": 30,\n" +
+                "          \"humidity\": 77,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1014,\n" +
+                "          \"pressureIN\": 29.95,\n" +
+                "          \"windDir\": \"NW\",\n" +
+                "          \"windDirDEG\": 325,\n" +
+                "          \"windSpeedKTS\": 1,\n" +
+                "          \"windSpeedKPH\": 2,\n" +
+                "          \"windSpeedMPH\": 1,\n" +
+                "          \"windGustKTS\": 16,\n" +
+                "          \"windGustKPH\": 29,\n" +
+                "          \"windGustMPH\": 18,\n" +
+                "          \"windDirMax\": \"WNW\",\n" +
+                "          \"windDirMaxDEG\": 298,\n" +
+                "          \"windSpeedMaxKTS\": 7,\n" +
+                "          \"windSpeedMaxKPH\": 13,\n" +
+                "          \"windSpeedMaxMPH\": 8,\n" +
+                "          \"windDirMin\": \"NW\",\n" +
+                "          \"windDirMinDEG\": 325,\n" +
+                "          \"windSpeedMinKTS\": 1,\n" +
+                "          \"windSpeedMinKPH\": 2,\n" +
+                "          \"windSpeedMinMPH\": 1,\n" +
+                "          \"windDir80m\": \"NNW\",\n" +
+                "          \"windDir80mDEG\": 347,\n" +
+                "          \"windSpeed80mKTS\": 6,\n" +
+                "          \"windSpeed80mKPH\": 10,\n" +
+                "          \"windSpeed80mMPH\": 6,\n" +
+                "          \"windGust80mKTS\": 20,\n" +
+                "          \"windGust80mKPH\": 37,\n" +
+                "          \"windGust80mMPH\": 23,\n" +
+                "          \"windDirMax80m\": \"NW\",\n" +
+                "          \"windDirMax80mDEG\": 316,\n" +
+                "          \"windSpeedMax80mKTS\": 20,\n" +
+                "          \"windSpeedMax80mKPH\": 37,\n" +
+                "          \"windSpeedMax80mMPH\": 23,\n" +
+                "          \"windDirMin80m\": \"NNW\",\n" +
+                "          \"windDirMin80mDEG\": 347,\n" +
+                "          \"windSpeedMin80mKTS\": 6,\n" +
+                "          \"windSpeedMin80mKPH\": 10,\n" +
+                "          \"windSpeedMin80mMPH\": 6,\n" +
+                "          \"sky\": 30,\n" +
+                "          \"cloudsCoded\": \"FW\",\n" +
+                "          \"weather\": \"Mostly Sunny\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
+                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
+                "          \"icon\": \"fair.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": 6,\n" +
+                "          \"solradWM2\": 5486,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 742,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665114710,\n" +
+                "          \"sunset\": 1665156831,\n" +
+                "          \"sunriseISO\": \"2022-10-07T05:51:50+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-07T17:33:51+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665205200,\n" +
+                "          \"validTime\": \"2022-10-08T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-08T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 30,\n" +
+                "          \"maxTempF\": 87,\n" +
+                "          \"minTempC\": 19,\n" +
+                "          \"minTempF\": 66,\n" +
+                "          \"avgTempC\": 25,\n" +
+                "          \"avgTempF\": 76,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 30,\n" +
+                "          \"maxFeelslikeF\": 86,\n" +
+                "          \"minFeelslikeC\": 19,\n" +
+                "          \"minFeelslikeF\": 67,\n" +
+                "          \"avgFeelslikeC\": 25,\n" +
+                "          \"avgFeelslikeF\": 76,\n" +
+                "          \"feelslikeC\": 19,\n" +
+                "          \"feelslikeF\": 67,\n" +
+                "          \"maxDewpointC\": 15,\n" +
+                "          \"maxDewpointF\": 59,\n" +
+                "          \"minDewpointC\": 11,\n" +
+                "          \"minDewpointF\": 52,\n" +
+                "          \"avgDewpointC\": 13,\n" +
+                "          \"avgDewpointF\": 56,\n" +
+                "          \"dewpointC\": 15,\n" +
+                "          \"dewpointF\": 59,\n" +
+                "          \"maxHumidity\": 76,\n" +
+                "          \"minHumidity\": 32,\n" +
+                "          \"humidity\": 76,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1014,\n" +
+                "          \"pressureIN\": 29.94,\n" +
+                "          \"windDir\": \"NNE\",\n" +
+                "          \"windDirDEG\": 21,\n" +
+                "          \"windSpeedKTS\": 1,\n" +
+                "          \"windSpeedKPH\": 2,\n" +
+                "          \"windSpeedMPH\": 1,\n" +
+                "          \"windGustKTS\": 17,\n" +
+                "          \"windGustKPH\": 32,\n" +
+                "          \"windGustMPH\": 20,\n" +
+                "          \"windDirMax\": \"WNW\",\n" +
+                "          \"windDirMaxDEG\": 301,\n" +
+                "          \"windSpeedMaxKTS\": 7,\n" +
+                "          \"windSpeedMaxKPH\": 13,\n" +
+                "          \"windSpeedMaxMPH\": 8,\n" +
+                "          \"windDirMin\": \"NNE\",\n" +
+                "          \"windDirMinDEG\": 21,\n" +
+                "          \"windSpeedMinKTS\": 1,\n" +
+                "          \"windSpeedMinKPH\": 2,\n" +
+                "          \"windSpeedMinMPH\": 1,\n" +
+                "          \"windDir80m\": \"NW\",\n" +
+                "          \"windDir80mDEG\": 309,\n" +
+                "          \"windSpeed80mKTS\": 5,\n" +
+                "          \"windSpeed80mKPH\": 9,\n" +
+                "          \"windSpeed80mMPH\": 5,\n" +
+                "          \"windGust80mKTS\": 17,\n" +
+                "          \"windGust80mKPH\": 31,\n" +
+                "          \"windGust80mMPH\": 19,\n" +
+                "          \"windDirMax80m\": \"NW\",\n" +
+                "          \"windDirMax80mDEG\": 322,\n" +
+                "          \"windSpeedMax80mKTS\": 17,\n" +
+                "          \"windSpeedMax80mKPH\": 31,\n" +
+                "          \"windSpeedMax80mMPH\": 19,\n" +
+                "          \"windDirMin80m\": \"NW\",\n" +
+                "          \"windDirMin80mDEG\": 309,\n" +
+                "          \"windSpeedMin80mKTS\": 5,\n" +
+                "          \"windSpeedMin80mKPH\": 9,\n" +
+                "          \"windSpeedMin80mMPH\": 5,\n" +
+                "          \"sky\": 47,\n" +
+                "          \"cloudsCoded\": \"SC\",\n" +
+                "          \"weather\": \"Partly Cloudy\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
+                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
+                "          \"icon\": \"pcloudy.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": 7,\n" +
+                "          \"solradWM2\": 4785,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 682,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665201146,\n" +
+                "          \"sunset\": 1665243161,\n" +
+                "          \"sunriseISO\": \"2022-10-08T05:52:26+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-08T17:32:41+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665291600,\n" +
+                "          \"validTime\": \"2022-10-09T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-09T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 31,\n" +
+                "          \"maxTempF\": 87,\n" +
+                "          \"minTempC\": 19,\n" +
+                "          \"minTempF\": 67,\n" +
+                "          \"avgTempC\": 25,\n" +
+                "          \"avgTempF\": 77,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 30,\n" +
+                "          \"maxFeelslikeF\": 86,\n" +
+                "          \"minFeelslikeC\": 20,\n" +
+                "          \"minFeelslikeF\": 67,\n" +
+                "          \"avgFeelslikeC\": 25,\n" +
+                "          \"avgFeelslikeF\": 77,\n" +
+                "          \"feelslikeC\": 20,\n" +
+                "          \"feelslikeF\": 67,\n" +
+                "          \"maxDewpointC\": 17,\n" +
+                "          \"maxDewpointF\": 63,\n" +
+                "          \"minDewpointC\": 11,\n" +
+                "          \"minDewpointF\": 52,\n" +
+                "          \"avgDewpointC\": 14,\n" +
+                "          \"avgDewpointF\": 57,\n" +
+                "          \"dewpointC\": 17,\n" +
+                "          \"dewpointF\": 63,\n" +
+                "          \"maxHumidity\": 86,\n" +
+                "          \"minHumidity\": 31,\n" +
+                "          \"humidity\": 86,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1016,\n" +
+                "          \"pressureIN\": 29.99,\n" +
+                "          \"windDir\": \"N\",\n" +
+                "          \"windDirDEG\": 356,\n" +
+                "          \"windSpeedKTS\": 2,\n" +
+                "          \"windSpeedKPH\": 4,\n" +
+                "          \"windSpeedMPH\": 2,\n" +
+                "          \"windGustKTS\": 19,\n" +
+                "          \"windGustKPH\": 36,\n" +
+                "          \"windGustMPH\": 22,\n" +
+                "          \"windDirMax\": \"NNW\",\n" +
+                "          \"windDirMaxDEG\": 343,\n" +
+                "          \"windSpeedMaxKTS\": 8,\n" +
+                "          \"windSpeedMaxKPH\": 14,\n" +
+                "          \"windSpeedMaxMPH\": 9,\n" +
+                "          \"windDirMin\": \"N\",\n" +
+                "          \"windDirMinDEG\": 356,\n" +
+                "          \"windSpeedMinKTS\": 2,\n" +
+                "          \"windSpeedMinKPH\": 4,\n" +
+                "          \"windSpeedMinMPH\": 2,\n" +
+                "          \"windDir80m\": \"NW\",\n" +
+                "          \"windDir80mDEG\": 316,\n" +
+                "          \"windSpeed80mKTS\": 5,\n" +
+                "          \"windSpeed80mKPH\": 9,\n" +
+                "          \"windSpeed80mMPH\": 6,\n" +
+                "          \"windGust80mKTS\": 20,\n" +
+                "          \"windGust80mKPH\": 36,\n" +
+                "          \"windGust80mMPH\": 23,\n" +
+                "          \"windDirMax80m\": \"N\",\n" +
+                "          \"windDirMax80mDEG\": 354,\n" +
+                "          \"windSpeedMax80mKTS\": 20,\n" +
+                "          \"windSpeedMax80mKPH\": 36,\n" +
+                "          \"windSpeedMax80mMPH\": 23,\n" +
+                "          \"windDirMin80m\": \"NW\",\n" +
+                "          \"windDirMin80mDEG\": 316,\n" +
+                "          \"windSpeedMin80mKTS\": 5,\n" +
+                "          \"windSpeedMin80mKPH\": 9,\n" +
+                "          \"windSpeedMin80mMPH\": 6,\n" +
+                "          \"sky\": 47,\n" +
+                "          \"cloudsCoded\": \"SC\",\n" +
+                "          \"weather\": \"Partly Cloudy\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
+                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
+                "          \"icon\": \"pcloudy.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": 7,\n" +
+                "          \"solradWM2\": 4768,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 726,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665287583,\n" +
+                "          \"sunset\": 1665329491,\n" +
+                "          \"sunriseISO\": \"2022-10-09T05:53:03+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-09T17:31:31+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665378000,\n" +
+                "          \"validTime\": \"2022-10-10T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-10T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 31,\n" +
+                "          \"maxTempF\": 87,\n" +
+                "          \"minTempC\": 21,\n" +
+                "          \"minTempF\": 70,\n" +
+                "          \"avgTempC\": 26,\n" +
+                "          \"avgTempF\": 78,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 30,\n" +
+                "          \"maxFeelslikeF\": 86,\n" +
+                "          \"minFeelslikeC\": 21,\n" +
+                "          \"minFeelslikeF\": 69,\n" +
+                "          \"avgFeelslikeC\": 25,\n" +
+                "          \"avgFeelslikeF\": 78,\n" +
+                "          \"feelslikeC\": 21,\n" +
+                "          \"feelslikeF\": 69,\n" +
+                "          \"maxDewpointC\": 16,\n" +
+                "          \"maxDewpointF\": 61,\n" +
+                "          \"minDewpointC\": 13,\n" +
+                "          \"minDewpointF\": 55,\n" +
+                "          \"avgDewpointC\": 14,\n" +
+                "          \"avgDewpointF\": 58,\n" +
+                "          \"dewpointC\": 16,\n" +
+                "          \"dewpointF\": 61,\n" +
+                "          \"maxHumidity\": 75,\n" +
+                "          \"minHumidity\": 35,\n" +
+                "          \"humidity\": 75,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1017,\n" +
+                "          \"pressureIN\": 30.03,\n" +
+                "          \"windDir\": \"N\",\n" +
+                "          \"windDirDEG\": 358,\n" +
+                "          \"windSpeedKTS\": 2,\n" +
+                "          \"windSpeedKPH\": 4,\n" +
+                "          \"windSpeedMPH\": 2,\n" +
+                "          \"windGustKTS\": 16,\n" +
+                "          \"windGustKPH\": 30,\n" +
+                "          \"windGustMPH\": 19,\n" +
+                "          \"windDirMax\": \"N\",\n" +
+                "          \"windDirMaxDEG\": 10,\n" +
+                "          \"windSpeedMaxKTS\": 8,\n" +
+                "          \"windSpeedMaxKPH\": 15,\n" +
+                "          \"windSpeedMaxMPH\": 9,\n" +
+                "          \"windDirMin\": \"N\",\n" +
+                "          \"windDirMinDEG\": 358,\n" +
+                "          \"windSpeedMinKTS\": 2,\n" +
+                "          \"windSpeedMinKPH\": 4,\n" +
+                "          \"windSpeedMinMPH\": 2,\n" +
+                "          \"windDir80m\": \"N\",\n" +
+                "          \"windDir80mDEG\": 8,\n" +
+                "          \"windSpeed80mKTS\": 7,\n" +
+                "          \"windSpeed80mKPH\": 13,\n" +
+                "          \"windSpeed80mMPH\": 8,\n" +
+                "          \"windGust80mKTS\": 19,\n" +
+                "          \"windGust80mKPH\": 36,\n" +
+                "          \"windGust80mMPH\": 22,\n" +
+                "          \"windDirMax80m\": \"N\",\n" +
+                "          \"windDirMax80mDEG\": 10,\n" +
+                "          \"windSpeedMax80mKTS\": 19,\n" +
+                "          \"windSpeedMax80mKPH\": 36,\n" +
+                "          \"windSpeedMax80mMPH\": 22,\n" +
+                "          \"windDirMin80m\": \"E\",\n" +
+                "          \"windDirMin80mDEG\": 91,\n" +
+                "          \"windSpeedMin80mKTS\": 7,\n" +
+                "          \"windSpeedMin80mKPH\": 13,\n" +
+                "          \"windSpeedMin80mMPH\": 8,\n" +
+                "          \"sky\": 64,\n" +
+                "          \"cloudsCoded\": \"SC\",\n" +
+                "          \"weather\": \"Partly Cloudy\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
+                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
+                "          \"icon\": \"pcloudy.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": 6,\n" +
+                "          \"solradWM2\": 4494,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 597,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665374020,\n" +
+                "          \"sunset\": 1665415821,\n" +
+                "          \"sunriseISO\": \"2022-10-10T05:53:40+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-10T17:30:21+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665464400,\n" +
+                "          \"validTime\": \"2022-10-11T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-11T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 31,\n" +
+                "          \"maxTempF\": 87,\n" +
+                "          \"minTempC\": 21,\n" +
+                "          \"minTempF\": 70,\n" +
+                "          \"avgTempC\": 26,\n" +
+                "          \"avgTempF\": 78,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 31,\n" +
+                "          \"maxFeelslikeF\": 87,\n" +
+                "          \"minFeelslikeC\": 22,\n" +
+                "          \"minFeelslikeF\": 72,\n" +
+                "          \"avgFeelslikeC\": 26,\n" +
+                "          \"avgFeelslikeF\": 79,\n" +
+                "          \"feelslikeC\": 22,\n" +
+                "          \"feelslikeF\": 72,\n" +
+                "          \"maxDewpointC\": 17,\n" +
+                "          \"maxDewpointF\": 62,\n" +
+                "          \"minDewpointC\": 11,\n" +
+                "          \"minDewpointF\": 51,\n" +
+                "          \"avgDewpointC\": 13,\n" +
+                "          \"avgDewpointF\": 55,\n" +
+                "          \"dewpointC\": 17,\n" +
+                "          \"dewpointF\": 62,\n" +
+                "          \"maxHumidity\": 71,\n" +
+                "          \"minHumidity\": 30,\n" +
+                "          \"humidity\": 71,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1015,\n" +
+                "          \"pressureIN\": 29.98,\n" +
+                "          \"windDir\": \"NNE\",\n" +
+                "          \"windDirDEG\": 13,\n" +
+                "          \"windSpeedKTS\": 8,\n" +
+                "          \"windSpeedKPH\": 15,\n" +
+                "          \"windSpeedMPH\": 9,\n" +
+                "          \"windGustKTS\": 15,\n" +
+                "          \"windGustKPH\": 28,\n" +
+                "          \"windGustMPH\": 17,\n" +
+                "          \"windDirMax\": \"NNE\",\n" +
+                "          \"windDirMaxDEG\": 28,\n" +
+                "          \"windSpeedMaxKTS\": 15,\n" +
+                "          \"windSpeedMaxKPH\": 28,\n" +
+                "          \"windSpeedMaxMPH\": 18,\n" +
+                "          \"windDirMin\": \"NNE\",\n" +
+                "          \"windDirMinDEG\": 14,\n" +
+                "          \"windSpeedMinKTS\": 7,\n" +
+                "          \"windSpeedMinKPH\": 14,\n" +
+                "          \"windSpeedMinMPH\": 8,\n" +
+                "          \"windDir80m\": \"NNE\",\n" +
+                "          \"windDir80mDEG\": 16,\n" +
+                "          \"windSpeed80mKTS\": 10,\n" +
+                "          \"windSpeed80mKPH\": 19,\n" +
+                "          \"windSpeed80mMPH\": 12,\n" +
+                "          \"windGust80mKTS\": 17,\n" +
+                "          \"windGust80mKPH\": 31,\n" +
+                "          \"windGust80mMPH\": 19,\n" +
+                "          \"windDirMax80m\": \"NNE\",\n" +
+                "          \"windDirMax80mDEG\": 28,\n" +
+                "          \"windSpeedMax80mKTS\": 17,\n" +
+                "          \"windSpeedMax80mKPH\": 31,\n" +
+                "          \"windSpeedMax80mMPH\": 19,\n" +
+                "          \"windDirMin80m\": \"NNE\",\n" +
+                "          \"windDirMin80mDEG\": 13,\n" +
+                "          \"windSpeedMin80mKTS\": 9,\n" +
+                "          \"windSpeedMin80mKPH\": 18,\n" +
+                "          \"windSpeedMin80mMPH\": 11,\n" +
+                "          \"sky\": 0,\n" +
+                "          \"cloudsCoded\": \"CL\",\n" +
+                "          \"weather\": \"Sunny\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Sunny\",\n" +
+                "          \"weatherPrimaryCoded\": \"::CL\",\n" +
+                "          \"icon\": \"sunny.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": null,\n" +
+                "          \"solradWM2\": 5450,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 758,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665460458,\n" +
+                "          \"sunset\": 1665502153,\n" +
+                "          \"sunriseISO\": \"2022-10-11T05:54:18+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-11T17:29:13+02:00\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "          \"timestamp\": 1665550800,\n" +
+                "          \"validTime\": \"2022-10-12T07:00:00+02:00\",\n" +
+                "          \"dateTimeISO\": \"2022-10-12T07:00:00+02:00\",\n" +
+                "          \"maxTempC\": 31,\n" +
+                "          \"maxTempF\": 88,\n" +
+                "          \"minTempC\": 21,\n" +
+                "          \"minTempF\": 69,\n" +
+                "          \"avgTempC\": 26,\n" +
+                "          \"avgTempF\": 79,\n" +
+                "          \"tempC\": null,\n" +
+                "          \"tempF\": null,\n" +
+                "          \"maxFeelslikeC\": 31,\n" +
+                "          \"maxFeelslikeF\": 88,\n" +
+                "          \"minFeelslikeC\": 22,\n" +
+                "          \"minFeelslikeF\": 72,\n" +
+                "          \"avgFeelslikeC\": 26,\n" +
+                "          \"avgFeelslikeF\": 80,\n" +
+                "          \"feelslikeC\": 22,\n" +
+                "          \"feelslikeF\": 72,\n" +
+                "          \"maxDewpointC\": 16,\n" +
+                "          \"maxDewpointF\": 60,\n" +
+                "          \"minDewpointC\": 11,\n" +
+                "          \"minDewpointF\": 51,\n" +
+                "          \"avgDewpointC\": 13,\n" +
+                "          \"avgDewpointF\": 55,\n" +
+                "          \"dewpointC\": 16,\n" +
+                "          \"dewpointF\": 60,\n" +
+                "          \"maxHumidity\": 68,\n" +
+                "          \"minHumidity\": 29,\n" +
+                "          \"humidity\": 68,\n" +
+                "          \"pop\": 0,\n" +
+                "          \"precipMM\": 0,\n" +
+                "          \"precipIN\": 0,\n" +
+                "          \"iceaccum\": null,\n" +
+                "          \"iceaccumMM\": null,\n" +
+                "          \"iceaccumIN\": null,\n" +
+                "          \"snowCM\": 0,\n" +
+                "          \"snowIN\": 0,\n" +
+                "          \"pressureMB\": 1014,\n" +
+                "          \"pressureIN\": 29.95,\n" +
+                "          \"windDir\": \"NNE\",\n" +
+                "          \"windDirDEG\": 12,\n" +
+                "          \"windSpeedKTS\": 8,\n" +
+                "          \"windSpeedKPH\": 15,\n" +
+                "          \"windSpeedMPH\": 9,\n" +
+                "          \"windGustKTS\": 15,\n" +
+                "          \"windGustKPH\": 28,\n" +
+                "          \"windGustMPH\": 17,\n" +
+                "          \"windDirMax\": \"E\",\n" +
+                "          \"windDirMaxDEG\": 96,\n" +
+                "          \"windSpeedMaxKTS\": 14,\n" +
+                "          \"windSpeedMaxKPH\": 26,\n" +
+                "          \"windSpeedMaxMPH\": 16,\n" +
+                "          \"windDirMin\": \"NNE\",\n" +
+                "          \"windDirMinDEG\": 12,\n" +
+                "          \"windSpeedMinKTS\": 7,\n" +
+                "          \"windSpeedMinKPH\": 13,\n" +
+                "          \"windSpeedMinMPH\": 8,\n" +
+                "          \"windDir80m\": \"NNE\",\n" +
+                "          \"windDir80mDEG\": 15,\n" +
+                "          \"windSpeed80mKTS\": 10,\n" +
+                "          \"windSpeed80mKPH\": 19,\n" +
+                "          \"windSpeed80mMPH\": 12,\n" +
+                "          \"windGust80mKTS\": 18,\n" +
+                "          \"windGust80mKPH\": 33,\n" +
+                "          \"windGust80mMPH\": 21,\n" +
+                "          \"windDirMax80m\": \"E\",\n" +
+                "          \"windDirMax80mDEG\": 96,\n" +
+                "          \"windSpeedMax80mKTS\": 18,\n" +
+                "          \"windSpeedMax80mKPH\": 33,\n" +
+                "          \"windSpeedMax80mMPH\": 21,\n" +
+                "          \"windDirMin80m\": \"NNE\",\n" +
+                "          \"windDirMin80mDEG\": 15,\n" +
+                "          \"windSpeedMin80mKTS\": 10,\n" +
+                "          \"windSpeedMin80mKPH\": 18,\n" +
+                "          \"windSpeedMin80mMPH\": 11,\n" +
+                "          \"sky\": 27,\n" +
+                "          \"cloudsCoded\": \"FW\",\n" +
+                "          \"weather\": \"Mostly Sunny\",\n" +
+                "          \"weatherCoded\": [],\n" +
+                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
+                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
+                "          \"icon\": \"fair.png\",\n" +
+                "          \"visibilityKM\": 24.135,\n" +
+                "          \"visibilityMI\": 15,\n" +
+                "          \"uvi\": null,\n" +
+                "          \"solradWM2\": 4740,\n" +
+                "          \"solradMinWM2\": 0,\n" +
+                "          \"solradMaxWM2\": 743,\n" +
+                "          \"isDay\": true,\n" +
+                "          \"maxCoverage\": \"\",\n" +
+                "          \"sunrise\": 1665546895,\n" +
+                "          \"sunset\": 1665588484,\n" +
+                "          \"sunriseISO\": \"2022-10-12T05:54:55+02:00\",\n" +
+                "          \"sunsetISO\": \"2022-10-12T17:28:04+02:00\"\n" +
+                "        }\n" +
+                "      ],\n" +
+                "      \"profile\": {\n" +
+                "        \"tz\": \"Africa/Cairo\",\n" +
+                "        \"elevM\": 23,\n" +
+                "        \"elevFT\": 75\n" +
+                "      }\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}";
+        JSONObject jsonObject = new JSONObject(str);
+        String actual = XML.toString(jsonObject, null, XMLParserConfiguration.KEEP_STRINGS,2);
+        String expected = "<success>true</success>\n" +
+                "<response>\n" +
+                "  <loc>\n" +
+                "    <long>31.25</long>\n" +
+                "    <lat>30.063</lat>\n" +
+                "  </loc>\n" +
+                "  <profile>\n" +
+                "    <elevM>23</elevM>\n" +
+                "    <tz>Africa/Cairo</tz>\n" +
+                "    <elevFT>75</elevFT>\n" +
+                "  </profile>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-06T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>E</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>95</windDirMin80mDEG>\n" +
+                "    <feelslikeC>21</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>10</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>353</windDirDEG>\n" +
+                "    <windDir>N</windDir>\n" +
+                "    <sunriseISO>2022-10-06T05:51:14+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>9</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>66</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Mostly Sunny</weather>\n" +
+                "    <sunsetISO>2022-10-06T17:35:02+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>32</maxFeelslikeC>\n" +
+                "    <humidity>77</humidity>\n" +
+                "    <windDir80m>N</windDir80m>\n" +
+                "    <maxFeelslikeF>89</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>22</sky>\n" +
+                "    <windGust80mMPH>25</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>25</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
+                "    <windGust80mKPH>41</windGust80mKPH>\n" +
+                "    <avgDewpointF>58</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>41</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>22</windGust80mKTS>\n" +
+                "    <avgDewpointC>14</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>22</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>353</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>16</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>8</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>70</feelslikeF>\n" +
+                "    <validTime>2022-10-06T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>10</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>778</solradMaxWM2>\n" +
+                "    <avgTempC>25</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>15</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665028274</sunrise>\n" +
+                "    <avgTempF>78</avgTempF>\n" +
+                "    <windDirMin>N</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>fair.png</icon>\n" +
+                "    <minFeelslikeC>21</minFeelslikeC>\n" +
+                "    <dewpointC>17</dewpointC>\n" +
+                "    <cloudsCoded>FW</cloudsCoded>\n" +
+                "    <minFeelslikeF>70</minFeelslikeF>\n" +
+                "    <minHumidity>29</minHumidity>\n" +
+                "    <dewpointF>63</dewpointF>\n" +
+                "    <windSpeed80mKTS>12</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>NNW</windDirMax>\n" +
+                "    <windSpeed80mMPH>13</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>22</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>11</windDir80mDEG>\n" +
+                "    <maxTempC>32</maxTempC>\n" +
+                "    <pressureMB>1015</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665032400</timestamp>\n" +
+                "    <maxTempF>90</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>11</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>343</windDirMax80mDEG>\n" +
+                "    <windGustKTS>21</windGustKTS>\n" +
+                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>63</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
+                "    <uvi>6</uvi>\n" +
+                "    <windDirMax80m>NNW</windDirMax80m>\n" +
+                "    <maxDewpointC>17</maxDewpointC>\n" +
+                "    <pressureIN>29.97</pressureIN>\n" +
+                "    <avgFeelslikeF>80</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>19</minTempC>\n" +
+                "    <minDewpointF>52</minDewpointF>\n" +
+                "    <windSpeedKTS>5</windSpeedKTS>\n" +
+                "    <sunset>1665070502</sunset>\n" +
+                "    <solradWM2>5608</solradWM2>\n" +
+                "    <windSpeedKPH>9</windSpeedKPH>\n" +
+                "    <windGustMPH>25</windGustMPH>\n" +
+                "    <maxHumidity>77</maxHumidity>\n" +
+                "    <windSpeedMPH>6</windSpeedMPH>\n" +
+                "    <windGustKPH>40</windGustKPH>\n" +
+                "    <windDirMaxDEG>342</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-07T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>NNW</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>347</windDirMin80mDEG>\n" +
+                "    <feelslikeC>19</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>8</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>325</windDirDEG>\n" +
+                "    <windDir>NW</windDir>\n" +
+                "    <sunriseISO>2022-10-07T05:51:50+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>7</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>66</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Mostly Sunny</weather>\n" +
+                "    <sunsetISO>2022-10-07T17:33:51+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>29</maxFeelslikeC>\n" +
+                "    <humidity>77</humidity>\n" +
+                "    <windDir80m>NNW</windDir80m>\n" +
+                "    <maxFeelslikeF>85</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>30</sky>\n" +
+                "    <windGust80mMPH>23</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
+                "    <windGust80mKPH>37</windGust80mKPH>\n" +
+                "    <avgDewpointF>54</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>37</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>20</windGust80mKTS>\n" +
+                "    <avgDewpointC>12</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>325</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>13</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>6</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>67</feelslikeF>\n" +
+                "    <validTime>2022-10-07T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>742</solradMaxWM2>\n" +
+                "    <avgTempC>24</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>10</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665114710</sunrise>\n" +
+                "    <avgTempF>76</avgTempF>\n" +
+                "    <windDirMin>NW</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>fair.png</icon>\n" +
+                "    <minFeelslikeC>19</minFeelslikeC>\n" +
+                "    <dewpointC>15</dewpointC>\n" +
+                "    <cloudsCoded>FW</cloudsCoded>\n" +
+                "    <minFeelslikeF>67</minFeelslikeF>\n" +
+                "    <minHumidity>30</minHumidity>\n" +
+                "    <dewpointF>60</dewpointF>\n" +
+                "    <windSpeed80mKTS>6</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>WNW</windDirMax>\n" +
+                "    <windSpeed80mMPH>6</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>10</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>347</windDir80mDEG>\n" +
+                "    <maxTempC>30</maxTempC>\n" +
+                "    <pressureMB>1014</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665118800</timestamp>\n" +
+                "    <maxTempF>86</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>10</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>316</windDirMax80mDEG>\n" +
+                "    <windGustKTS>16</windGustKTS>\n" +
+                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>60</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>24</avgFeelslikeC>\n" +
+                "    <uvi>6</uvi>\n" +
+                "    <windDirMax80m>NW</windDirMax80m>\n" +
+                "    <maxDewpointC>15</maxDewpointC>\n" +
+                "    <pressureIN>29.95</pressureIN>\n" +
+                "    <avgFeelslikeF>76</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>19</minTempC>\n" +
+                "    <minDewpointF>50</minDewpointF>\n" +
+                "    <windSpeedKTS>1</windSpeedKTS>\n" +
+                "    <sunset>1665156831</sunset>\n" +
+                "    <solradWM2>5486</solradWM2>\n" +
+                "    <windSpeedKPH>2</windSpeedKPH>\n" +
+                "    <windGustMPH>18</windGustMPH>\n" +
+                "    <maxHumidity>77</maxHumidity>\n" +
+                "    <windSpeedMPH>1</windSpeedMPH>\n" +
+                "    <windGustKPH>29</windGustKPH>\n" +
+                "    <windDirMaxDEG>298</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-08T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>NW</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>309</windDirMin80mDEG>\n" +
+                "    <feelslikeC>19</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>8</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>21</windDirDEG>\n" +
+                "    <windDir>NNE</windDir>\n" +
+                "    <sunriseISO>2022-10-08T05:52:26+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>7</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>66</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Partly Cloudy</weather>\n" +
+                "    <sunsetISO>2022-10-08T17:32:41+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
+                "    <humidity>76</humidity>\n" +
+                "    <windDir80m>NW</windDir80m>\n" +
+                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>47</sky>\n" +
+                "    <windGust80mMPH>19</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
+                "    <windGust80mKPH>31</windGust80mKPH>\n" +
+                "    <avgDewpointF>56</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>17</windGust80mKTS>\n" +
+                "    <avgDewpointC>13</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>21</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>13</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>67</feelslikeF>\n" +
+                "    <validTime>2022-10-08T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>5</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>682</solradMaxWM2>\n" +
+                "    <avgTempC>25</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665201146</sunrise>\n" +
+                "    <avgTempF>76</avgTempF>\n" +
+                "    <windDirMin>NNE</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>pcloudy.png</icon>\n" +
+                "    <minFeelslikeC>19</minFeelslikeC>\n" +
+                "    <dewpointC>15</dewpointC>\n" +
+                "    <cloudsCoded>SC</cloudsCoded>\n" +
+                "    <minFeelslikeF>67</minFeelslikeF>\n" +
+                "    <minHumidity>32</minHumidity>\n" +
+                "    <dewpointF>59</dewpointF>\n" +
+                "    <windSpeed80mKTS>5</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>WNW</windDirMax>\n" +
+                "    <windSpeed80mMPH>5</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>9</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>309</windDir80mDEG>\n" +
+                "    <maxTempC>30</maxTempC>\n" +
+                "    <pressureMB>1014</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665205200</timestamp>\n" +
+                "    <maxTempF>87</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>11</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>322</windDirMax80mDEG>\n" +
+                "    <windGustKTS>17</windGustKTS>\n" +
+                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>59</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
+                "    <uvi>7</uvi>\n" +
+                "    <windDirMax80m>NW</windDirMax80m>\n" +
+                "    <maxDewpointC>15</maxDewpointC>\n" +
+                "    <pressureIN>29.94</pressureIN>\n" +
+                "    <avgFeelslikeF>76</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>19</minTempC>\n" +
+                "    <minDewpointF>52</minDewpointF>\n" +
+                "    <windSpeedKTS>1</windSpeedKTS>\n" +
+                "    <sunset>1665243161</sunset>\n" +
+                "    <solradWM2>4785</solradWM2>\n" +
+                "    <windSpeedKPH>2</windSpeedKPH>\n" +
+                "    <windGustMPH>20</windGustMPH>\n" +
+                "    <maxHumidity>76</maxHumidity>\n" +
+                "    <windSpeedMPH>1</windSpeedMPH>\n" +
+                "    <windGustKPH>32</windGustKPH>\n" +
+                "    <windDirMaxDEG>301</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-09T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>NW</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>316</windDirMin80mDEG>\n" +
+                "    <feelslikeC>20</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>9</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>356</windDirDEG>\n" +
+                "    <windDir>N</windDir>\n" +
+                "    <sunriseISO>2022-10-09T05:53:03+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>8</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>67</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Partly Cloudy</weather>\n" +
+                "    <sunsetISO>2022-10-09T17:31:31+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
+                "    <humidity>86</humidity>\n" +
+                "    <windDir80m>NW</windDir80m>\n" +
+                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>47</sky>\n" +
+                "    <windGust80mMPH>23</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
+                "    <windGust80mKPH>36</windGust80mKPH>\n" +
+                "    <avgDewpointF>57</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>20</windGust80mKTS>\n" +
+                "    <avgDewpointC>14</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>356</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>14</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>67</feelslikeF>\n" +
+                "    <validTime>2022-10-09T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>726</solradMaxWM2>\n" +
+                "    <avgTempC>25</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665287583</sunrise>\n" +
+                "    <avgTempF>77</avgTempF>\n" +
+                "    <windDirMin>N</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>pcloudy.png</icon>\n" +
+                "    <minFeelslikeC>20</minFeelslikeC>\n" +
+                "    <dewpointC>17</dewpointC>\n" +
+                "    <cloudsCoded>SC</cloudsCoded>\n" +
+                "    <minFeelslikeF>67</minFeelslikeF>\n" +
+                "    <minHumidity>31</minHumidity>\n" +
+                "    <dewpointF>63</dewpointF>\n" +
+                "    <windSpeed80mKTS>5</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>NNW</windDirMax>\n" +
+                "    <windSpeed80mMPH>6</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>9</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>316</windDir80mDEG>\n" +
+                "    <maxTempC>31</maxTempC>\n" +
+                "    <pressureMB>1016</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665291600</timestamp>\n" +
+                "    <maxTempF>87</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>11</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>2</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>354</windDirMax80mDEG>\n" +
+                "    <windGustKTS>19</windGustKTS>\n" +
+                "    <windSpeedMinKPH>4</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>63</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>2</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
+                "    <uvi>7</uvi>\n" +
+                "    <windDirMax80m>N</windDirMax80m>\n" +
+                "    <maxDewpointC>17</maxDewpointC>\n" +
+                "    <pressureIN>29.99</pressureIN>\n" +
+                "    <avgFeelslikeF>77</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>19</minTempC>\n" +
+                "    <minDewpointF>52</minDewpointF>\n" +
+                "    <windSpeedKTS>2</windSpeedKTS>\n" +
+                "    <sunset>1665329491</sunset>\n" +
+                "    <solradWM2>4768</solradWM2>\n" +
+                "    <windSpeedKPH>4</windSpeedKPH>\n" +
+                "    <windGustMPH>22</windGustMPH>\n" +
+                "    <maxHumidity>86</maxHumidity>\n" +
+                "    <windSpeedMPH>2</windSpeedMPH>\n" +
+                "    <windGustKPH>36</windGustKPH>\n" +
+                "    <windDirMaxDEG>343</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-10T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>E</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>91</windDirMin80mDEG>\n" +
+                "    <feelslikeC>21</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>9</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>358</windDirDEG>\n" +
+                "    <windDir>N</windDir>\n" +
+                "    <sunriseISO>2022-10-10T05:53:40+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>8</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>70</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Partly Cloudy</weather>\n" +
+                "    <sunsetISO>2022-10-10T17:30:21+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
+                "    <humidity>75</humidity>\n" +
+                "    <windDir80m>N</windDir80m>\n" +
+                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>64</sky>\n" +
+                "    <windGust80mMPH>22</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>22</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
+                "    <windGust80mKPH>36</windGust80mKPH>\n" +
+                "    <avgDewpointF>58</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>19</windGust80mKTS>\n" +
+                "    <avgDewpointC>14</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>19</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>358</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>15</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>7</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>69</feelslikeF>\n" +
+                "    <validTime>2022-10-10T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>8</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>597</solradMaxWM2>\n" +
+                "    <avgTempC>26</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>13</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665374020</sunrise>\n" +
+                "    <avgTempF>78</avgTempF>\n" +
+                "    <windDirMin>N</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>pcloudy.png</icon>\n" +
+                "    <minFeelslikeC>21</minFeelslikeC>\n" +
+                "    <dewpointC>16</dewpointC>\n" +
+                "    <cloudsCoded>SC</cloudsCoded>\n" +
+                "    <minFeelslikeF>69</minFeelslikeF>\n" +
+                "    <minHumidity>35</minHumidity>\n" +
+                "    <dewpointF>61</dewpointF>\n" +
+                "    <windSpeed80mKTS>7</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>N</windDirMax>\n" +
+                "    <windSpeed80mMPH>8</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>13</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>8</windDir80mDEG>\n" +
+                "    <maxTempC>31</maxTempC>\n" +
+                "    <pressureMB>1017</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665378000</timestamp>\n" +
+                "    <maxTempF>87</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>13</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>2</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>10</windDirMax80mDEG>\n" +
+                "    <windGustKTS>16</windGustKTS>\n" +
+                "    <windSpeedMinKPH>4</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>61</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>2</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
+                "    <uvi>6</uvi>\n" +
+                "    <windDirMax80m>N</windDirMax80m>\n" +
+                "    <maxDewpointC>16</maxDewpointC>\n" +
+                "    <pressureIN>30.03</pressureIN>\n" +
+                "    <avgFeelslikeF>78</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>21</minTempC>\n" +
+                "    <minDewpointF>55</minDewpointF>\n" +
+                "    <windSpeedKTS>2</windSpeedKTS>\n" +
+                "    <sunset>1665415821</sunset>\n" +
+                "    <solradWM2>4494</solradWM2>\n" +
+                "    <windSpeedKPH>4</windSpeedKPH>\n" +
+                "    <windGustMPH>19</windGustMPH>\n" +
+                "    <maxHumidity>75</maxHumidity>\n" +
+                "    <windSpeedMPH>2</windSpeedMPH>\n" +
+                "    <windGustKPH>30</windGustKPH>\n" +
+                "    <windDirMaxDEG>10</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-11T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>NNE</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>13</windDirMin80mDEG>\n" +
+                "    <feelslikeC>22</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>18</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>13</windDirDEG>\n" +
+                "    <windDir>NNE</windDir>\n" +
+                "    <sunriseISO>2022-10-11T05:54:18+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>15</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>70</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Sunny</weather>\n" +
+                "    <sunsetISO>2022-10-11T17:29:13+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>31</maxFeelslikeC>\n" +
+                "    <humidity>71</humidity>\n" +
+                "    <windDir80m>NNE</windDir80m>\n" +
+                "    <maxFeelslikeF>87</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>0</sky>\n" +
+                "    <windGust80mMPH>19</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Sunny</weatherPrimary>\n" +
+                "    <windGust80mKPH>31</windGust80mKPH>\n" +
+                "    <avgDewpointF>55</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>17</windGust80mKTS>\n" +
+                "    <avgDewpointC>13</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>14</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>28</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>9</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>72</feelslikeF>\n" +
+                "    <validTime>2022-10-11T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>758</solradMaxWM2>\n" +
+                "    <avgTempC>26</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::CL</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665460458</sunrise>\n" +
+                "    <avgTempF>78</avgTempF>\n" +
+                "    <windDirMin>NNE</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>sunny.png</icon>\n" +
+                "    <minFeelslikeC>22</minFeelslikeC>\n" +
+                "    <dewpointC>17</dewpointC>\n" +
+                "    <cloudsCoded>CL</cloudsCoded>\n" +
+                "    <minFeelslikeF>72</minFeelslikeF>\n" +
+                "    <minHumidity>30</minHumidity>\n" +
+                "    <dewpointF>62</dewpointF>\n" +
+                "    <windSpeed80mKTS>10</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>NNE</windDirMax>\n" +
+                "    <windSpeed80mMPH>12</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>19</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>16</windDir80mDEG>\n" +
+                "    <maxTempC>31</maxTempC>\n" +
+                "    <pressureMB>1015</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665464400</timestamp>\n" +
+                "    <maxTempF>87</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>11</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>7</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>28</windDirMax80mDEG>\n" +
+                "    <windGustKTS>15</windGustKTS>\n" +
+                "    <windSpeedMinKPH>14</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>62</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>8</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
+                "    <uvi>null</uvi>\n" +
+                "    <windDirMax80m>NNE</windDirMax80m>\n" +
+                "    <maxDewpointC>17</maxDewpointC>\n" +
+                "    <pressureIN>29.98</pressureIN>\n" +
+                "    <avgFeelslikeF>79</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>21</minTempC>\n" +
+                "    <minDewpointF>51</minDewpointF>\n" +
+                "    <windSpeedKTS>8</windSpeedKTS>\n" +
+                "    <sunset>1665502153</sunset>\n" +
+                "    <solradWM2>5450</solradWM2>\n" +
+                "    <windSpeedKPH>15</windSpeedKPH>\n" +
+                "    <windGustMPH>17</windGustMPH>\n" +
+                "    <maxHumidity>71</maxHumidity>\n" +
+                "    <windSpeedMPH>9</windSpeedMPH>\n" +
+                "    <windGustKPH>28</windGustKPH>\n" +
+                "    <windDirMaxDEG>28</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <periods>\n" +
+                "    <dateTimeISO>2022-10-12T07:00:00+02:00</dateTimeISO>\n" +
+                "    <windDirMin80m>NNE</windDirMin80m>\n" +
+                "    <windDirMin80mDEG>15</windDirMin80mDEG>\n" +
+                "    <feelslikeC>22</feelslikeC>\n" +
+                "    <visibilityMI>15</visibilityMI>\n" +
+                "    <windSpeedMaxMPH>16</windSpeedMaxMPH>\n" +
+                "    <windDirDEG>12</windDirDEG>\n" +
+                "    <windDir>NNE</windDir>\n" +
+                "    <sunriseISO>2022-10-12T05:54:55+02:00</sunriseISO>\n" +
+                "    <iceaccumMM>null</iceaccumMM>\n" +
+                "    <windSpeedMaxKTS>14</windSpeedMaxKTS>\n" +
+                "    <iceaccumIN>null</iceaccumIN>\n" +
+                "    <minTempF>69</minTempF>\n" +
+                "    <snowIN>0</snowIN>\n" +
+                "    <weather>Mostly Sunny</weather>\n" +
+                "    <sunsetISO>2022-10-12T17:28:04+02:00</sunsetISO>\n" +
+                "    <maxFeelslikeC>31</maxFeelslikeC>\n" +
+                "    <humidity>68</humidity>\n" +
+                "    <windDir80m>NNE</windDir80m>\n" +
+                "    <maxFeelslikeF>88</maxFeelslikeF>\n" +
+                "    <precipMM>0</precipMM>\n" +
+                "    <sky>27</sky>\n" +
+                "    <windGust80mMPH>21</windGust80mMPH>\n" +
+                "    <windSpeedMax80mMPH>21</windSpeedMax80mMPH>\n" +
+                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
+                "    <windGust80mKPH>33</windGust80mKPH>\n" +
+                "    <avgDewpointF>55</avgDewpointF>\n" +
+                "    <windSpeedMax80mKPH>33</windSpeedMax80mKPH>\n" +
+                "    <windGust80mKTS>18</windGust80mKTS>\n" +
+                "    <avgDewpointC>13</avgDewpointC>\n" +
+                "    <precipIN>0</precipIN>\n" +
+                "    <windSpeedMax80mKTS>18</windSpeedMax80mKTS>\n" +
+                "    <windDirMinDEG>12</windDirMinDEG>\n" +
+                "    <windSpeedMaxKPH>26</windSpeedMaxKPH>\n" +
+                "    <windSpeedMin80mKTS>10</windSpeedMin80mKTS>\n" +
+                "    <feelslikeF>72</feelslikeF>\n" +
+                "    <validTime>2022-10-12T07:00:00+02:00</validTime>\n" +
+                "    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>\n" +
+                "    <solradMaxWM2>743</solradMaxWM2>\n" +
+                "    <avgTempC>26</avgTempC>\n" +
+                "    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>\n" +
+                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
+                "    <sunrise>1665546895</sunrise>\n" +
+                "    <avgTempF>79</avgTempF>\n" +
+                "    <windDirMin>NNE</windDirMin>\n" +
+                "    <maxCoverage/>\n" +
+                "    <icon>fair.png</icon>\n" +
+                "    <minFeelslikeC>22</minFeelslikeC>\n" +
+                "    <dewpointC>16</dewpointC>\n" +
+                "    <cloudsCoded>FW</cloudsCoded>\n" +
+                "    <minFeelslikeF>72</minFeelslikeF>\n" +
+                "    <minHumidity>29</minHumidity>\n" +
+                "    <dewpointF>60</dewpointF>\n" +
+                "    <windSpeed80mKTS>10</windSpeed80mKTS>\n" +
+                "    <pop>0</pop>\n" +
+                "    <snowCM>0</snowCM>\n" +
+                "    <windDirMax>E</windDirMax>\n" +
+                "    <windSpeed80mMPH>12</windSpeed80mMPH>\n" +
+                "    <windSpeed80mKPH>19</windSpeed80mKPH>\n" +
+                "    <windDir80mDEG>15</windDir80mDEG>\n" +
+                "    <maxTempC>31</maxTempC>\n" +
+                "    <pressureMB>1014</pressureMB>\n" +
+                "    <visibilityKM>24.135</visibilityKM>\n" +
+                "    <timestamp>1665550800</timestamp>\n" +
+                "    <maxTempF>88</maxTempF>\n" +
+                "    <tempF>null</tempF>\n" +
+                "    <minDewpointC>11</minDewpointC>\n" +
+                "    <solradMinWM2>0</solradMinWM2>\n" +
+                "    <windSpeedMinKTS>7</windSpeedMinKTS>\n" +
+                "    <windDirMax80mDEG>96</windDirMax80mDEG>\n" +
+                "    <windGustKTS>15</windGustKTS>\n" +
+                "    <windSpeedMinKPH>13</windSpeedMinKPH>\n" +
+                "    <maxDewpointF>60</maxDewpointF>\n" +
+                "    <windSpeedMinMPH>8</windSpeedMinMPH>\n" +
+                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
+                "    <uvi>null</uvi>\n" +
+                "    <windDirMax80m>E</windDirMax80m>\n" +
+                "    <maxDewpointC>16</maxDewpointC>\n" +
+                "    <pressureIN>29.95</pressureIN>\n" +
+                "    <avgFeelslikeF>80</avgFeelslikeF>\n" +
+                "    <iceaccum>null</iceaccum>\n" +
+                "    <isDay>true</isDay>\n" +
+                "    <minTempC>21</minTempC>\n" +
+                "    <minDewpointF>51</minDewpointF>\n" +
+                "    <windSpeedKTS>8</windSpeedKTS>\n" +
+                "    <sunset>1665588484</sunset>\n" +
+                "    <solradWM2>4740</solradWM2>\n" +
+                "    <windSpeedKPH>15</windSpeedKPH>\n" +
+                "    <windGustMPH>17</windGustMPH>\n" +
+                "    <maxHumidity>68</maxHumidity>\n" +
+                "    <windSpeedMPH>9</windSpeedMPH>\n" +
+                "    <windGustKPH>28</windGustKPH>\n" +
+                "    <windDirMaxDEG>96</windDirMaxDEG>\n" +
+                "    <tempC>null</tempC>\n" +
+                "  </periods>\n" +
+                "  <interval>day</interval>\n" +
+                "  <place>\n" +
+                "    <country>eg</country>\n" +
+                "    <name>cairo</name>\n" +
+                "    <state>qh</state>\n" +
+                "  </place>\n" +
+                "</response>\n" +
+                "<error>null</error>\n";
+        assertEquals(actual, expected);
+    }
 }
 
 

From 4a8ff28fd8af4ad7f68c12b8ed6029cbdd14dfd3 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Fri, 7 Oct 2022 10:35:06 +0100
Subject: [PATCH 081/212] Reduced Test code length by using resources

---
 src/test/java/org/json/junit/XMLTest.java | 1437 +--------------------
 src/test/resources/Issue593.json          |  189 +++
 src/test/resources/Issue593.xml           |  169 +++
 3 files changed, 390 insertions(+), 1405 deletions(-)
 create mode 100644 src/test/resources/Issue593.json
 create mode 100644 src/test/resources/Issue593.xml

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 8d25b7e..4c46cf1 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -18,16 +18,11 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.json.XML;
-import org.json.XMLParserConfiguration;
-import org.json.XMLXsiTypeConverter;
+import org.json.*;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -1222,1404 +1217,36 @@ public class XMLTest {
 
     @Test
     public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
-        String str = "{\n" +
-                "  \"success\": true,\n" +
-                "  \"error\": null,\n" +
-                "  \"response\": [\n" +
-                "    {\n" +
-                "      \"loc\": {\n" +
-                "        \"long\": 31.25,\n" +
-                "        \"lat\": 30.063\n" +
-                "      },\n" +
-                "      \"interval\": \"day\",\n" +
-                "      \"place\": {\n" +
-                "        \"name\": \"cairo\",\n" +
-                "        \"state\": \"qh\",\n" +
-                "        \"country\": \"eg\"\n" +
-                "      },\n" +
-                "      \"periods\": [\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665032400,\n" +
-                "          \"validTime\": \"2022-10-06T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-06T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 32,\n" +
-                "          \"maxTempF\": 90,\n" +
-                "          \"minTempC\": 19,\n" +
-                "          \"minTempF\": 66,\n" +
-                "          \"avgTempC\": 25,\n" +
-                "          \"avgTempF\": 78,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 32,\n" +
-                "          \"maxFeelslikeF\": 89,\n" +
-                "          \"minFeelslikeC\": 21,\n" +
-                "          \"minFeelslikeF\": 70,\n" +
-                "          \"avgFeelslikeC\": 26,\n" +
-                "          \"avgFeelslikeF\": 80,\n" +
-                "          \"feelslikeC\": 21,\n" +
-                "          \"feelslikeF\": 70,\n" +
-                "          \"maxDewpointC\": 17,\n" +
-                "          \"maxDewpointF\": 63,\n" +
-                "          \"minDewpointC\": 11,\n" +
-                "          \"minDewpointF\": 52,\n" +
-                "          \"avgDewpointC\": 14,\n" +
-                "          \"avgDewpointF\": 58,\n" +
-                "          \"dewpointC\": 17,\n" +
-                "          \"dewpointF\": 63,\n" +
-                "          \"maxHumidity\": 77,\n" +
-                "          \"minHumidity\": 29,\n" +
-                "          \"humidity\": 77,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1015,\n" +
-                "          \"pressureIN\": 29.97,\n" +
-                "          \"windDir\": \"N\",\n" +
-                "          \"windDirDEG\": 353,\n" +
-                "          \"windSpeedKTS\": 5,\n" +
-                "          \"windSpeedKPH\": 9,\n" +
-                "          \"windSpeedMPH\": 6,\n" +
-                "          \"windGustKTS\": 21,\n" +
-                "          \"windGustKPH\": 40,\n" +
-                "          \"windGustMPH\": 25,\n" +
-                "          \"windDirMax\": \"NNW\",\n" +
-                "          \"windDirMaxDEG\": 342,\n" +
-                "          \"windSpeedMaxKTS\": 9,\n" +
-                "          \"windSpeedMaxKPH\": 16,\n" +
-                "          \"windSpeedMaxMPH\": 10,\n" +
-                "          \"windDirMin\": \"N\",\n" +
-                "          \"windDirMinDEG\": 353,\n" +
-                "          \"windSpeedMinKTS\": 1,\n" +
-                "          \"windSpeedMinKPH\": 2,\n" +
-                "          \"windSpeedMinMPH\": 1,\n" +
-                "          \"windDir80m\": \"N\",\n" +
-                "          \"windDir80mDEG\": 11,\n" +
-                "          \"windSpeed80mKTS\": 12,\n" +
-                "          \"windSpeed80mKPH\": 22,\n" +
-                "          \"windSpeed80mMPH\": 13,\n" +
-                "          \"windGust80mKTS\": 22,\n" +
-                "          \"windGust80mKPH\": 41,\n" +
-                "          \"windGust80mMPH\": 25,\n" +
-                "          \"windDirMax80m\": \"NNW\",\n" +
-                "          \"windDirMax80mDEG\": 343,\n" +
-                "          \"windSpeedMax80mKTS\": 22,\n" +
-                "          \"windSpeedMax80mKPH\": 41,\n" +
-                "          \"windSpeedMax80mMPH\": 25,\n" +
-                "          \"windDirMin80m\": \"E\",\n" +
-                "          \"windDirMin80mDEG\": 95,\n" +
-                "          \"windSpeedMin80mKTS\": 8,\n" +
-                "          \"windSpeedMin80mKPH\": 15,\n" +
-                "          \"windSpeedMin80mMPH\": 10,\n" +
-                "          \"sky\": 22,\n" +
-                "          \"cloudsCoded\": \"FW\",\n" +
-                "          \"weather\": \"Mostly Sunny\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
-                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
-                "          \"icon\": \"fair.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": 6,\n" +
-                "          \"solradWM2\": 5608,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 778,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665028274,\n" +
-                "          \"sunset\": 1665070502,\n" +
-                "          \"sunriseISO\": \"2022-10-06T05:51:14+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-06T17:35:02+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665118800,\n" +
-                "          \"validTime\": \"2022-10-07T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-07T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 30,\n" +
-                "          \"maxTempF\": 86,\n" +
-                "          \"minTempC\": 19,\n" +
-                "          \"minTempF\": 66,\n" +
-                "          \"avgTempC\": 24,\n" +
-                "          \"avgTempF\": 76,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 29,\n" +
-                "          \"maxFeelslikeF\": 85,\n" +
-                "          \"minFeelslikeC\": 19,\n" +
-                "          \"minFeelslikeF\": 67,\n" +
-                "          \"avgFeelslikeC\": 24,\n" +
-                "          \"avgFeelslikeF\": 76,\n" +
-                "          \"feelslikeC\": 19,\n" +
-                "          \"feelslikeF\": 67,\n" +
-                "          \"maxDewpointC\": 15,\n" +
-                "          \"maxDewpointF\": 60,\n" +
-                "          \"minDewpointC\": 10,\n" +
-                "          \"minDewpointF\": 50,\n" +
-                "          \"avgDewpointC\": 12,\n" +
-                "          \"avgDewpointF\": 54,\n" +
-                "          \"dewpointC\": 15,\n" +
-                "          \"dewpointF\": 60,\n" +
-                "          \"maxHumidity\": 77,\n" +
-                "          \"minHumidity\": 30,\n" +
-                "          \"humidity\": 77,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1014,\n" +
-                "          \"pressureIN\": 29.95,\n" +
-                "          \"windDir\": \"NW\",\n" +
-                "          \"windDirDEG\": 325,\n" +
-                "          \"windSpeedKTS\": 1,\n" +
-                "          \"windSpeedKPH\": 2,\n" +
-                "          \"windSpeedMPH\": 1,\n" +
-                "          \"windGustKTS\": 16,\n" +
-                "          \"windGustKPH\": 29,\n" +
-                "          \"windGustMPH\": 18,\n" +
-                "          \"windDirMax\": \"WNW\",\n" +
-                "          \"windDirMaxDEG\": 298,\n" +
-                "          \"windSpeedMaxKTS\": 7,\n" +
-                "          \"windSpeedMaxKPH\": 13,\n" +
-                "          \"windSpeedMaxMPH\": 8,\n" +
-                "          \"windDirMin\": \"NW\",\n" +
-                "          \"windDirMinDEG\": 325,\n" +
-                "          \"windSpeedMinKTS\": 1,\n" +
-                "          \"windSpeedMinKPH\": 2,\n" +
-                "          \"windSpeedMinMPH\": 1,\n" +
-                "          \"windDir80m\": \"NNW\",\n" +
-                "          \"windDir80mDEG\": 347,\n" +
-                "          \"windSpeed80mKTS\": 6,\n" +
-                "          \"windSpeed80mKPH\": 10,\n" +
-                "          \"windSpeed80mMPH\": 6,\n" +
-                "          \"windGust80mKTS\": 20,\n" +
-                "          \"windGust80mKPH\": 37,\n" +
-                "          \"windGust80mMPH\": 23,\n" +
-                "          \"windDirMax80m\": \"NW\",\n" +
-                "          \"windDirMax80mDEG\": 316,\n" +
-                "          \"windSpeedMax80mKTS\": 20,\n" +
-                "          \"windSpeedMax80mKPH\": 37,\n" +
-                "          \"windSpeedMax80mMPH\": 23,\n" +
-                "          \"windDirMin80m\": \"NNW\",\n" +
-                "          \"windDirMin80mDEG\": 347,\n" +
-                "          \"windSpeedMin80mKTS\": 6,\n" +
-                "          \"windSpeedMin80mKPH\": 10,\n" +
-                "          \"windSpeedMin80mMPH\": 6,\n" +
-                "          \"sky\": 30,\n" +
-                "          \"cloudsCoded\": \"FW\",\n" +
-                "          \"weather\": \"Mostly Sunny\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
-                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
-                "          \"icon\": \"fair.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": 6,\n" +
-                "          \"solradWM2\": 5486,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 742,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665114710,\n" +
-                "          \"sunset\": 1665156831,\n" +
-                "          \"sunriseISO\": \"2022-10-07T05:51:50+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-07T17:33:51+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665205200,\n" +
-                "          \"validTime\": \"2022-10-08T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-08T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 30,\n" +
-                "          \"maxTempF\": 87,\n" +
-                "          \"minTempC\": 19,\n" +
-                "          \"minTempF\": 66,\n" +
-                "          \"avgTempC\": 25,\n" +
-                "          \"avgTempF\": 76,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 30,\n" +
-                "          \"maxFeelslikeF\": 86,\n" +
-                "          \"minFeelslikeC\": 19,\n" +
-                "          \"minFeelslikeF\": 67,\n" +
-                "          \"avgFeelslikeC\": 25,\n" +
-                "          \"avgFeelslikeF\": 76,\n" +
-                "          \"feelslikeC\": 19,\n" +
-                "          \"feelslikeF\": 67,\n" +
-                "          \"maxDewpointC\": 15,\n" +
-                "          \"maxDewpointF\": 59,\n" +
-                "          \"minDewpointC\": 11,\n" +
-                "          \"minDewpointF\": 52,\n" +
-                "          \"avgDewpointC\": 13,\n" +
-                "          \"avgDewpointF\": 56,\n" +
-                "          \"dewpointC\": 15,\n" +
-                "          \"dewpointF\": 59,\n" +
-                "          \"maxHumidity\": 76,\n" +
-                "          \"minHumidity\": 32,\n" +
-                "          \"humidity\": 76,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1014,\n" +
-                "          \"pressureIN\": 29.94,\n" +
-                "          \"windDir\": \"NNE\",\n" +
-                "          \"windDirDEG\": 21,\n" +
-                "          \"windSpeedKTS\": 1,\n" +
-                "          \"windSpeedKPH\": 2,\n" +
-                "          \"windSpeedMPH\": 1,\n" +
-                "          \"windGustKTS\": 17,\n" +
-                "          \"windGustKPH\": 32,\n" +
-                "          \"windGustMPH\": 20,\n" +
-                "          \"windDirMax\": \"WNW\",\n" +
-                "          \"windDirMaxDEG\": 301,\n" +
-                "          \"windSpeedMaxKTS\": 7,\n" +
-                "          \"windSpeedMaxKPH\": 13,\n" +
-                "          \"windSpeedMaxMPH\": 8,\n" +
-                "          \"windDirMin\": \"NNE\",\n" +
-                "          \"windDirMinDEG\": 21,\n" +
-                "          \"windSpeedMinKTS\": 1,\n" +
-                "          \"windSpeedMinKPH\": 2,\n" +
-                "          \"windSpeedMinMPH\": 1,\n" +
-                "          \"windDir80m\": \"NW\",\n" +
-                "          \"windDir80mDEG\": 309,\n" +
-                "          \"windSpeed80mKTS\": 5,\n" +
-                "          \"windSpeed80mKPH\": 9,\n" +
-                "          \"windSpeed80mMPH\": 5,\n" +
-                "          \"windGust80mKTS\": 17,\n" +
-                "          \"windGust80mKPH\": 31,\n" +
-                "          \"windGust80mMPH\": 19,\n" +
-                "          \"windDirMax80m\": \"NW\",\n" +
-                "          \"windDirMax80mDEG\": 322,\n" +
-                "          \"windSpeedMax80mKTS\": 17,\n" +
-                "          \"windSpeedMax80mKPH\": 31,\n" +
-                "          \"windSpeedMax80mMPH\": 19,\n" +
-                "          \"windDirMin80m\": \"NW\",\n" +
-                "          \"windDirMin80mDEG\": 309,\n" +
-                "          \"windSpeedMin80mKTS\": 5,\n" +
-                "          \"windSpeedMin80mKPH\": 9,\n" +
-                "          \"windSpeedMin80mMPH\": 5,\n" +
-                "          \"sky\": 47,\n" +
-                "          \"cloudsCoded\": \"SC\",\n" +
-                "          \"weather\": \"Partly Cloudy\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
-                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
-                "          \"icon\": \"pcloudy.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": 7,\n" +
-                "          \"solradWM2\": 4785,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 682,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665201146,\n" +
-                "          \"sunset\": 1665243161,\n" +
-                "          \"sunriseISO\": \"2022-10-08T05:52:26+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-08T17:32:41+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665291600,\n" +
-                "          \"validTime\": \"2022-10-09T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-09T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 31,\n" +
-                "          \"maxTempF\": 87,\n" +
-                "          \"minTempC\": 19,\n" +
-                "          \"minTempF\": 67,\n" +
-                "          \"avgTempC\": 25,\n" +
-                "          \"avgTempF\": 77,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 30,\n" +
-                "          \"maxFeelslikeF\": 86,\n" +
-                "          \"minFeelslikeC\": 20,\n" +
-                "          \"minFeelslikeF\": 67,\n" +
-                "          \"avgFeelslikeC\": 25,\n" +
-                "          \"avgFeelslikeF\": 77,\n" +
-                "          \"feelslikeC\": 20,\n" +
-                "          \"feelslikeF\": 67,\n" +
-                "          \"maxDewpointC\": 17,\n" +
-                "          \"maxDewpointF\": 63,\n" +
-                "          \"minDewpointC\": 11,\n" +
-                "          \"minDewpointF\": 52,\n" +
-                "          \"avgDewpointC\": 14,\n" +
-                "          \"avgDewpointF\": 57,\n" +
-                "          \"dewpointC\": 17,\n" +
-                "          \"dewpointF\": 63,\n" +
-                "          \"maxHumidity\": 86,\n" +
-                "          \"minHumidity\": 31,\n" +
-                "          \"humidity\": 86,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1016,\n" +
-                "          \"pressureIN\": 29.99,\n" +
-                "          \"windDir\": \"N\",\n" +
-                "          \"windDirDEG\": 356,\n" +
-                "          \"windSpeedKTS\": 2,\n" +
-                "          \"windSpeedKPH\": 4,\n" +
-                "          \"windSpeedMPH\": 2,\n" +
-                "          \"windGustKTS\": 19,\n" +
-                "          \"windGustKPH\": 36,\n" +
-                "          \"windGustMPH\": 22,\n" +
-                "          \"windDirMax\": \"NNW\",\n" +
-                "          \"windDirMaxDEG\": 343,\n" +
-                "          \"windSpeedMaxKTS\": 8,\n" +
-                "          \"windSpeedMaxKPH\": 14,\n" +
-                "          \"windSpeedMaxMPH\": 9,\n" +
-                "          \"windDirMin\": \"N\",\n" +
-                "          \"windDirMinDEG\": 356,\n" +
-                "          \"windSpeedMinKTS\": 2,\n" +
-                "          \"windSpeedMinKPH\": 4,\n" +
-                "          \"windSpeedMinMPH\": 2,\n" +
-                "          \"windDir80m\": \"NW\",\n" +
-                "          \"windDir80mDEG\": 316,\n" +
-                "          \"windSpeed80mKTS\": 5,\n" +
-                "          \"windSpeed80mKPH\": 9,\n" +
-                "          \"windSpeed80mMPH\": 6,\n" +
-                "          \"windGust80mKTS\": 20,\n" +
-                "          \"windGust80mKPH\": 36,\n" +
-                "          \"windGust80mMPH\": 23,\n" +
-                "          \"windDirMax80m\": \"N\",\n" +
-                "          \"windDirMax80mDEG\": 354,\n" +
-                "          \"windSpeedMax80mKTS\": 20,\n" +
-                "          \"windSpeedMax80mKPH\": 36,\n" +
-                "          \"windSpeedMax80mMPH\": 23,\n" +
-                "          \"windDirMin80m\": \"NW\",\n" +
-                "          \"windDirMin80mDEG\": 316,\n" +
-                "          \"windSpeedMin80mKTS\": 5,\n" +
-                "          \"windSpeedMin80mKPH\": 9,\n" +
-                "          \"windSpeedMin80mMPH\": 6,\n" +
-                "          \"sky\": 47,\n" +
-                "          \"cloudsCoded\": \"SC\",\n" +
-                "          \"weather\": \"Partly Cloudy\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
-                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
-                "          \"icon\": \"pcloudy.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": 7,\n" +
-                "          \"solradWM2\": 4768,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 726,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665287583,\n" +
-                "          \"sunset\": 1665329491,\n" +
-                "          \"sunriseISO\": \"2022-10-09T05:53:03+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-09T17:31:31+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665378000,\n" +
-                "          \"validTime\": \"2022-10-10T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-10T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 31,\n" +
-                "          \"maxTempF\": 87,\n" +
-                "          \"minTempC\": 21,\n" +
-                "          \"minTempF\": 70,\n" +
-                "          \"avgTempC\": 26,\n" +
-                "          \"avgTempF\": 78,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 30,\n" +
-                "          \"maxFeelslikeF\": 86,\n" +
-                "          \"minFeelslikeC\": 21,\n" +
-                "          \"minFeelslikeF\": 69,\n" +
-                "          \"avgFeelslikeC\": 25,\n" +
-                "          \"avgFeelslikeF\": 78,\n" +
-                "          \"feelslikeC\": 21,\n" +
-                "          \"feelslikeF\": 69,\n" +
-                "          \"maxDewpointC\": 16,\n" +
-                "          \"maxDewpointF\": 61,\n" +
-                "          \"minDewpointC\": 13,\n" +
-                "          \"minDewpointF\": 55,\n" +
-                "          \"avgDewpointC\": 14,\n" +
-                "          \"avgDewpointF\": 58,\n" +
-                "          \"dewpointC\": 16,\n" +
-                "          \"dewpointF\": 61,\n" +
-                "          \"maxHumidity\": 75,\n" +
-                "          \"minHumidity\": 35,\n" +
-                "          \"humidity\": 75,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1017,\n" +
-                "          \"pressureIN\": 30.03,\n" +
-                "          \"windDir\": \"N\",\n" +
-                "          \"windDirDEG\": 358,\n" +
-                "          \"windSpeedKTS\": 2,\n" +
-                "          \"windSpeedKPH\": 4,\n" +
-                "          \"windSpeedMPH\": 2,\n" +
-                "          \"windGustKTS\": 16,\n" +
-                "          \"windGustKPH\": 30,\n" +
-                "          \"windGustMPH\": 19,\n" +
-                "          \"windDirMax\": \"N\",\n" +
-                "          \"windDirMaxDEG\": 10,\n" +
-                "          \"windSpeedMaxKTS\": 8,\n" +
-                "          \"windSpeedMaxKPH\": 15,\n" +
-                "          \"windSpeedMaxMPH\": 9,\n" +
-                "          \"windDirMin\": \"N\",\n" +
-                "          \"windDirMinDEG\": 358,\n" +
-                "          \"windSpeedMinKTS\": 2,\n" +
-                "          \"windSpeedMinKPH\": 4,\n" +
-                "          \"windSpeedMinMPH\": 2,\n" +
-                "          \"windDir80m\": \"N\",\n" +
-                "          \"windDir80mDEG\": 8,\n" +
-                "          \"windSpeed80mKTS\": 7,\n" +
-                "          \"windSpeed80mKPH\": 13,\n" +
-                "          \"windSpeed80mMPH\": 8,\n" +
-                "          \"windGust80mKTS\": 19,\n" +
-                "          \"windGust80mKPH\": 36,\n" +
-                "          \"windGust80mMPH\": 22,\n" +
-                "          \"windDirMax80m\": \"N\",\n" +
-                "          \"windDirMax80mDEG\": 10,\n" +
-                "          \"windSpeedMax80mKTS\": 19,\n" +
-                "          \"windSpeedMax80mKPH\": 36,\n" +
-                "          \"windSpeedMax80mMPH\": 22,\n" +
-                "          \"windDirMin80m\": \"E\",\n" +
-                "          \"windDirMin80mDEG\": 91,\n" +
-                "          \"windSpeedMin80mKTS\": 7,\n" +
-                "          \"windSpeedMin80mKPH\": 13,\n" +
-                "          \"windSpeedMin80mMPH\": 8,\n" +
-                "          \"sky\": 64,\n" +
-                "          \"cloudsCoded\": \"SC\",\n" +
-                "          \"weather\": \"Partly Cloudy\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Partly Cloudy\",\n" +
-                "          \"weatherPrimaryCoded\": \"::SC\",\n" +
-                "          \"icon\": \"pcloudy.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": 6,\n" +
-                "          \"solradWM2\": 4494,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 597,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665374020,\n" +
-                "          \"sunset\": 1665415821,\n" +
-                "          \"sunriseISO\": \"2022-10-10T05:53:40+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-10T17:30:21+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665464400,\n" +
-                "          \"validTime\": \"2022-10-11T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-11T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 31,\n" +
-                "          \"maxTempF\": 87,\n" +
-                "          \"minTempC\": 21,\n" +
-                "          \"minTempF\": 70,\n" +
-                "          \"avgTempC\": 26,\n" +
-                "          \"avgTempF\": 78,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 31,\n" +
-                "          \"maxFeelslikeF\": 87,\n" +
-                "          \"minFeelslikeC\": 22,\n" +
-                "          \"minFeelslikeF\": 72,\n" +
-                "          \"avgFeelslikeC\": 26,\n" +
-                "          \"avgFeelslikeF\": 79,\n" +
-                "          \"feelslikeC\": 22,\n" +
-                "          \"feelslikeF\": 72,\n" +
-                "          \"maxDewpointC\": 17,\n" +
-                "          \"maxDewpointF\": 62,\n" +
-                "          \"minDewpointC\": 11,\n" +
-                "          \"minDewpointF\": 51,\n" +
-                "          \"avgDewpointC\": 13,\n" +
-                "          \"avgDewpointF\": 55,\n" +
-                "          \"dewpointC\": 17,\n" +
-                "          \"dewpointF\": 62,\n" +
-                "          \"maxHumidity\": 71,\n" +
-                "          \"minHumidity\": 30,\n" +
-                "          \"humidity\": 71,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1015,\n" +
-                "          \"pressureIN\": 29.98,\n" +
-                "          \"windDir\": \"NNE\",\n" +
-                "          \"windDirDEG\": 13,\n" +
-                "          \"windSpeedKTS\": 8,\n" +
-                "          \"windSpeedKPH\": 15,\n" +
-                "          \"windSpeedMPH\": 9,\n" +
-                "          \"windGustKTS\": 15,\n" +
-                "          \"windGustKPH\": 28,\n" +
-                "          \"windGustMPH\": 17,\n" +
-                "          \"windDirMax\": \"NNE\",\n" +
-                "          \"windDirMaxDEG\": 28,\n" +
-                "          \"windSpeedMaxKTS\": 15,\n" +
-                "          \"windSpeedMaxKPH\": 28,\n" +
-                "          \"windSpeedMaxMPH\": 18,\n" +
-                "          \"windDirMin\": \"NNE\",\n" +
-                "          \"windDirMinDEG\": 14,\n" +
-                "          \"windSpeedMinKTS\": 7,\n" +
-                "          \"windSpeedMinKPH\": 14,\n" +
-                "          \"windSpeedMinMPH\": 8,\n" +
-                "          \"windDir80m\": \"NNE\",\n" +
-                "          \"windDir80mDEG\": 16,\n" +
-                "          \"windSpeed80mKTS\": 10,\n" +
-                "          \"windSpeed80mKPH\": 19,\n" +
-                "          \"windSpeed80mMPH\": 12,\n" +
-                "          \"windGust80mKTS\": 17,\n" +
-                "          \"windGust80mKPH\": 31,\n" +
-                "          \"windGust80mMPH\": 19,\n" +
-                "          \"windDirMax80m\": \"NNE\",\n" +
-                "          \"windDirMax80mDEG\": 28,\n" +
-                "          \"windSpeedMax80mKTS\": 17,\n" +
-                "          \"windSpeedMax80mKPH\": 31,\n" +
-                "          \"windSpeedMax80mMPH\": 19,\n" +
-                "          \"windDirMin80m\": \"NNE\",\n" +
-                "          \"windDirMin80mDEG\": 13,\n" +
-                "          \"windSpeedMin80mKTS\": 9,\n" +
-                "          \"windSpeedMin80mKPH\": 18,\n" +
-                "          \"windSpeedMin80mMPH\": 11,\n" +
-                "          \"sky\": 0,\n" +
-                "          \"cloudsCoded\": \"CL\",\n" +
-                "          \"weather\": \"Sunny\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Sunny\",\n" +
-                "          \"weatherPrimaryCoded\": \"::CL\",\n" +
-                "          \"icon\": \"sunny.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": null,\n" +
-                "          \"solradWM2\": 5450,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 758,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665460458,\n" +
-                "          \"sunset\": 1665502153,\n" +
-                "          \"sunriseISO\": \"2022-10-11T05:54:18+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-11T17:29:13+02:00\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"timestamp\": 1665550800,\n" +
-                "          \"validTime\": \"2022-10-12T07:00:00+02:00\",\n" +
-                "          \"dateTimeISO\": \"2022-10-12T07:00:00+02:00\",\n" +
-                "          \"maxTempC\": 31,\n" +
-                "          \"maxTempF\": 88,\n" +
-                "          \"minTempC\": 21,\n" +
-                "          \"minTempF\": 69,\n" +
-                "          \"avgTempC\": 26,\n" +
-                "          \"avgTempF\": 79,\n" +
-                "          \"tempC\": null,\n" +
-                "          \"tempF\": null,\n" +
-                "          \"maxFeelslikeC\": 31,\n" +
-                "          \"maxFeelslikeF\": 88,\n" +
-                "          \"minFeelslikeC\": 22,\n" +
-                "          \"minFeelslikeF\": 72,\n" +
-                "          \"avgFeelslikeC\": 26,\n" +
-                "          \"avgFeelslikeF\": 80,\n" +
-                "          \"feelslikeC\": 22,\n" +
-                "          \"feelslikeF\": 72,\n" +
-                "          \"maxDewpointC\": 16,\n" +
-                "          \"maxDewpointF\": 60,\n" +
-                "          \"minDewpointC\": 11,\n" +
-                "          \"minDewpointF\": 51,\n" +
-                "          \"avgDewpointC\": 13,\n" +
-                "          \"avgDewpointF\": 55,\n" +
-                "          \"dewpointC\": 16,\n" +
-                "          \"dewpointF\": 60,\n" +
-                "          \"maxHumidity\": 68,\n" +
-                "          \"minHumidity\": 29,\n" +
-                "          \"humidity\": 68,\n" +
-                "          \"pop\": 0,\n" +
-                "          \"precipMM\": 0,\n" +
-                "          \"precipIN\": 0,\n" +
-                "          \"iceaccum\": null,\n" +
-                "          \"iceaccumMM\": null,\n" +
-                "          \"iceaccumIN\": null,\n" +
-                "          \"snowCM\": 0,\n" +
-                "          \"snowIN\": 0,\n" +
-                "          \"pressureMB\": 1014,\n" +
-                "          \"pressureIN\": 29.95,\n" +
-                "          \"windDir\": \"NNE\",\n" +
-                "          \"windDirDEG\": 12,\n" +
-                "          \"windSpeedKTS\": 8,\n" +
-                "          \"windSpeedKPH\": 15,\n" +
-                "          \"windSpeedMPH\": 9,\n" +
-                "          \"windGustKTS\": 15,\n" +
-                "          \"windGustKPH\": 28,\n" +
-                "          \"windGustMPH\": 17,\n" +
-                "          \"windDirMax\": \"E\",\n" +
-                "          \"windDirMaxDEG\": 96,\n" +
-                "          \"windSpeedMaxKTS\": 14,\n" +
-                "          \"windSpeedMaxKPH\": 26,\n" +
-                "          \"windSpeedMaxMPH\": 16,\n" +
-                "          \"windDirMin\": \"NNE\",\n" +
-                "          \"windDirMinDEG\": 12,\n" +
-                "          \"windSpeedMinKTS\": 7,\n" +
-                "          \"windSpeedMinKPH\": 13,\n" +
-                "          \"windSpeedMinMPH\": 8,\n" +
-                "          \"windDir80m\": \"NNE\",\n" +
-                "          \"windDir80mDEG\": 15,\n" +
-                "          \"windSpeed80mKTS\": 10,\n" +
-                "          \"windSpeed80mKPH\": 19,\n" +
-                "          \"windSpeed80mMPH\": 12,\n" +
-                "          \"windGust80mKTS\": 18,\n" +
-                "          \"windGust80mKPH\": 33,\n" +
-                "          \"windGust80mMPH\": 21,\n" +
-                "          \"windDirMax80m\": \"E\",\n" +
-                "          \"windDirMax80mDEG\": 96,\n" +
-                "          \"windSpeedMax80mKTS\": 18,\n" +
-                "          \"windSpeedMax80mKPH\": 33,\n" +
-                "          \"windSpeedMax80mMPH\": 21,\n" +
-                "          \"windDirMin80m\": \"NNE\",\n" +
-                "          \"windDirMin80mDEG\": 15,\n" +
-                "          \"windSpeedMin80mKTS\": 10,\n" +
-                "          \"windSpeedMin80mKPH\": 18,\n" +
-                "          \"windSpeedMin80mMPH\": 11,\n" +
-                "          \"sky\": 27,\n" +
-                "          \"cloudsCoded\": \"FW\",\n" +
-                "          \"weather\": \"Mostly Sunny\",\n" +
-                "          \"weatherCoded\": [],\n" +
-                "          \"weatherPrimary\": \"Mostly Sunny\",\n" +
-                "          \"weatherPrimaryCoded\": \"::FW\",\n" +
-                "          \"icon\": \"fair.png\",\n" +
-                "          \"visibilityKM\": 24.135,\n" +
-                "          \"visibilityMI\": 15,\n" +
-                "          \"uvi\": null,\n" +
-                "          \"solradWM2\": 4740,\n" +
-                "          \"solradMinWM2\": 0,\n" +
-                "          \"solradMaxWM2\": 743,\n" +
-                "          \"isDay\": true,\n" +
-                "          \"maxCoverage\": \"\",\n" +
-                "          \"sunrise\": 1665546895,\n" +
-                "          \"sunset\": 1665588484,\n" +
-                "          \"sunriseISO\": \"2022-10-12T05:54:55+02:00\",\n" +
-                "          \"sunsetISO\": \"2022-10-12T17:28:04+02:00\"\n" +
-                "        }\n" +
-                "      ],\n" +
-                "      \"profile\": {\n" +
-                "        \"tz\": \"Africa/Cairo\",\n" +
-                "        \"elevM\": 23,\n" +
-                "        \"elevFT\": 75\n" +
-                "      }\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}";
-        JSONObject jsonObject = new JSONObject(str);
-        String actual = XML.toString(jsonObject, null, XMLParserConfiguration.KEEP_STRINGS,2);
-        String expected = "<success>true</success>\n" +
-                "<response>\n" +
-                "  <loc>\n" +
-                "    <long>31.25</long>\n" +
-                "    <lat>30.063</lat>\n" +
-                "  </loc>\n" +
-                "  <profile>\n" +
-                "    <elevM>23</elevM>\n" +
-                "    <tz>Africa/Cairo</tz>\n" +
-                "    <elevFT>75</elevFT>\n" +
-                "  </profile>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-06T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>E</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>95</windDirMin80mDEG>\n" +
-                "    <feelslikeC>21</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>10</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>353</windDirDEG>\n" +
-                "    <windDir>N</windDir>\n" +
-                "    <sunriseISO>2022-10-06T05:51:14+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>9</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>66</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Mostly Sunny</weather>\n" +
-                "    <sunsetISO>2022-10-06T17:35:02+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>32</maxFeelslikeC>\n" +
-                "    <humidity>77</humidity>\n" +
-                "    <windDir80m>N</windDir80m>\n" +
-                "    <maxFeelslikeF>89</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>22</sky>\n" +
-                "    <windGust80mMPH>25</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>25</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
-                "    <windGust80mKPH>41</windGust80mKPH>\n" +
-                "    <avgDewpointF>58</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>41</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>22</windGust80mKTS>\n" +
-                "    <avgDewpointC>14</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>22</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>353</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>16</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>8</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>70</feelslikeF>\n" +
-                "    <validTime>2022-10-06T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>10</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>778</solradMaxWM2>\n" +
-                "    <avgTempC>25</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>15</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665028274</sunrise>\n" +
-                "    <avgTempF>78</avgTempF>\n" +
-                "    <windDirMin>N</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>fair.png</icon>\n" +
-                "    <minFeelslikeC>21</minFeelslikeC>\n" +
-                "    <dewpointC>17</dewpointC>\n" +
-                "    <cloudsCoded>FW</cloudsCoded>\n" +
-                "    <minFeelslikeF>70</minFeelslikeF>\n" +
-                "    <minHumidity>29</minHumidity>\n" +
-                "    <dewpointF>63</dewpointF>\n" +
-                "    <windSpeed80mKTS>12</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>NNW</windDirMax>\n" +
-                "    <windSpeed80mMPH>13</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>22</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>11</windDir80mDEG>\n" +
-                "    <maxTempC>32</maxTempC>\n" +
-                "    <pressureMB>1015</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665032400</timestamp>\n" +
-                "    <maxTempF>90</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>11</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>343</windDirMax80mDEG>\n" +
-                "    <windGustKTS>21</windGustKTS>\n" +
-                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>63</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
-                "    <uvi>6</uvi>\n" +
-                "    <windDirMax80m>NNW</windDirMax80m>\n" +
-                "    <maxDewpointC>17</maxDewpointC>\n" +
-                "    <pressureIN>29.97</pressureIN>\n" +
-                "    <avgFeelslikeF>80</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>19</minTempC>\n" +
-                "    <minDewpointF>52</minDewpointF>\n" +
-                "    <windSpeedKTS>5</windSpeedKTS>\n" +
-                "    <sunset>1665070502</sunset>\n" +
-                "    <solradWM2>5608</solradWM2>\n" +
-                "    <windSpeedKPH>9</windSpeedKPH>\n" +
-                "    <windGustMPH>25</windGustMPH>\n" +
-                "    <maxHumidity>77</maxHumidity>\n" +
-                "    <windSpeedMPH>6</windSpeedMPH>\n" +
-                "    <windGustKPH>40</windGustKPH>\n" +
-                "    <windDirMaxDEG>342</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-07T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>NNW</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>347</windDirMin80mDEG>\n" +
-                "    <feelslikeC>19</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>8</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>325</windDirDEG>\n" +
-                "    <windDir>NW</windDir>\n" +
-                "    <sunriseISO>2022-10-07T05:51:50+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>7</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>66</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Mostly Sunny</weather>\n" +
-                "    <sunsetISO>2022-10-07T17:33:51+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>29</maxFeelslikeC>\n" +
-                "    <humidity>77</humidity>\n" +
-                "    <windDir80m>NNW</windDir80m>\n" +
-                "    <maxFeelslikeF>85</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>30</sky>\n" +
-                "    <windGust80mMPH>23</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
-                "    <windGust80mKPH>37</windGust80mKPH>\n" +
-                "    <avgDewpointF>54</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>37</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>20</windGust80mKTS>\n" +
-                "    <avgDewpointC>12</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>325</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>13</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>6</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>67</feelslikeF>\n" +
-                "    <validTime>2022-10-07T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>742</solradMaxWM2>\n" +
-                "    <avgTempC>24</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>10</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665114710</sunrise>\n" +
-                "    <avgTempF>76</avgTempF>\n" +
-                "    <windDirMin>NW</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>fair.png</icon>\n" +
-                "    <minFeelslikeC>19</minFeelslikeC>\n" +
-                "    <dewpointC>15</dewpointC>\n" +
-                "    <cloudsCoded>FW</cloudsCoded>\n" +
-                "    <minFeelslikeF>67</minFeelslikeF>\n" +
-                "    <minHumidity>30</minHumidity>\n" +
-                "    <dewpointF>60</dewpointF>\n" +
-                "    <windSpeed80mKTS>6</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>WNW</windDirMax>\n" +
-                "    <windSpeed80mMPH>6</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>10</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>347</windDir80mDEG>\n" +
-                "    <maxTempC>30</maxTempC>\n" +
-                "    <pressureMB>1014</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665118800</timestamp>\n" +
-                "    <maxTempF>86</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>10</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>316</windDirMax80mDEG>\n" +
-                "    <windGustKTS>16</windGustKTS>\n" +
-                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>60</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>24</avgFeelslikeC>\n" +
-                "    <uvi>6</uvi>\n" +
-                "    <windDirMax80m>NW</windDirMax80m>\n" +
-                "    <maxDewpointC>15</maxDewpointC>\n" +
-                "    <pressureIN>29.95</pressureIN>\n" +
-                "    <avgFeelslikeF>76</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>19</minTempC>\n" +
-                "    <minDewpointF>50</minDewpointF>\n" +
-                "    <windSpeedKTS>1</windSpeedKTS>\n" +
-                "    <sunset>1665156831</sunset>\n" +
-                "    <solradWM2>5486</solradWM2>\n" +
-                "    <windSpeedKPH>2</windSpeedKPH>\n" +
-                "    <windGustMPH>18</windGustMPH>\n" +
-                "    <maxHumidity>77</maxHumidity>\n" +
-                "    <windSpeedMPH>1</windSpeedMPH>\n" +
-                "    <windGustKPH>29</windGustKPH>\n" +
-                "    <windDirMaxDEG>298</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-08T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>NW</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>309</windDirMin80mDEG>\n" +
-                "    <feelslikeC>19</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>8</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>21</windDirDEG>\n" +
-                "    <windDir>NNE</windDir>\n" +
-                "    <sunriseISO>2022-10-08T05:52:26+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>7</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>66</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Partly Cloudy</weather>\n" +
-                "    <sunsetISO>2022-10-08T17:32:41+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
-                "    <humidity>76</humidity>\n" +
-                "    <windDir80m>NW</windDir80m>\n" +
-                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>47</sky>\n" +
-                "    <windGust80mMPH>19</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
-                "    <windGust80mKPH>31</windGust80mKPH>\n" +
-                "    <avgDewpointF>56</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>17</windGust80mKTS>\n" +
-                "    <avgDewpointC>13</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>21</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>13</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>67</feelslikeF>\n" +
-                "    <validTime>2022-10-08T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>5</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>682</solradMaxWM2>\n" +
-                "    <avgTempC>25</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665201146</sunrise>\n" +
-                "    <avgTempF>76</avgTempF>\n" +
-                "    <windDirMin>NNE</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>pcloudy.png</icon>\n" +
-                "    <minFeelslikeC>19</minFeelslikeC>\n" +
-                "    <dewpointC>15</dewpointC>\n" +
-                "    <cloudsCoded>SC</cloudsCoded>\n" +
-                "    <minFeelslikeF>67</minFeelslikeF>\n" +
-                "    <minHumidity>32</minHumidity>\n" +
-                "    <dewpointF>59</dewpointF>\n" +
-                "    <windSpeed80mKTS>5</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>WNW</windDirMax>\n" +
-                "    <windSpeed80mMPH>5</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>9</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>309</windDir80mDEG>\n" +
-                "    <maxTempC>30</maxTempC>\n" +
-                "    <pressureMB>1014</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665205200</timestamp>\n" +
-                "    <maxTempF>87</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>11</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>1</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>322</windDirMax80mDEG>\n" +
-                "    <windGustKTS>17</windGustKTS>\n" +
-                "    <windSpeedMinKPH>2</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>59</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>1</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
-                "    <uvi>7</uvi>\n" +
-                "    <windDirMax80m>NW</windDirMax80m>\n" +
-                "    <maxDewpointC>15</maxDewpointC>\n" +
-                "    <pressureIN>29.94</pressureIN>\n" +
-                "    <avgFeelslikeF>76</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>19</minTempC>\n" +
-                "    <minDewpointF>52</minDewpointF>\n" +
-                "    <windSpeedKTS>1</windSpeedKTS>\n" +
-                "    <sunset>1665243161</sunset>\n" +
-                "    <solradWM2>4785</solradWM2>\n" +
-                "    <windSpeedKPH>2</windSpeedKPH>\n" +
-                "    <windGustMPH>20</windGustMPH>\n" +
-                "    <maxHumidity>76</maxHumidity>\n" +
-                "    <windSpeedMPH>1</windSpeedMPH>\n" +
-                "    <windGustKPH>32</windGustKPH>\n" +
-                "    <windDirMaxDEG>301</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-09T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>NW</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>316</windDirMin80mDEG>\n" +
-                "    <feelslikeC>20</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>9</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>356</windDirDEG>\n" +
-                "    <windDir>N</windDir>\n" +
-                "    <sunriseISO>2022-10-09T05:53:03+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>8</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>67</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Partly Cloudy</weather>\n" +
-                "    <sunsetISO>2022-10-09T17:31:31+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
-                "    <humidity>86</humidity>\n" +
-                "    <windDir80m>NW</windDir80m>\n" +
-                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>47</sky>\n" +
-                "    <windGust80mMPH>23</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
-                "    <windGust80mKPH>36</windGust80mKPH>\n" +
-                "    <avgDewpointF>57</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>20</windGust80mKTS>\n" +
-                "    <avgDewpointC>14</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>356</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>14</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>67</feelslikeF>\n" +
-                "    <validTime>2022-10-09T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>726</solradMaxWM2>\n" +
-                "    <avgTempC>25</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665287583</sunrise>\n" +
-                "    <avgTempF>77</avgTempF>\n" +
-                "    <windDirMin>N</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>pcloudy.png</icon>\n" +
-                "    <minFeelslikeC>20</minFeelslikeC>\n" +
-                "    <dewpointC>17</dewpointC>\n" +
-                "    <cloudsCoded>SC</cloudsCoded>\n" +
-                "    <minFeelslikeF>67</minFeelslikeF>\n" +
-                "    <minHumidity>31</minHumidity>\n" +
-                "    <dewpointF>63</dewpointF>\n" +
-                "    <windSpeed80mKTS>5</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>NNW</windDirMax>\n" +
-                "    <windSpeed80mMPH>6</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>9</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>316</windDir80mDEG>\n" +
-                "    <maxTempC>31</maxTempC>\n" +
-                "    <pressureMB>1016</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665291600</timestamp>\n" +
-                "    <maxTempF>87</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>11</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>2</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>354</windDirMax80mDEG>\n" +
-                "    <windGustKTS>19</windGustKTS>\n" +
-                "    <windSpeedMinKPH>4</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>63</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>2</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
-                "    <uvi>7</uvi>\n" +
-                "    <windDirMax80m>N</windDirMax80m>\n" +
-                "    <maxDewpointC>17</maxDewpointC>\n" +
-                "    <pressureIN>29.99</pressureIN>\n" +
-                "    <avgFeelslikeF>77</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>19</minTempC>\n" +
-                "    <minDewpointF>52</minDewpointF>\n" +
-                "    <windSpeedKTS>2</windSpeedKTS>\n" +
-                "    <sunset>1665329491</sunset>\n" +
-                "    <solradWM2>4768</solradWM2>\n" +
-                "    <windSpeedKPH>4</windSpeedKPH>\n" +
-                "    <windGustMPH>22</windGustMPH>\n" +
-                "    <maxHumidity>86</maxHumidity>\n" +
-                "    <windSpeedMPH>2</windSpeedMPH>\n" +
-                "    <windGustKPH>36</windGustKPH>\n" +
-                "    <windDirMaxDEG>343</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-10T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>E</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>91</windDirMin80mDEG>\n" +
-                "    <feelslikeC>21</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>9</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>358</windDirDEG>\n" +
-                "    <windDir>N</windDir>\n" +
-                "    <sunriseISO>2022-10-10T05:53:40+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>8</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>70</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Partly Cloudy</weather>\n" +
-                "    <sunsetISO>2022-10-10T17:30:21+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>30</maxFeelslikeC>\n" +
-                "    <humidity>75</humidity>\n" +
-                "    <windDir80m>N</windDir80m>\n" +
-                "    <maxFeelslikeF>86</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>64</sky>\n" +
-                "    <windGust80mMPH>22</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>22</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Partly Cloudy</weatherPrimary>\n" +
-                "    <windGust80mKPH>36</windGust80mKPH>\n" +
-                "    <avgDewpointF>58</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>19</windGust80mKTS>\n" +
-                "    <avgDewpointC>14</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>19</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>358</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>15</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>7</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>69</feelslikeF>\n" +
-                "    <validTime>2022-10-10T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>8</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>597</solradMaxWM2>\n" +
-                "    <avgTempC>26</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>13</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665374020</sunrise>\n" +
-                "    <avgTempF>78</avgTempF>\n" +
-                "    <windDirMin>N</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>pcloudy.png</icon>\n" +
-                "    <minFeelslikeC>21</minFeelslikeC>\n" +
-                "    <dewpointC>16</dewpointC>\n" +
-                "    <cloudsCoded>SC</cloudsCoded>\n" +
-                "    <minFeelslikeF>69</minFeelslikeF>\n" +
-                "    <minHumidity>35</minHumidity>\n" +
-                "    <dewpointF>61</dewpointF>\n" +
-                "    <windSpeed80mKTS>7</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>N</windDirMax>\n" +
-                "    <windSpeed80mMPH>8</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>13</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>8</windDir80mDEG>\n" +
-                "    <maxTempC>31</maxTempC>\n" +
-                "    <pressureMB>1017</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665378000</timestamp>\n" +
-                "    <maxTempF>87</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>13</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>2</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>10</windDirMax80mDEG>\n" +
-                "    <windGustKTS>16</windGustKTS>\n" +
-                "    <windSpeedMinKPH>4</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>61</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>2</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>25</avgFeelslikeC>\n" +
-                "    <uvi>6</uvi>\n" +
-                "    <windDirMax80m>N</windDirMax80m>\n" +
-                "    <maxDewpointC>16</maxDewpointC>\n" +
-                "    <pressureIN>30.03</pressureIN>\n" +
-                "    <avgFeelslikeF>78</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>21</minTempC>\n" +
-                "    <minDewpointF>55</minDewpointF>\n" +
-                "    <windSpeedKTS>2</windSpeedKTS>\n" +
-                "    <sunset>1665415821</sunset>\n" +
-                "    <solradWM2>4494</solradWM2>\n" +
-                "    <windSpeedKPH>4</windSpeedKPH>\n" +
-                "    <windGustMPH>19</windGustMPH>\n" +
-                "    <maxHumidity>75</maxHumidity>\n" +
-                "    <windSpeedMPH>2</windSpeedMPH>\n" +
-                "    <windGustKPH>30</windGustKPH>\n" +
-                "    <windDirMaxDEG>10</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-11T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>NNE</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>13</windDirMin80mDEG>\n" +
-                "    <feelslikeC>22</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>18</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>13</windDirDEG>\n" +
-                "    <windDir>NNE</windDir>\n" +
-                "    <sunriseISO>2022-10-11T05:54:18+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>15</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>70</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Sunny</weather>\n" +
-                "    <sunsetISO>2022-10-11T17:29:13+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>31</maxFeelslikeC>\n" +
-                "    <humidity>71</humidity>\n" +
-                "    <windDir80m>NNE</windDir80m>\n" +
-                "    <maxFeelslikeF>87</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>0</sky>\n" +
-                "    <windGust80mMPH>19</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Sunny</weatherPrimary>\n" +
-                "    <windGust80mKPH>31</windGust80mKPH>\n" +
-                "    <avgDewpointF>55</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>17</windGust80mKTS>\n" +
-                "    <avgDewpointC>13</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>14</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>28</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>9</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>72</feelslikeF>\n" +
-                "    <validTime>2022-10-11T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>758</solradMaxWM2>\n" +
-                "    <avgTempC>26</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::CL</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665460458</sunrise>\n" +
-                "    <avgTempF>78</avgTempF>\n" +
-                "    <windDirMin>NNE</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>sunny.png</icon>\n" +
-                "    <minFeelslikeC>22</minFeelslikeC>\n" +
-                "    <dewpointC>17</dewpointC>\n" +
-                "    <cloudsCoded>CL</cloudsCoded>\n" +
-                "    <minFeelslikeF>72</minFeelslikeF>\n" +
-                "    <minHumidity>30</minHumidity>\n" +
-                "    <dewpointF>62</dewpointF>\n" +
-                "    <windSpeed80mKTS>10</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>NNE</windDirMax>\n" +
-                "    <windSpeed80mMPH>12</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>19</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>16</windDir80mDEG>\n" +
-                "    <maxTempC>31</maxTempC>\n" +
-                "    <pressureMB>1015</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665464400</timestamp>\n" +
-                "    <maxTempF>87</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>11</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>7</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>28</windDirMax80mDEG>\n" +
-                "    <windGustKTS>15</windGustKTS>\n" +
-                "    <windSpeedMinKPH>14</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>62</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>8</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
-                "    <uvi>null</uvi>\n" +
-                "    <windDirMax80m>NNE</windDirMax80m>\n" +
-                "    <maxDewpointC>17</maxDewpointC>\n" +
-                "    <pressureIN>29.98</pressureIN>\n" +
-                "    <avgFeelslikeF>79</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>21</minTempC>\n" +
-                "    <minDewpointF>51</minDewpointF>\n" +
-                "    <windSpeedKTS>8</windSpeedKTS>\n" +
-                "    <sunset>1665502153</sunset>\n" +
-                "    <solradWM2>5450</solradWM2>\n" +
-                "    <windSpeedKPH>15</windSpeedKPH>\n" +
-                "    <windGustMPH>17</windGustMPH>\n" +
-                "    <maxHumidity>71</maxHumidity>\n" +
-                "    <windSpeedMPH>9</windSpeedMPH>\n" +
-                "    <windGustKPH>28</windGustKPH>\n" +
-                "    <windDirMaxDEG>28</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <periods>\n" +
-                "    <dateTimeISO>2022-10-12T07:00:00+02:00</dateTimeISO>\n" +
-                "    <windDirMin80m>NNE</windDirMin80m>\n" +
-                "    <windDirMin80mDEG>15</windDirMin80mDEG>\n" +
-                "    <feelslikeC>22</feelslikeC>\n" +
-                "    <visibilityMI>15</visibilityMI>\n" +
-                "    <windSpeedMaxMPH>16</windSpeedMaxMPH>\n" +
-                "    <windDirDEG>12</windDirDEG>\n" +
-                "    <windDir>NNE</windDir>\n" +
-                "    <sunriseISO>2022-10-12T05:54:55+02:00</sunriseISO>\n" +
-                "    <iceaccumMM>null</iceaccumMM>\n" +
-                "    <windSpeedMaxKTS>14</windSpeedMaxKTS>\n" +
-                "    <iceaccumIN>null</iceaccumIN>\n" +
-                "    <minTempF>69</minTempF>\n" +
-                "    <snowIN>0</snowIN>\n" +
-                "    <weather>Mostly Sunny</weather>\n" +
-                "    <sunsetISO>2022-10-12T17:28:04+02:00</sunsetISO>\n" +
-                "    <maxFeelslikeC>31</maxFeelslikeC>\n" +
-                "    <humidity>68</humidity>\n" +
-                "    <windDir80m>NNE</windDir80m>\n" +
-                "    <maxFeelslikeF>88</maxFeelslikeF>\n" +
-                "    <precipMM>0</precipMM>\n" +
-                "    <sky>27</sky>\n" +
-                "    <windGust80mMPH>21</windGust80mMPH>\n" +
-                "    <windSpeedMax80mMPH>21</windSpeedMax80mMPH>\n" +
-                "    <weatherPrimary>Mostly Sunny</weatherPrimary>\n" +
-                "    <windGust80mKPH>33</windGust80mKPH>\n" +
-                "    <avgDewpointF>55</avgDewpointF>\n" +
-                "    <windSpeedMax80mKPH>33</windSpeedMax80mKPH>\n" +
-                "    <windGust80mKTS>18</windGust80mKTS>\n" +
-                "    <avgDewpointC>13</avgDewpointC>\n" +
-                "    <precipIN>0</precipIN>\n" +
-                "    <windSpeedMax80mKTS>18</windSpeedMax80mKTS>\n" +
-                "    <windDirMinDEG>12</windDirMinDEG>\n" +
-                "    <windSpeedMaxKPH>26</windSpeedMaxKPH>\n" +
-                "    <windSpeedMin80mKTS>10</windSpeedMin80mKTS>\n" +
-                "    <feelslikeF>72</feelslikeF>\n" +
-                "    <validTime>2022-10-12T07:00:00+02:00</validTime>\n" +
-                "    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>\n" +
-                "    <solradMaxWM2>743</solradMaxWM2>\n" +
-                "    <avgTempC>26</avgTempC>\n" +
-                "    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>\n" +
-                "    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>\n" +
-                "    <sunrise>1665546895</sunrise>\n" +
-                "    <avgTempF>79</avgTempF>\n" +
-                "    <windDirMin>NNE</windDirMin>\n" +
-                "    <maxCoverage/>\n" +
-                "    <icon>fair.png</icon>\n" +
-                "    <minFeelslikeC>22</minFeelslikeC>\n" +
-                "    <dewpointC>16</dewpointC>\n" +
-                "    <cloudsCoded>FW</cloudsCoded>\n" +
-                "    <minFeelslikeF>72</minFeelslikeF>\n" +
-                "    <minHumidity>29</minHumidity>\n" +
-                "    <dewpointF>60</dewpointF>\n" +
-                "    <windSpeed80mKTS>10</windSpeed80mKTS>\n" +
-                "    <pop>0</pop>\n" +
-                "    <snowCM>0</snowCM>\n" +
-                "    <windDirMax>E</windDirMax>\n" +
-                "    <windSpeed80mMPH>12</windSpeed80mMPH>\n" +
-                "    <windSpeed80mKPH>19</windSpeed80mKPH>\n" +
-                "    <windDir80mDEG>15</windDir80mDEG>\n" +
-                "    <maxTempC>31</maxTempC>\n" +
-                "    <pressureMB>1014</pressureMB>\n" +
-                "    <visibilityKM>24.135</visibilityKM>\n" +
-                "    <timestamp>1665550800</timestamp>\n" +
-                "    <maxTempF>88</maxTempF>\n" +
-                "    <tempF>null</tempF>\n" +
-                "    <minDewpointC>11</minDewpointC>\n" +
-                "    <solradMinWM2>0</solradMinWM2>\n" +
-                "    <windSpeedMinKTS>7</windSpeedMinKTS>\n" +
-                "    <windDirMax80mDEG>96</windDirMax80mDEG>\n" +
-                "    <windGustKTS>15</windGustKTS>\n" +
-                "    <windSpeedMinKPH>13</windSpeedMinKPH>\n" +
-                "    <maxDewpointF>60</maxDewpointF>\n" +
-                "    <windSpeedMinMPH>8</windSpeedMinMPH>\n" +
-                "    <avgFeelslikeC>26</avgFeelslikeC>\n" +
-                "    <uvi>null</uvi>\n" +
-                "    <windDirMax80m>E</windDirMax80m>\n" +
-                "    <maxDewpointC>16</maxDewpointC>\n" +
-                "    <pressureIN>29.95</pressureIN>\n" +
-                "    <avgFeelslikeF>80</avgFeelslikeF>\n" +
-                "    <iceaccum>null</iceaccum>\n" +
-                "    <isDay>true</isDay>\n" +
-                "    <minTempC>21</minTempC>\n" +
-                "    <minDewpointF>51</minDewpointF>\n" +
-                "    <windSpeedKTS>8</windSpeedKTS>\n" +
-                "    <sunset>1665588484</sunset>\n" +
-                "    <solradWM2>4740</solradWM2>\n" +
-                "    <windSpeedKPH>15</windSpeedKPH>\n" +
-                "    <windGustMPH>17</windGustMPH>\n" +
-                "    <maxHumidity>68</maxHumidity>\n" +
-                "    <windSpeedMPH>9</windSpeedMPH>\n" +
-                "    <windGustKPH>28</windGustKPH>\n" +
-                "    <windDirMaxDEG>96</windDirMaxDEG>\n" +
-                "    <tempC>null</tempC>\n" +
-                "  </periods>\n" +
-                "  <interval>day</interval>\n" +
-                "  <place>\n" +
-                "    <country>eg</country>\n" +
-                "    <name>cairo</name>\n" +
-                "    <state>qh</state>\n" +
-                "  </place>\n" +
-                "</response>\n" +
-                "<error>null</error>\n";
-        assertEquals(actual, expected);
+        try {
+            InputStream jsonStream = null;
+            try {
+                jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json");
+                final JSONObject object = new JSONObject(new JSONTokener(jsonStream));
+                String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS,2);
+                InputStream xmlStream = null;
+                try {
+                    xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml");
+                    int bufferSize = 1024;
+                    char[] buffer = new char[bufferSize];
+                    StringBuilder expected = new StringBuilder();
+                    Reader in = new InputStreamReader(xmlStream, "UTF-8");
+                    for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
+                        expected.append(buffer, 0, numRead);
+                    }
+                    assertEquals(expected.toString(), actualString);
+                } finally {
+                    if (xmlStream != null) {
+                        xmlStream.close();
+                    }
+                }
+            } finally {
+                if (jsonStream != null) {
+                    jsonStream.close();
+                }
+            }
+        } catch (IOException e) {
+            fail("file writer error: " +e.getMessage());
+        }
     }
 }
 
diff --git a/src/test/resources/Issue593.json b/src/test/resources/Issue593.json
new file mode 100644
index 0000000..b3c82fe
--- /dev/null
+++ b/src/test/resources/Issue593.json
@@ -0,0 +1,189 @@
+{
+ "clinical_study": {
+  "brief_summary": {
+   "textblock": "CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of"
+  },
+  "brief_title": "CLEAR SYNERGY Neutrophil Substudy",
+  "overall_status": "Recruiting",
+  "eligibility": {
+   "study_pop": {
+    "textblock": "Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial"
+   },
+   "minimum_age": "19 Years",
+   "sampling_method": "Non-Probability Sample",
+   "gender": "All",
+   "criteria": {
+    "textblock": "Inclusion Criteria:"
+   },
+   "healthy_volunteers": "No",
+   "maximum_age": "110 Years"
+  },
+  "number_of_groups": "2",
+  "source": "NYU Langone Health",
+  "location_countries": {
+   "country": "United States"
+  },
+  "study_design_info": {
+   "time_perspective": "Prospective",
+   "observational_model": "Other"
+  },
+  "last_update_submitted_qc": "September 10, 2019",
+  "intervention_browse": {
+   "mesh_term": "Colchicine"
+  },
+  "official_title": "Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial",
+  "primary_completion_date": {
+   "type": "Anticipated",
+   "content": "February 1, 2021"
+  },
+  "sponsors": {
+   "lead_sponsor": {
+    "agency_class": "Other",
+    "agency": "NYU Langone Health"
+   },
+   "collaborator": [
+    {
+     "agency_class": "Other",
+     "agency": "Population Health Research Institute"
+    },
+    {
+     "agency_class": "NIH",
+     "agency": "National Heart, Lung, and Blood Institute (NHLBI)"
+    }
+   ]
+  },
+  "overall_official": {
+   "role": "Principal Investigator",
+   "affiliation": "NYU School of Medicine",
+   "last_name": "Binita Shah, MD"
+  },
+  "overall_contact_backup": {
+   "last_name": "Binita Shah, MD"
+  },
+  "condition_browse": {
+   "mesh_term": [
+    "Myocardial Infarction",
+    "ST Elevation Myocardial Infarction",
+    "Infarction"
+   ]
+  },
+  "overall_contact": {
+   "phone": "646-501-9648",
+   "last_name": "Fatmira Curovic",
+   "email": "fatmira.curovic@nyumc.org"
+  },
+  "responsible_party": {
+   "responsible_party_type": "Principal Investigator",
+   "investigator_title": "Assistant Professor of Medicine",
+   "investigator_full_name": "Binita Shah",
+   "investigator_affiliation": "NYU Langone Health"
+  },
+  "study_first_submitted_qc": "March 12, 2019",
+  "start_date": {
+   "type": "Actual",
+   "content": "March 4, 2019"
+  },
+  "has_expanded_access": "No",
+  "study_first_posted": {
+   "type": "Actual",
+   "content": "March 14, 2019"
+  },
+  "arm_group": [
+   {
+    "arm_group_label": "Colchicine"
+   },
+   {
+    "arm_group_label": "Placebo"
+   }
+  ],
+  "primary_outcome": {
+   "measure": "soluble L-selectin",
+   "time_frame": "between baseline and 3 months",
+   "description": "Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups."
+  },
+  "secondary_outcome": [
+   {
+    "measure": "Other soluble markers of neutrophil activity",
+    "time_frame": "between baseline and 3 months",
+    "description": "Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)"
+   },
+   {
+    "measure": "Markers of systemic inflammation",
+    "time_frame": "between baseline and 3 months",
+    "description": "Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)"
+   },
+   {
+    "measure": "Neutrophil-driven responses that may further propagate injury",
+    "time_frame": "between baseline and 3 months",
+    "description": "Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)"
+   }
+  ],
+  "oversight_info": {
+   "is_fda_regulated_drug": "No",
+   "is_fda_regulated_device": "No",
+   "has_dmc": "No"
+  },
+  "last_update_posted": {
+   "type": "Actual",
+   "content": "September 12, 2019"
+  },
+  "id_info": {
+   "nct_id": "NCT03874338",
+   "org_study_id": "18-01323",
+   "secondary_id": "1R01HL146206"
+  },
+  "enrollment": {
+   "type": "Anticipated",
+   "content": "670"
+  },
+  "study_first_submitted": "March 12, 2019",
+  "condition": [
+   "Neutrophils.Hypersegmented | Bld-Ser-Plas",
+   "STEMI - ST Elevation Myocardial Infarction"
+  ],
+  "study_type": "Observational",
+  "required_header": {
+   "download_date": "ClinicalTrials.gov processed this data on July 19, 2020",
+   "link_text": "Link to the current ClinicalTrials.gov record.",
+   "url": "https://clinicaltrials.gov/show/NCT03874338"
+  },
+  "last_update_submitted": "September 10, 2019",
+  "completion_date": {
+   "type": "Anticipated",
+   "content": "February 1, 2022"
+  },
+  "location": {
+   "contact": {
+    "phone": "646-501-9648",
+    "last_name": "Fatmira Curovic",
+    "email": "fatmira.curovic@nyumc.org"
+   },
+   "facility": {
+    "address": {
+     "zip": "10016",
+     "country": "United States",
+     "city": "New York",
+     "state": "New York"
+    },
+    "name": "NYU School of Medicine"
+   },
+   "status": "Recruiting",
+   "contact_backup": {
+    "last_name": "Binita Shah, MD"
+   }
+  },
+  "intervention": {
+   "intervention_type": "Drug",
+   "arm_group_label": [
+    "Colchicine",
+    "Placebo"
+   ],
+   "description": "Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.",
+   "intervention_name": "Colchicine Pill"
+  },
+  "patient_data": {
+   "sharing_ipd": "No"
+  },
+  "verification_date": "September 2019"
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/Issue593.xml b/src/test/resources/Issue593.xml
new file mode 100644
index 0000000..bf78f3b
--- /dev/null
+++ b/src/test/resources/Issue593.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clinical_study>
+  <!-- This xml conforms to an XML Schema at:
+    https://clinicaltrials.gov/ct2/html/images/info/public.xsd -->
+  <required_header>
+    <download_date>ClinicalTrials.gov processed this data on July 19, 2020</download_date>
+    <link_text>Link to the current ClinicalTrials.gov record.</link_text>
+    <url>https://clinicaltrials.gov/show/NCT03874338</url>
+  </required_header>
+  <id_info>
+    <org_study_id>18-01323</org_study_id>
+    <secondary_id>1R01HL146206</secondary_id>
+    <nct_id>NCT03874338</nct_id>
+  </id_info>
+  <brief_title>CLEAR SYNERGY Neutrophil Substudy</brief_title>
+  <official_title>Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial</official_title>
+  <sponsors>
+    <lead_sponsor>
+      <agency>NYU Langone Health</agency>
+      <agency_class>Other</agency_class>
+    </lead_sponsor>
+    <collaborator>
+      <agency>Population Health Research Institute</agency>
+      <agency_class>Other</agency_class>
+    </collaborator>
+    <collaborator>
+      <agency>National Heart, Lung, and Blood Institute (NHLBI)</agency>
+      <agency_class>NIH</agency_class>
+    </collaborator>
+  </sponsors>
+  <source>NYU Langone Health</source>
+  <oversight_info>
+    <has_dmc>No</has_dmc>
+    <is_fda_regulated_drug>No</is_fda_regulated_drug>
+    <is_fda_regulated_device>No</is_fda_regulated_device>
+  </oversight_info>
+  <brief_summary>
+    <textblock>
+      CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of
+    </textblock>
+  </brief_summary>
+  <overall_status>Recruiting</overall_status>
+  <start_date type="Actual">March 4, 2019</start_date>
+  <completion_date type="Anticipated">February 1, 2022</completion_date>
+  <primary_completion_date type="Anticipated">February 1, 2021</primary_completion_date>
+  <study_type>Observational</study_type>
+  <has_expanded_access>No</has_expanded_access>
+  <study_design_info>
+    <observational_model>Other</observational_model>
+    <time_perspective>Prospective</time_perspective>
+  </study_design_info>
+  <primary_outcome>
+    <measure>soluble L-selectin</measure>
+    <time_frame>between baseline and 3 months</time_frame>
+    <description>Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups.</description>
+  </primary_outcome>
+  <secondary_outcome>
+    <measure>Other soluble markers of neutrophil activity</measure>
+    <time_frame>between baseline and 3 months</time_frame>
+    <description>Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)</description>
+  </secondary_outcome>
+  <secondary_outcome>
+    <measure>Markers of systemic inflammation</measure>
+    <time_frame>between baseline and 3 months</time_frame>
+    <description>Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)</description>
+  </secondary_outcome>
+  <secondary_outcome>
+    <measure>Neutrophil-driven responses that may further propagate injury</measure>
+    <time_frame>between baseline and 3 months</time_frame>
+    <description>Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)</description>
+  </secondary_outcome>
+  <number_of_groups>2</number_of_groups>
+  <enrollment type="Anticipated">670</enrollment>
+  <condition>Neutrophils.Hypersegmented &#X7C; Bld-Ser-Plas</condition>
+  <condition>STEMI - ST Elevation Myocardial Infarction</condition>
+  <arm_group>
+    <arm_group_label>Colchicine</arm_group_label>
+  </arm_group>
+  <arm_group>
+    <arm_group_label>Placebo</arm_group_label>
+  </arm_group>
+  <intervention>
+    <intervention_type>Drug</intervention_type>
+    <intervention_name>Colchicine Pill</intervention_name>
+    <description>Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.</description>
+    <arm_group_label>Colchicine</arm_group_label>
+    <arm_group_label>Placebo</arm_group_label>
+  </intervention>
+  <eligibility>
+    <study_pop>
+      <textblock>
+        Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial
+      </textblock>
+    </study_pop>
+    <sampling_method>Non-Probability Sample</sampling_method>
+    <criteria>
+      <textblock>
+        Inclusion Criteria:
+      </textblock>
+    </criteria>
+    <gender>All</gender>
+    <minimum_age>19 Years</minimum_age>
+    <maximum_age>110 Years</maximum_age>
+    <healthy_volunteers>No</healthy_volunteers>
+  </eligibility>
+  <overall_official>
+    <last_name>Binita Shah, MD</last_name>
+    <role>Principal Investigator</role>
+    <affiliation>NYU School of Medicine</affiliation>
+  </overall_official>
+  <overall_contact>
+    <last_name>Fatmira Curovic</last_name>
+    <phone>646-501-9648</phone>
+    <email>fatmira.curovic@nyumc.org</email>
+  </overall_contact>
+  <overall_contact_backup>
+    <last_name>Binita Shah, MD</last_name>
+  </overall_contact_backup>
+  <location>
+    <facility>
+      <name>NYU School of Medicine</name>
+      <address>
+        <city>New York</city>
+        <state>New York</state>
+        <zip>10016</zip>
+        <country>United States</country>
+      </address>
+    </facility>
+    <status>Recruiting</status>
+    <contact>
+      <last_name>Fatmira Curovic</last_name>
+      <phone>646-501-9648</phone>
+      <email>fatmira.curovic@nyumc.org</email>
+    </contact>
+    <contact_backup>
+      <last_name>Binita Shah, MD</last_name>
+    </contact_backup>
+  </location>
+  <location_countries>
+    <country>United States</country>
+  </location_countries>
+  <verification_date>September 2019</verification_date>
+  <study_first_submitted>March 12, 2019</study_first_submitted>
+  <study_first_submitted_qc>March 12, 2019</study_first_submitted_qc>
+  <study_first_posted type="Actual">March 14, 2019</study_first_posted>
+  <last_update_submitted>September 10, 2019</last_update_submitted>
+  <last_update_submitted_qc>September 10, 2019</last_update_submitted_qc>
+  <last_update_posted type="Actual">September 12, 2019</last_update_posted>
+  <responsible_party>
+    <responsible_party_type>Principal Investigator</responsible_party_type>
+    <investigator_affiliation>NYU Langone Health</investigator_affiliation>
+    <investigator_full_name>Binita Shah</investigator_full_name>
+    <investigator_title>Assistant Professor of Medicine</investigator_title>
+  </responsible_party>
+  <condition_browse>
+    <!-- CAUTION:  The following MeSH terms are assigned with an imperfect algorithm            -->
+    <mesh_term>Myocardial Infarction</mesh_term>
+    <mesh_term>ST Elevation Myocardial Infarction</mesh_term>
+    <mesh_term>Infarction</mesh_term>
+  </condition_browse>
+  <intervention_browse>
+    <!-- CAUTION:  The following MeSH terms are assigned with an imperfect algorithm            -->
+    <mesh_term>Colchicine</mesh_term>
+  </intervention_browse>
+  <patient_data>
+    <sharing_ipd>No</sharing_ipd>
+  </patient_data>
+  <!-- Results have not yet been posted for this study                                          -->
+</clinical_study>

From 153972afdf3150fa08e48b30da6b70bec63d4664 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Fri, 7 Oct 2022 10:35:14 +0100
Subject: [PATCH 082/212] Adding resources

---
 src/test/resources/Issue593.json | 875 ++++++++++++++++++++++++-------
 src/test/resources/Issue593.xml  | 860 ++++++++++++++++++++++++------
 2 files changed, 1386 insertions(+), 349 deletions(-)

diff --git a/src/test/resources/Issue593.json b/src/test/resources/Issue593.json
index b3c82fe..213625a 100644
--- a/src/test/resources/Issue593.json
+++ b/src/test/resources/Issue593.json
@@ -1,189 +1,704 @@
 {
- "clinical_study": {
-  "brief_summary": {
-   "textblock": "CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of"
-  },
-  "brief_title": "CLEAR SYNERGY Neutrophil Substudy",
-  "overall_status": "Recruiting",
-  "eligibility": {
-   "study_pop": {
-    "textblock": "Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial"
+ "success": true,
+ "error": null,
+ "response": [
+  {
+   "loc": {
+    "long": 31.25,
+    "lat": 30.063
    },
-   "minimum_age": "19 Years",
-   "sampling_method": "Non-Probability Sample",
-   "gender": "All",
-   "criteria": {
-    "textblock": "Inclusion Criteria:"
+   "interval": "day",
+   "place": {
+    "name": "cairo",
+    "state": "qh",
+    "country": "eg"
    },
-   "healthy_volunteers": "No",
-   "maximum_age": "110 Years"
-  },
-  "number_of_groups": "2",
-  "source": "NYU Langone Health",
-  "location_countries": {
-   "country": "United States"
-  },
-  "study_design_info": {
-   "time_perspective": "Prospective",
-   "observational_model": "Other"
-  },
-  "last_update_submitted_qc": "September 10, 2019",
-  "intervention_browse": {
-   "mesh_term": "Colchicine"
-  },
-  "official_title": "Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial",
-  "primary_completion_date": {
-   "type": "Anticipated",
-   "content": "February 1, 2021"
-  },
-  "sponsors": {
-   "lead_sponsor": {
-    "agency_class": "Other",
-    "agency": "NYU Langone Health"
-   },
-   "collaborator": [
+   "periods": [
     {
-     "agency_class": "Other",
-     "agency": "Population Health Research Institute"
+     "timestamp": 1665032400,
+     "validTime": "2022-10-06T07:00:00+02:00",
+     "dateTimeISO": "2022-10-06T07:00:00+02:00",
+     "maxTempC": 32,
+     "maxTempF": 90,
+     "minTempC": 19,
+     "minTempF": 66,
+     "avgTempC": 25,
+     "avgTempF": 78,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 32,
+     "maxFeelslikeF": 89,
+     "minFeelslikeC": 21,
+     "minFeelslikeF": 70,
+     "avgFeelslikeC": 26,
+     "avgFeelslikeF": 80,
+     "feelslikeC": 21,
+     "feelslikeF": 70,
+     "maxDewpointC": 17,
+     "maxDewpointF": 63,
+     "minDewpointC": 11,
+     "minDewpointF": 52,
+     "avgDewpointC": 14,
+     "avgDewpointF": 58,
+     "dewpointC": 17,
+     "dewpointF": 63,
+     "maxHumidity": 77,
+     "minHumidity": 29,
+     "humidity": 77,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1015,
+     "pressureIN": 29.97,
+     "windDir": "N",
+     "windDirDEG": 353,
+     "windSpeedKTS": 5,
+     "windSpeedKPH": 9,
+     "windSpeedMPH": 6,
+     "windGustKTS": 21,
+     "windGustKPH": 40,
+     "windGustMPH": 25,
+     "windDirMax": "NNW",
+     "windDirMaxDEG": 342,
+     "windSpeedMaxKTS": 9,
+     "windSpeedMaxKPH": 16,
+     "windSpeedMaxMPH": 10,
+     "windDirMin": "N",
+     "windDirMinDEG": 353,
+     "windSpeedMinKTS": 1,
+     "windSpeedMinKPH": 2,
+     "windSpeedMinMPH": 1,
+     "windDir80m": "N",
+     "windDir80mDEG": 11,
+     "windSpeed80mKTS": 12,
+     "windSpeed80mKPH": 22,
+     "windSpeed80mMPH": 13,
+     "windGust80mKTS": 22,
+     "windGust80mKPH": 41,
+     "windGust80mMPH": 25,
+     "windDirMax80m": "NNW",
+     "windDirMax80mDEG": 343,
+     "windSpeedMax80mKTS": 22,
+     "windSpeedMax80mKPH": 41,
+     "windSpeedMax80mMPH": 25,
+     "windDirMin80m": "E",
+     "windDirMin80mDEG": 95,
+     "windSpeedMin80mKTS": 8,
+     "windSpeedMin80mKPH": 15,
+     "windSpeedMin80mMPH": 10,
+     "sky": 22,
+     "cloudsCoded": "FW",
+     "weather": "Mostly Sunny",
+     "weatherCoded": [],
+     "weatherPrimary": "Mostly Sunny",
+     "weatherPrimaryCoded": "::FW",
+     "icon": "fair.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": 6,
+     "solradWM2": 5608,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 778,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665028274,
+     "sunset": 1665070502,
+     "sunriseISO": "2022-10-06T05:51:14+02:00",
+     "sunsetISO": "2022-10-06T17:35:02+02:00"
     },
     {
-     "agency_class": "NIH",
-     "agency": "National Heart, Lung, and Blood Institute (NHLBI)"
+     "timestamp": 1665118800,
+     "validTime": "2022-10-07T07:00:00+02:00",
+     "dateTimeISO": "2022-10-07T07:00:00+02:00",
+     "maxTempC": 30,
+     "maxTempF": 86,
+     "minTempC": 19,
+     "minTempF": 66,
+     "avgTempC": 24,
+     "avgTempF": 76,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 29,
+     "maxFeelslikeF": 85,
+     "minFeelslikeC": 19,
+     "minFeelslikeF": 67,
+     "avgFeelslikeC": 24,
+     "avgFeelslikeF": 76,
+     "feelslikeC": 19,
+     "feelslikeF": 67,
+     "maxDewpointC": 15,
+     "maxDewpointF": 60,
+     "minDewpointC": 10,
+     "minDewpointF": 50,
+     "avgDewpointC": 12,
+     "avgDewpointF": 54,
+     "dewpointC": 15,
+     "dewpointF": 60,
+     "maxHumidity": 77,
+     "minHumidity": 30,
+     "humidity": 77,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1014,
+     "pressureIN": 29.95,
+     "windDir": "NW",
+     "windDirDEG": 325,
+     "windSpeedKTS": 1,
+     "windSpeedKPH": 2,
+     "windSpeedMPH": 1,
+     "windGustKTS": 16,
+     "windGustKPH": 29,
+     "windGustMPH": 18,
+     "windDirMax": "WNW",
+     "windDirMaxDEG": 298,
+     "windSpeedMaxKTS": 7,
+     "windSpeedMaxKPH": 13,
+     "windSpeedMaxMPH": 8,
+     "windDirMin": "NW",
+     "windDirMinDEG": 325,
+     "windSpeedMinKTS": 1,
+     "windSpeedMinKPH": 2,
+     "windSpeedMinMPH": 1,
+     "windDir80m": "NNW",
+     "windDir80mDEG": 347,
+     "windSpeed80mKTS": 6,
+     "windSpeed80mKPH": 10,
+     "windSpeed80mMPH": 6,
+     "windGust80mKTS": 20,
+     "windGust80mKPH": 37,
+     "windGust80mMPH": 23,
+     "windDirMax80m": "NW",
+     "windDirMax80mDEG": 316,
+     "windSpeedMax80mKTS": 20,
+     "windSpeedMax80mKPH": 37,
+     "windSpeedMax80mMPH": 23,
+     "windDirMin80m": "NNW",
+     "windDirMin80mDEG": 347,
+     "windSpeedMin80mKTS": 6,
+     "windSpeedMin80mKPH": 10,
+     "windSpeedMin80mMPH": 6,
+     "sky": 30,
+     "cloudsCoded": "FW",
+     "weather": "Mostly Sunny",
+     "weatherCoded": [],
+     "weatherPrimary": "Mostly Sunny",
+     "weatherPrimaryCoded": "::FW",
+     "icon": "fair.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": 6,
+     "solradWM2": 5486,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 742,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665114710,
+     "sunset": 1665156831,
+     "sunriseISO": "2022-10-07T05:51:50+02:00",
+     "sunsetISO": "2022-10-07T17:33:51+02:00"
+    },
+    {
+     "timestamp": 1665205200,
+     "validTime": "2022-10-08T07:00:00+02:00",
+     "dateTimeISO": "2022-10-08T07:00:00+02:00",
+     "maxTempC": 30,
+     "maxTempF": 87,
+     "minTempC": 19,
+     "minTempF": 66,
+     "avgTempC": 25,
+     "avgTempF": 76,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 30,
+     "maxFeelslikeF": 86,
+     "minFeelslikeC": 19,
+     "minFeelslikeF": 67,
+     "avgFeelslikeC": 25,
+     "avgFeelslikeF": 76,
+     "feelslikeC": 19,
+     "feelslikeF": 67,
+     "maxDewpointC": 15,
+     "maxDewpointF": 59,
+     "minDewpointC": 11,
+     "minDewpointF": 52,
+     "avgDewpointC": 13,
+     "avgDewpointF": 56,
+     "dewpointC": 15,
+     "dewpointF": 59,
+     "maxHumidity": 76,
+     "minHumidity": 32,
+     "humidity": 76,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1014,
+     "pressureIN": 29.94,
+     "windDir": "NNE",
+     "windDirDEG": 21,
+     "windSpeedKTS": 1,
+     "windSpeedKPH": 2,
+     "windSpeedMPH": 1,
+     "windGustKTS": 17,
+     "windGustKPH": 32,
+     "windGustMPH": 20,
+     "windDirMax": "WNW",
+     "windDirMaxDEG": 301,
+     "windSpeedMaxKTS": 7,
+     "windSpeedMaxKPH": 13,
+     "windSpeedMaxMPH": 8,
+     "windDirMin": "NNE",
+     "windDirMinDEG": 21,
+     "windSpeedMinKTS": 1,
+     "windSpeedMinKPH": 2,
+     "windSpeedMinMPH": 1,
+     "windDir80m": "NW",
+     "windDir80mDEG": 309,
+     "windSpeed80mKTS": 5,
+     "windSpeed80mKPH": 9,
+     "windSpeed80mMPH": 5,
+     "windGust80mKTS": 17,
+     "windGust80mKPH": 31,
+     "windGust80mMPH": 19,
+     "windDirMax80m": "NW",
+     "windDirMax80mDEG": 322,
+     "windSpeedMax80mKTS": 17,
+     "windSpeedMax80mKPH": 31,
+     "windSpeedMax80mMPH": 19,
+     "windDirMin80m": "NW",
+     "windDirMin80mDEG": 309,
+     "windSpeedMin80mKTS": 5,
+     "windSpeedMin80mKPH": 9,
+     "windSpeedMin80mMPH": 5,
+     "sky": 47,
+     "cloudsCoded": "SC",
+     "weather": "Partly Cloudy",
+     "weatherCoded": [],
+     "weatherPrimary": "Partly Cloudy",
+     "weatherPrimaryCoded": "::SC",
+     "icon": "pcloudy.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": 7,
+     "solradWM2": 4785,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 682,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665201146,
+     "sunset": 1665243161,
+     "sunriseISO": "2022-10-08T05:52:26+02:00",
+     "sunsetISO": "2022-10-08T17:32:41+02:00"
+    },
+    {
+     "timestamp": 1665291600,
+     "validTime": "2022-10-09T07:00:00+02:00",
+     "dateTimeISO": "2022-10-09T07:00:00+02:00",
+     "maxTempC": 31,
+     "maxTempF": 87,
+     "minTempC": 19,
+     "minTempF": 67,
+     "avgTempC": 25,
+     "avgTempF": 77,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 30,
+     "maxFeelslikeF": 86,
+     "minFeelslikeC": 20,
+     "minFeelslikeF": 67,
+     "avgFeelslikeC": 25,
+     "avgFeelslikeF": 77,
+     "feelslikeC": 20,
+     "feelslikeF": 67,
+     "maxDewpointC": 17,
+     "maxDewpointF": 63,
+     "minDewpointC": 11,
+     "minDewpointF": 52,
+     "avgDewpointC": 14,
+     "avgDewpointF": 57,
+     "dewpointC": 17,
+     "dewpointF": 63,
+     "maxHumidity": 86,
+     "minHumidity": 31,
+     "humidity": 86,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1016,
+     "pressureIN": 29.99,
+     "windDir": "N",
+     "windDirDEG": 356,
+     "windSpeedKTS": 2,
+     "windSpeedKPH": 4,
+     "windSpeedMPH": 2,
+     "windGustKTS": 19,
+     "windGustKPH": 36,
+     "windGustMPH": 22,
+     "windDirMax": "NNW",
+     "windDirMaxDEG": 343,
+     "windSpeedMaxKTS": 8,
+     "windSpeedMaxKPH": 14,
+     "windSpeedMaxMPH": 9,
+     "windDirMin": "N",
+     "windDirMinDEG": 356,
+     "windSpeedMinKTS": 2,
+     "windSpeedMinKPH": 4,
+     "windSpeedMinMPH": 2,
+     "windDir80m": "NW",
+     "windDir80mDEG": 316,
+     "windSpeed80mKTS": 5,
+     "windSpeed80mKPH": 9,
+     "windSpeed80mMPH": 6,
+     "windGust80mKTS": 20,
+     "windGust80mKPH": 36,
+     "windGust80mMPH": 23,
+     "windDirMax80m": "N",
+     "windDirMax80mDEG": 354,
+     "windSpeedMax80mKTS": 20,
+     "windSpeedMax80mKPH": 36,
+     "windSpeedMax80mMPH": 23,
+     "windDirMin80m": "NW",
+     "windDirMin80mDEG": 316,
+     "windSpeedMin80mKTS": 5,
+     "windSpeedMin80mKPH": 9,
+     "windSpeedMin80mMPH": 6,
+     "sky": 47,
+     "cloudsCoded": "SC",
+     "weather": "Partly Cloudy",
+     "weatherCoded": [],
+     "weatherPrimary": "Partly Cloudy",
+     "weatherPrimaryCoded": "::SC",
+     "icon": "pcloudy.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": 7,
+     "solradWM2": 4768,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 726,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665287583,
+     "sunset": 1665329491,
+     "sunriseISO": "2022-10-09T05:53:03+02:00",
+     "sunsetISO": "2022-10-09T17:31:31+02:00"
+    },
+    {
+     "timestamp": 1665378000,
+     "validTime": "2022-10-10T07:00:00+02:00",
+     "dateTimeISO": "2022-10-10T07:00:00+02:00",
+     "maxTempC": 31,
+     "maxTempF": 87,
+     "minTempC": 21,
+     "minTempF": 70,
+     "avgTempC": 26,
+     "avgTempF": 78,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 30,
+     "maxFeelslikeF": 86,
+     "minFeelslikeC": 21,
+     "minFeelslikeF": 69,
+     "avgFeelslikeC": 25,
+     "avgFeelslikeF": 78,
+     "feelslikeC": 21,
+     "feelslikeF": 69,
+     "maxDewpointC": 16,
+     "maxDewpointF": 61,
+     "minDewpointC": 13,
+     "minDewpointF": 55,
+     "avgDewpointC": 14,
+     "avgDewpointF": 58,
+     "dewpointC": 16,
+     "dewpointF": 61,
+     "maxHumidity": 75,
+     "minHumidity": 35,
+     "humidity": 75,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1017,
+     "pressureIN": 30.03,
+     "windDir": "N",
+     "windDirDEG": 358,
+     "windSpeedKTS": 2,
+     "windSpeedKPH": 4,
+     "windSpeedMPH": 2,
+     "windGustKTS": 16,
+     "windGustKPH": 30,
+     "windGustMPH": 19,
+     "windDirMax": "N",
+     "windDirMaxDEG": 10,
+     "windSpeedMaxKTS": 8,
+     "windSpeedMaxKPH": 15,
+     "windSpeedMaxMPH": 9,
+     "windDirMin": "N",
+     "windDirMinDEG": 358,
+     "windSpeedMinKTS": 2,
+     "windSpeedMinKPH": 4,
+     "windSpeedMinMPH": 2,
+     "windDir80m": "N",
+     "windDir80mDEG": 8,
+     "windSpeed80mKTS": 7,
+     "windSpeed80mKPH": 13,
+     "windSpeed80mMPH": 8,
+     "windGust80mKTS": 19,
+     "windGust80mKPH": 36,
+     "windGust80mMPH": 22,
+     "windDirMax80m": "N",
+     "windDirMax80mDEG": 10,
+     "windSpeedMax80mKTS": 19,
+     "windSpeedMax80mKPH": 36,
+     "windSpeedMax80mMPH": 22,
+     "windDirMin80m": "E",
+     "windDirMin80mDEG": 91,
+     "windSpeedMin80mKTS": 7,
+     "windSpeedMin80mKPH": 13,
+     "windSpeedMin80mMPH": 8,
+     "sky": 64,
+     "cloudsCoded": "SC",
+     "weather": "Partly Cloudy",
+     "weatherCoded": [],
+     "weatherPrimary": "Partly Cloudy",
+     "weatherPrimaryCoded": "::SC",
+     "icon": "pcloudy.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": 6,
+     "solradWM2": 4494,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 597,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665374020,
+     "sunset": 1665415821,
+     "sunriseISO": "2022-10-10T05:53:40+02:00",
+     "sunsetISO": "2022-10-10T17:30:21+02:00"
+    },
+    {
+     "timestamp": 1665464400,
+     "validTime": "2022-10-11T07:00:00+02:00",
+     "dateTimeISO": "2022-10-11T07:00:00+02:00",
+     "maxTempC": 31,
+     "maxTempF": 87,
+     "minTempC": 21,
+     "minTempF": 70,
+     "avgTempC": 26,
+     "avgTempF": 78,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 31,
+     "maxFeelslikeF": 87,
+     "minFeelslikeC": 22,
+     "minFeelslikeF": 72,
+     "avgFeelslikeC": 26,
+     "avgFeelslikeF": 79,
+     "feelslikeC": 22,
+     "feelslikeF": 72,
+     "maxDewpointC": 17,
+     "maxDewpointF": 62,
+     "minDewpointC": 11,
+     "minDewpointF": 51,
+     "avgDewpointC": 13,
+     "avgDewpointF": 55,
+     "dewpointC": 17,
+     "dewpointF": 62,
+     "maxHumidity": 71,
+     "minHumidity": 30,
+     "humidity": 71,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1015,
+     "pressureIN": 29.98,
+     "windDir": "NNE",
+     "windDirDEG": 13,
+     "windSpeedKTS": 8,
+     "windSpeedKPH": 15,
+     "windSpeedMPH": 9,
+     "windGustKTS": 15,
+     "windGustKPH": 28,
+     "windGustMPH": 17,
+     "windDirMax": "NNE",
+     "windDirMaxDEG": 28,
+     "windSpeedMaxKTS": 15,
+     "windSpeedMaxKPH": 28,
+     "windSpeedMaxMPH": 18,
+     "windDirMin": "NNE",
+     "windDirMinDEG": 14,
+     "windSpeedMinKTS": 7,
+     "windSpeedMinKPH": 14,
+     "windSpeedMinMPH": 8,
+     "windDir80m": "NNE",
+     "windDir80mDEG": 16,
+     "windSpeed80mKTS": 10,
+     "windSpeed80mKPH": 19,
+     "windSpeed80mMPH": 12,
+     "windGust80mKTS": 17,
+     "windGust80mKPH": 31,
+     "windGust80mMPH": 19,
+     "windDirMax80m": "NNE",
+     "windDirMax80mDEG": 28,
+     "windSpeedMax80mKTS": 17,
+     "windSpeedMax80mKPH": 31,
+     "windSpeedMax80mMPH": 19,
+     "windDirMin80m": "NNE",
+     "windDirMin80mDEG": 13,
+     "windSpeedMin80mKTS": 9,
+     "windSpeedMin80mKPH": 18,
+     "windSpeedMin80mMPH": 11,
+     "sky": 0,
+     "cloudsCoded": "CL",
+     "weather": "Sunny",
+     "weatherCoded": [],
+     "weatherPrimary": "Sunny",
+     "weatherPrimaryCoded": "::CL",
+     "icon": "sunny.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": null,
+     "solradWM2": 5450,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 758,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665460458,
+     "sunset": 1665502153,
+     "sunriseISO": "2022-10-11T05:54:18+02:00",
+     "sunsetISO": "2022-10-11T17:29:13+02:00"
+    },
+    {
+     "timestamp": 1665550800,
+     "validTime": "2022-10-12T07:00:00+02:00",
+     "dateTimeISO": "2022-10-12T07:00:00+02:00",
+     "maxTempC": 31,
+     "maxTempF": 88,
+     "minTempC": 21,
+     "minTempF": 69,
+     "avgTempC": 26,
+     "avgTempF": 79,
+     "tempC": null,
+     "tempF": null,
+     "maxFeelslikeC": 31,
+     "maxFeelslikeF": 88,
+     "minFeelslikeC": 22,
+     "minFeelslikeF": 72,
+     "avgFeelslikeC": 26,
+     "avgFeelslikeF": 80,
+     "feelslikeC": 22,
+     "feelslikeF": 72,
+     "maxDewpointC": 16,
+     "maxDewpointF": 60,
+     "minDewpointC": 11,
+     "minDewpointF": 51,
+     "avgDewpointC": 13,
+     "avgDewpointF": 55,
+     "dewpointC": 16,
+     "dewpointF": 60,
+     "maxHumidity": 68,
+     "minHumidity": 29,
+     "humidity": 68,
+     "pop": 0,
+     "precipMM": 0,
+     "precipIN": 0,
+     "iceaccum": null,
+     "iceaccumMM": null,
+     "iceaccumIN": null,
+     "snowCM": 0,
+     "snowIN": 0,
+     "pressureMB": 1014,
+     "pressureIN": 29.95,
+     "windDir": "NNE",
+     "windDirDEG": 12,
+     "windSpeedKTS": 8,
+     "windSpeedKPH": 15,
+     "windSpeedMPH": 9,
+     "windGustKTS": 15,
+     "windGustKPH": 28,
+     "windGustMPH": 17,
+     "windDirMax": "E",
+     "windDirMaxDEG": 96,
+     "windSpeedMaxKTS": 14,
+     "windSpeedMaxKPH": 26,
+     "windSpeedMaxMPH": 16,
+     "windDirMin": "NNE",
+     "windDirMinDEG": 12,
+     "windSpeedMinKTS": 7,
+     "windSpeedMinKPH": 13,
+     "windSpeedMinMPH": 8,
+     "windDir80m": "NNE",
+     "windDir80mDEG": 15,
+     "windSpeed80mKTS": 10,
+     "windSpeed80mKPH": 19,
+     "windSpeed80mMPH": 12,
+     "windGust80mKTS": 18,
+     "windGust80mKPH": 33,
+     "windGust80mMPH": 21,
+     "windDirMax80m": "E",
+     "windDirMax80mDEG": 96,
+     "windSpeedMax80mKTS": 18,
+     "windSpeedMax80mKPH": 33,
+     "windSpeedMax80mMPH": 21,
+     "windDirMin80m": "NNE",
+     "windDirMin80mDEG": 15,
+     "windSpeedMin80mKTS": 10,
+     "windSpeedMin80mKPH": 18,
+     "windSpeedMin80mMPH": 11,
+     "sky": 27,
+     "cloudsCoded": "FW",
+     "weather": "Mostly Sunny",
+     "weatherCoded": [],
+     "weatherPrimary": "Mostly Sunny",
+     "weatherPrimaryCoded": "::FW",
+     "icon": "fair.png",
+     "visibilityKM": 24.135,
+     "visibilityMI": 15,
+     "uvi": null,
+     "solradWM2": 4740,
+     "solradMinWM2": 0,
+     "solradMaxWM2": 743,
+     "isDay": true,
+     "maxCoverage": "",
+     "sunrise": 1665546895,
+     "sunset": 1665588484,
+     "sunriseISO": "2022-10-12T05:54:55+02:00",
+     "sunsetISO": "2022-10-12T17:28:04+02:00"
     }
-   ]
-  },
-  "overall_official": {
-   "role": "Principal Investigator",
-   "affiliation": "NYU School of Medicine",
-   "last_name": "Binita Shah, MD"
-  },
-  "overall_contact_backup": {
-   "last_name": "Binita Shah, MD"
-  },
-  "condition_browse": {
-   "mesh_term": [
-    "Myocardial Infarction",
-    "ST Elevation Myocardial Infarction",
-    "Infarction"
-   ]
-  },
-  "overall_contact": {
-   "phone": "646-501-9648",
-   "last_name": "Fatmira Curovic",
-   "email": "fatmira.curovic@nyumc.org"
-  },
-  "responsible_party": {
-   "responsible_party_type": "Principal Investigator",
-   "investigator_title": "Assistant Professor of Medicine",
-   "investigator_full_name": "Binita Shah",
-   "investigator_affiliation": "NYU Langone Health"
-  },
-  "study_first_submitted_qc": "March 12, 2019",
-  "start_date": {
-   "type": "Actual",
-   "content": "March 4, 2019"
-  },
-  "has_expanded_access": "No",
-  "study_first_posted": {
-   "type": "Actual",
-   "content": "March 14, 2019"
-  },
-  "arm_group": [
-   {
-    "arm_group_label": "Colchicine"
-   },
-   {
-    "arm_group_label": "Placebo"
-   }
-  ],
-  "primary_outcome": {
-   "measure": "soluble L-selectin",
-   "time_frame": "between baseline and 3 months",
-   "description": "Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups."
-  },
-  "secondary_outcome": [
-   {
-    "measure": "Other soluble markers of neutrophil activity",
-    "time_frame": "between baseline and 3 months",
-    "description": "Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)"
-   },
-   {
-    "measure": "Markers of systemic inflammation",
-    "time_frame": "between baseline and 3 months",
-    "description": "Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)"
-   },
-   {
-    "measure": "Neutrophil-driven responses that may further propagate injury",
-    "time_frame": "between baseline and 3 months",
-    "description": "Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)"
-   }
-  ],
-  "oversight_info": {
-   "is_fda_regulated_drug": "No",
-   "is_fda_regulated_device": "No",
-   "has_dmc": "No"
-  },
-  "last_update_posted": {
-   "type": "Actual",
-   "content": "September 12, 2019"
-  },
-  "id_info": {
-   "nct_id": "NCT03874338",
-   "org_study_id": "18-01323",
-   "secondary_id": "1R01HL146206"
-  },
-  "enrollment": {
-   "type": "Anticipated",
-   "content": "670"
-  },
-  "study_first_submitted": "March 12, 2019",
-  "condition": [
-   "Neutrophils.Hypersegmented | Bld-Ser-Plas",
-   "STEMI - ST Elevation Myocardial Infarction"
-  ],
-  "study_type": "Observational",
-  "required_header": {
-   "download_date": "ClinicalTrials.gov processed this data on July 19, 2020",
-   "link_text": "Link to the current ClinicalTrials.gov record.",
-   "url": "https://clinicaltrials.gov/show/NCT03874338"
-  },
-  "last_update_submitted": "September 10, 2019",
-  "completion_date": {
-   "type": "Anticipated",
-   "content": "February 1, 2022"
-  },
-  "location": {
-   "contact": {
-    "phone": "646-501-9648",
-    "last_name": "Fatmira Curovic",
-    "email": "fatmira.curovic@nyumc.org"
-   },
-   "facility": {
-    "address": {
-     "zip": "10016",
-     "country": "United States",
-     "city": "New York",
-     "state": "New York"
-    },
-    "name": "NYU School of Medicine"
-   },
-   "status": "Recruiting",
-   "contact_backup": {
-    "last_name": "Binita Shah, MD"
-   }
-  },
-  "intervention": {
-   "intervention_type": "Drug",
-   "arm_group_label": [
-    "Colchicine",
-    "Placebo"
    ],
-   "description": "Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.",
-   "intervention_name": "Colchicine Pill"
-  },
-  "patient_data": {
-   "sharing_ipd": "No"
-  },
-  "verification_date": "September 2019"
- }
+   "profile": {
+    "tz": "Africa/Cairo",
+    "elevM": 23,
+    "elevFT": 75
+   }
+  }
+ ]
 }
\ No newline at end of file
diff --git a/src/test/resources/Issue593.xml b/src/test/resources/Issue593.xml
index bf78f3b..0c6c038 100644
--- a/src/test/resources/Issue593.xml
+++ b/src/test/resources/Issue593.xml
@@ -1,169 +1,691 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<clinical_study>
-  <!-- This xml conforms to an XML Schema at:
-    https://clinicaltrials.gov/ct2/html/images/info/public.xsd -->
-  <required_header>
-    <download_date>ClinicalTrials.gov processed this data on July 19, 2020</download_date>
-    <link_text>Link to the current ClinicalTrials.gov record.</link_text>
-    <url>https://clinicaltrials.gov/show/NCT03874338</url>
-  </required_header>
-  <id_info>
-    <org_study_id>18-01323</org_study_id>
-    <secondary_id>1R01HL146206</secondary_id>
-    <nct_id>NCT03874338</nct_id>
-  </id_info>
-  <brief_title>CLEAR SYNERGY Neutrophil Substudy</brief_title>
-  <official_title>Studies on the Effects of Colchicine on Neutrophil Biology in Acute Myocardial Infarction: A Substudy of the CLEAR SYNERGY (OASIS 9) Trial</official_title>
-  <sponsors>
-    <lead_sponsor>
-      <agency>NYU Langone Health</agency>
-      <agency_class>Other</agency_class>
-    </lead_sponsor>
-    <collaborator>
-      <agency>Population Health Research Institute</agency>
-      <agency_class>Other</agency_class>
-    </collaborator>
-    <collaborator>
-      <agency>National Heart, Lung, and Blood Institute (NHLBI)</agency>
-      <agency_class>NIH</agency_class>
-    </collaborator>
-  </sponsors>
-  <source>NYU Langone Health</source>
-  <oversight_info>
-    <has_dmc>No</has_dmc>
-    <is_fda_regulated_drug>No</is_fda_regulated_drug>
-    <is_fda_regulated_device>No</is_fda_regulated_device>
-  </oversight_info>
-  <brief_summary>
-    <textblock>
-      CLEAR SYNERGY is an international multi center 2x2 randomized placebo controlled trial of
-    </textblock>
-  </brief_summary>
-  <overall_status>Recruiting</overall_status>
-  <start_date type="Actual">March 4, 2019</start_date>
-  <completion_date type="Anticipated">February 1, 2022</completion_date>
-  <primary_completion_date type="Anticipated">February 1, 2021</primary_completion_date>
-  <study_type>Observational</study_type>
-  <has_expanded_access>No</has_expanded_access>
-  <study_design_info>
-    <observational_model>Other</observational_model>
-    <time_perspective>Prospective</time_perspective>
-  </study_design_info>
-  <primary_outcome>
-    <measure>soluble L-selectin</measure>
-    <time_frame>between baseline and 3 months</time_frame>
-    <description>Change in soluble L-selectin between baseline and 3 mo after STEMI in the placebo vs. colchicine groups.</description>
-  </primary_outcome>
-  <secondary_outcome>
-    <measure>Other soluble markers of neutrophil activity</measure>
-    <time_frame>between baseline and 3 months</time_frame>
-    <description>Other markers of neutrophil activity will be evaluated at baseline and 3 months after STEMI (myeloperoxidase, matrix metalloproteinase-9, neutrophil gelatinase-associated lipocalin, neutrophil elastase, intercellular/vascular cellular adhesion molecules)</description>
-  </secondary_outcome>
-  <secondary_outcome>
-    <measure>Markers of systemic inflammation</measure>
-    <time_frame>between baseline and 3 months</time_frame>
-    <description>Markers of systemic inflammation will be evaluated at baseline and 3 months after STEMI (high sensitive CRP, IL-1β)</description>
-  </secondary_outcome>
-  <secondary_outcome>
-    <measure>Neutrophil-driven responses that may further propagate injury</measure>
-    <time_frame>between baseline and 3 months</time_frame>
-    <description>Neutrophil-driven responses that may further propagate injury will be evaluated at baseline and 3 months after STEMI (neutrophil extracellular traps, neutrophil-derived microparticles)</description>
-  </secondary_outcome>
-  <number_of_groups>2</number_of_groups>
-  <enrollment type="Anticipated">670</enrollment>
-  <condition>Neutrophils.Hypersegmented &#X7C; Bld-Ser-Plas</condition>
-  <condition>STEMI - ST Elevation Myocardial Infarction</condition>
-  <arm_group>
-    <arm_group_label>Colchicine</arm_group_label>
-  </arm_group>
-  <arm_group>
-    <arm_group_label>Placebo</arm_group_label>
-  </arm_group>
-  <intervention>
-    <intervention_type>Drug</intervention_type>
-    <intervention_name>Colchicine Pill</intervention_name>
-    <description>Participants in the main CLEAR SYNERGY trial are randomized to colchicine/spironolactone versus placebo in a 2x2 factorial design. The substudy is interested in the evaluation of biospecimens obtained from patients in the colchicine vs placebo group.</description>
-    <arm_group_label>Colchicine</arm_group_label>
-    <arm_group_label>Placebo</arm_group_label>
-  </intervention>
-  <eligibility>
-    <study_pop>
-      <textblock>
-        Patients who are randomized to the drug RCT portion of the CLEAR SYNERGY (OASIS 9) trial
-      </textblock>
-    </study_pop>
-    <sampling_method>Non-Probability Sample</sampling_method>
-    <criteria>
-      <textblock>
-        Inclusion Criteria:
-      </textblock>
-    </criteria>
-    <gender>All</gender>
-    <minimum_age>19 Years</minimum_age>
-    <maximum_age>110 Years</maximum_age>
-    <healthy_volunteers>No</healthy_volunteers>
-  </eligibility>
-  <overall_official>
-    <last_name>Binita Shah, MD</last_name>
-    <role>Principal Investigator</role>
-    <affiliation>NYU School of Medicine</affiliation>
-  </overall_official>
-  <overall_contact>
-    <last_name>Fatmira Curovic</last_name>
-    <phone>646-501-9648</phone>
-    <email>fatmira.curovic@nyumc.org</email>
-  </overall_contact>
-  <overall_contact_backup>
-    <last_name>Binita Shah, MD</last_name>
-  </overall_contact_backup>
-  <location>
-    <facility>
-      <name>NYU School of Medicine</name>
-      <address>
-        <city>New York</city>
-        <state>New York</state>
-        <zip>10016</zip>
-        <country>United States</country>
-      </address>
-    </facility>
-    <status>Recruiting</status>
-    <contact>
-      <last_name>Fatmira Curovic</last_name>
-      <phone>646-501-9648</phone>
-      <email>fatmira.curovic@nyumc.org</email>
-    </contact>
-    <contact_backup>
-      <last_name>Binita Shah, MD</last_name>
-    </contact_backup>
-  </location>
-  <location_countries>
-    <country>United States</country>
-  </location_countries>
-  <verification_date>September 2019</verification_date>
-  <study_first_submitted>March 12, 2019</study_first_submitted>
-  <study_first_submitted_qc>March 12, 2019</study_first_submitted_qc>
-  <study_first_posted type="Actual">March 14, 2019</study_first_posted>
-  <last_update_submitted>September 10, 2019</last_update_submitted>
-  <last_update_submitted_qc>September 10, 2019</last_update_submitted_qc>
-  <last_update_posted type="Actual">September 12, 2019</last_update_posted>
-  <responsible_party>
-    <responsible_party_type>Principal Investigator</responsible_party_type>
-    <investigator_affiliation>NYU Langone Health</investigator_affiliation>
-    <investigator_full_name>Binita Shah</investigator_full_name>
-    <investigator_title>Assistant Professor of Medicine</investigator_title>
-  </responsible_party>
-  <condition_browse>
-    <!-- CAUTION:  The following MeSH terms are assigned with an imperfect algorithm            -->
-    <mesh_term>Myocardial Infarction</mesh_term>
-    <mesh_term>ST Elevation Myocardial Infarction</mesh_term>
-    <mesh_term>Infarction</mesh_term>
-  </condition_browse>
-  <intervention_browse>
-    <!-- CAUTION:  The following MeSH terms are assigned with an imperfect algorithm            -->
-    <mesh_term>Colchicine</mesh_term>
-  </intervention_browse>
-  <patient_data>
-    <sharing_ipd>No</sharing_ipd>
-  </patient_data>
-  <!-- Results have not yet been posted for this study                                          -->
-</clinical_study>
+<success>true</success>
+<response>
+  <loc>
+    <long>31.25</long>
+    <lat>30.063</lat>
+  </loc>
+  <profile>
+    <elevM>23</elevM>
+    <tz>Africa/Cairo</tz>
+    <elevFT>75</elevFT>
+  </profile>
+  <periods>
+    <dateTimeISO>2022-10-06T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>E</windDirMin80m>
+    <windDirMin80mDEG>95</windDirMin80mDEG>
+    <feelslikeC>21</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>10</windSpeedMaxMPH>
+    <windDirDEG>353</windDirDEG>
+    <windDir>N</windDir>
+    <sunriseISO>2022-10-06T05:51:14+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>9</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>66</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Mostly Sunny</weather>
+    <sunsetISO>2022-10-06T17:35:02+02:00</sunsetISO>
+    <maxFeelslikeC>32</maxFeelslikeC>
+    <humidity>77</humidity>
+    <windDir80m>N</windDir80m>
+    <maxFeelslikeF>89</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>22</sky>
+    <windGust80mMPH>25</windGust80mMPH>
+    <windSpeedMax80mMPH>25</windSpeedMax80mMPH>
+    <weatherPrimary>Mostly Sunny</weatherPrimary>
+    <windGust80mKPH>41</windGust80mKPH>
+    <avgDewpointF>58</avgDewpointF>
+    <windSpeedMax80mKPH>41</windSpeedMax80mKPH>
+    <windGust80mKTS>22</windGust80mKTS>
+    <avgDewpointC>14</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>22</windSpeedMax80mKTS>
+    <windDirMinDEG>353</windDirMinDEG>
+    <windSpeedMaxKPH>16</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>8</windSpeedMin80mKTS>
+    <feelslikeF>70</feelslikeF>
+    <validTime>2022-10-06T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>10</windSpeedMin80mMPH>
+    <solradMaxWM2>778</solradMaxWM2>
+    <avgTempC>25</avgTempC>
+    <windSpeedMin80mKPH>15</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>
+    <sunrise>1665028274</sunrise>
+    <avgTempF>78</avgTempF>
+    <windDirMin>N</windDirMin>
+    <maxCoverage/>
+    <icon>fair.png</icon>
+    <minFeelslikeC>21</minFeelslikeC>
+    <dewpointC>17</dewpointC>
+    <cloudsCoded>FW</cloudsCoded>
+    <minFeelslikeF>70</minFeelslikeF>
+    <minHumidity>29</minHumidity>
+    <dewpointF>63</dewpointF>
+    <windSpeed80mKTS>12</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>NNW</windDirMax>
+    <windSpeed80mMPH>13</windSpeed80mMPH>
+    <windSpeed80mKPH>22</windSpeed80mKPH>
+    <windDir80mDEG>11</windDir80mDEG>
+    <maxTempC>32</maxTempC>
+    <pressureMB>1015</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665032400</timestamp>
+    <maxTempF>90</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>11</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>1</windSpeedMinKTS>
+    <windDirMax80mDEG>343</windDirMax80mDEG>
+    <windGustKTS>21</windGustKTS>
+    <windSpeedMinKPH>2</windSpeedMinKPH>
+    <maxDewpointF>63</maxDewpointF>
+    <windSpeedMinMPH>1</windSpeedMinMPH>
+    <avgFeelslikeC>26</avgFeelslikeC>
+    <uvi>6</uvi>
+    <windDirMax80m>NNW</windDirMax80m>
+    <maxDewpointC>17</maxDewpointC>
+    <pressureIN>29.97</pressureIN>
+    <avgFeelslikeF>80</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>19</minTempC>
+    <minDewpointF>52</minDewpointF>
+    <windSpeedKTS>5</windSpeedKTS>
+    <sunset>1665070502</sunset>
+    <solradWM2>5608</solradWM2>
+    <windSpeedKPH>9</windSpeedKPH>
+    <windGustMPH>25</windGustMPH>
+    <maxHumidity>77</maxHumidity>
+    <windSpeedMPH>6</windSpeedMPH>
+    <windGustKPH>40</windGustKPH>
+    <windDirMaxDEG>342</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-07T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>NNW</windDirMin80m>
+    <windDirMin80mDEG>347</windDirMin80mDEG>
+    <feelslikeC>19</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>8</windSpeedMaxMPH>
+    <windDirDEG>325</windDirDEG>
+    <windDir>NW</windDir>
+    <sunriseISO>2022-10-07T05:51:50+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>7</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>66</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Mostly Sunny</weather>
+    <sunsetISO>2022-10-07T17:33:51+02:00</sunsetISO>
+    <maxFeelslikeC>29</maxFeelslikeC>
+    <humidity>77</humidity>
+    <windDir80m>NNW</windDir80m>
+    <maxFeelslikeF>85</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>30</sky>
+    <windGust80mMPH>23</windGust80mMPH>
+    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>
+    <weatherPrimary>Mostly Sunny</weatherPrimary>
+    <windGust80mKPH>37</windGust80mKPH>
+    <avgDewpointF>54</avgDewpointF>
+    <windSpeedMax80mKPH>37</windSpeedMax80mKPH>
+    <windGust80mKTS>20</windGust80mKTS>
+    <avgDewpointC>12</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>
+    <windDirMinDEG>325</windDirMinDEG>
+    <windSpeedMaxKPH>13</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>6</windSpeedMin80mKTS>
+    <feelslikeF>67</feelslikeF>
+    <validTime>2022-10-07T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>
+    <solradMaxWM2>742</solradMaxWM2>
+    <avgTempC>24</avgTempC>
+    <windSpeedMin80mKPH>10</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>
+    <sunrise>1665114710</sunrise>
+    <avgTempF>76</avgTempF>
+    <windDirMin>NW</windDirMin>
+    <maxCoverage/>
+    <icon>fair.png</icon>
+    <minFeelslikeC>19</minFeelslikeC>
+    <dewpointC>15</dewpointC>
+    <cloudsCoded>FW</cloudsCoded>
+    <minFeelslikeF>67</minFeelslikeF>
+    <minHumidity>30</minHumidity>
+    <dewpointF>60</dewpointF>
+    <windSpeed80mKTS>6</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>WNW</windDirMax>
+    <windSpeed80mMPH>6</windSpeed80mMPH>
+    <windSpeed80mKPH>10</windSpeed80mKPH>
+    <windDir80mDEG>347</windDir80mDEG>
+    <maxTempC>30</maxTempC>
+    <pressureMB>1014</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665118800</timestamp>
+    <maxTempF>86</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>10</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>1</windSpeedMinKTS>
+    <windDirMax80mDEG>316</windDirMax80mDEG>
+    <windGustKTS>16</windGustKTS>
+    <windSpeedMinKPH>2</windSpeedMinKPH>
+    <maxDewpointF>60</maxDewpointF>
+    <windSpeedMinMPH>1</windSpeedMinMPH>
+    <avgFeelslikeC>24</avgFeelslikeC>
+    <uvi>6</uvi>
+    <windDirMax80m>NW</windDirMax80m>
+    <maxDewpointC>15</maxDewpointC>
+    <pressureIN>29.95</pressureIN>
+    <avgFeelslikeF>76</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>19</minTempC>
+    <minDewpointF>50</minDewpointF>
+    <windSpeedKTS>1</windSpeedKTS>
+    <sunset>1665156831</sunset>
+    <solradWM2>5486</solradWM2>
+    <windSpeedKPH>2</windSpeedKPH>
+    <windGustMPH>18</windGustMPH>
+    <maxHumidity>77</maxHumidity>
+    <windSpeedMPH>1</windSpeedMPH>
+    <windGustKPH>29</windGustKPH>
+    <windDirMaxDEG>298</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-08T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>NW</windDirMin80m>
+    <windDirMin80mDEG>309</windDirMin80mDEG>
+    <feelslikeC>19</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>8</windSpeedMaxMPH>
+    <windDirDEG>21</windDirDEG>
+    <windDir>NNE</windDir>
+    <sunriseISO>2022-10-08T05:52:26+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>7</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>66</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Partly Cloudy</weather>
+    <sunsetISO>2022-10-08T17:32:41+02:00</sunsetISO>
+    <maxFeelslikeC>30</maxFeelslikeC>
+    <humidity>76</humidity>
+    <windDir80m>NW</windDir80m>
+    <maxFeelslikeF>86</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>47</sky>
+    <windGust80mMPH>19</windGust80mMPH>
+    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>
+    <weatherPrimary>Partly Cloudy</weatherPrimary>
+    <windGust80mKPH>31</windGust80mKPH>
+    <avgDewpointF>56</avgDewpointF>
+    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>
+    <windGust80mKTS>17</windGust80mKTS>
+    <avgDewpointC>13</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>
+    <windDirMinDEG>21</windDirMinDEG>
+    <windSpeedMaxKPH>13</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>
+    <feelslikeF>67</feelslikeF>
+    <validTime>2022-10-08T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>5</windSpeedMin80mMPH>
+    <solradMaxWM2>682</solradMaxWM2>
+    <avgTempC>25</avgTempC>
+    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>
+    <sunrise>1665201146</sunrise>
+    <avgTempF>76</avgTempF>
+    <windDirMin>NNE</windDirMin>
+    <maxCoverage/>
+    <icon>pcloudy.png</icon>
+    <minFeelslikeC>19</minFeelslikeC>
+    <dewpointC>15</dewpointC>
+    <cloudsCoded>SC</cloudsCoded>
+    <minFeelslikeF>67</minFeelslikeF>
+    <minHumidity>32</minHumidity>
+    <dewpointF>59</dewpointF>
+    <windSpeed80mKTS>5</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>WNW</windDirMax>
+    <windSpeed80mMPH>5</windSpeed80mMPH>
+    <windSpeed80mKPH>9</windSpeed80mKPH>
+    <windDir80mDEG>309</windDir80mDEG>
+    <maxTempC>30</maxTempC>
+    <pressureMB>1014</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665205200</timestamp>
+    <maxTempF>87</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>11</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>1</windSpeedMinKTS>
+    <windDirMax80mDEG>322</windDirMax80mDEG>
+    <windGustKTS>17</windGustKTS>
+    <windSpeedMinKPH>2</windSpeedMinKPH>
+    <maxDewpointF>59</maxDewpointF>
+    <windSpeedMinMPH>1</windSpeedMinMPH>
+    <avgFeelslikeC>25</avgFeelslikeC>
+    <uvi>7</uvi>
+    <windDirMax80m>NW</windDirMax80m>
+    <maxDewpointC>15</maxDewpointC>
+    <pressureIN>29.94</pressureIN>
+    <avgFeelslikeF>76</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>19</minTempC>
+    <minDewpointF>52</minDewpointF>
+    <windSpeedKTS>1</windSpeedKTS>
+    <sunset>1665243161</sunset>
+    <solradWM2>4785</solradWM2>
+    <windSpeedKPH>2</windSpeedKPH>
+    <windGustMPH>20</windGustMPH>
+    <maxHumidity>76</maxHumidity>
+    <windSpeedMPH>1</windSpeedMPH>
+    <windGustKPH>32</windGustKPH>
+    <windDirMaxDEG>301</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-09T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>NW</windDirMin80m>
+    <windDirMin80mDEG>316</windDirMin80mDEG>
+    <feelslikeC>20</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>9</windSpeedMaxMPH>
+    <windDirDEG>356</windDirDEG>
+    <windDir>N</windDir>
+    <sunriseISO>2022-10-09T05:53:03+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>8</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>67</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Partly Cloudy</weather>
+    <sunsetISO>2022-10-09T17:31:31+02:00</sunsetISO>
+    <maxFeelslikeC>30</maxFeelslikeC>
+    <humidity>86</humidity>
+    <windDir80m>NW</windDir80m>
+    <maxFeelslikeF>86</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>47</sky>
+    <windGust80mMPH>23</windGust80mMPH>
+    <windSpeedMax80mMPH>23</windSpeedMax80mMPH>
+    <weatherPrimary>Partly Cloudy</weatherPrimary>
+    <windGust80mKPH>36</windGust80mKPH>
+    <avgDewpointF>57</avgDewpointF>
+    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>
+    <windGust80mKTS>20</windGust80mKTS>
+    <avgDewpointC>14</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>20</windSpeedMax80mKTS>
+    <windDirMinDEG>356</windDirMinDEG>
+    <windSpeedMaxKPH>14</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>5</windSpeedMin80mKTS>
+    <feelslikeF>67</feelslikeF>
+    <validTime>2022-10-09T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>6</windSpeedMin80mMPH>
+    <solradMaxWM2>726</solradMaxWM2>
+    <avgTempC>25</avgTempC>
+    <windSpeedMin80mKPH>9</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>
+    <sunrise>1665287583</sunrise>
+    <avgTempF>77</avgTempF>
+    <windDirMin>N</windDirMin>
+    <maxCoverage/>
+    <icon>pcloudy.png</icon>
+    <minFeelslikeC>20</minFeelslikeC>
+    <dewpointC>17</dewpointC>
+    <cloudsCoded>SC</cloudsCoded>
+    <minFeelslikeF>67</minFeelslikeF>
+    <minHumidity>31</minHumidity>
+    <dewpointF>63</dewpointF>
+    <windSpeed80mKTS>5</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>NNW</windDirMax>
+    <windSpeed80mMPH>6</windSpeed80mMPH>
+    <windSpeed80mKPH>9</windSpeed80mKPH>
+    <windDir80mDEG>316</windDir80mDEG>
+    <maxTempC>31</maxTempC>
+    <pressureMB>1016</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665291600</timestamp>
+    <maxTempF>87</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>11</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>2</windSpeedMinKTS>
+    <windDirMax80mDEG>354</windDirMax80mDEG>
+    <windGustKTS>19</windGustKTS>
+    <windSpeedMinKPH>4</windSpeedMinKPH>
+    <maxDewpointF>63</maxDewpointF>
+    <windSpeedMinMPH>2</windSpeedMinMPH>
+    <avgFeelslikeC>25</avgFeelslikeC>
+    <uvi>7</uvi>
+    <windDirMax80m>N</windDirMax80m>
+    <maxDewpointC>17</maxDewpointC>
+    <pressureIN>29.99</pressureIN>
+    <avgFeelslikeF>77</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>19</minTempC>
+    <minDewpointF>52</minDewpointF>
+    <windSpeedKTS>2</windSpeedKTS>
+    <sunset>1665329491</sunset>
+    <solradWM2>4768</solradWM2>
+    <windSpeedKPH>4</windSpeedKPH>
+    <windGustMPH>22</windGustMPH>
+    <maxHumidity>86</maxHumidity>
+    <windSpeedMPH>2</windSpeedMPH>
+    <windGustKPH>36</windGustKPH>
+    <windDirMaxDEG>343</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-10T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>E</windDirMin80m>
+    <windDirMin80mDEG>91</windDirMin80mDEG>
+    <feelslikeC>21</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>9</windSpeedMaxMPH>
+    <windDirDEG>358</windDirDEG>
+    <windDir>N</windDir>
+    <sunriseISO>2022-10-10T05:53:40+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>8</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>70</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Partly Cloudy</weather>
+    <sunsetISO>2022-10-10T17:30:21+02:00</sunsetISO>
+    <maxFeelslikeC>30</maxFeelslikeC>
+    <humidity>75</humidity>
+    <windDir80m>N</windDir80m>
+    <maxFeelslikeF>86</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>64</sky>
+    <windGust80mMPH>22</windGust80mMPH>
+    <windSpeedMax80mMPH>22</windSpeedMax80mMPH>
+    <weatherPrimary>Partly Cloudy</weatherPrimary>
+    <windGust80mKPH>36</windGust80mKPH>
+    <avgDewpointF>58</avgDewpointF>
+    <windSpeedMax80mKPH>36</windSpeedMax80mKPH>
+    <windGust80mKTS>19</windGust80mKTS>
+    <avgDewpointC>14</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>19</windSpeedMax80mKTS>
+    <windDirMinDEG>358</windDirMinDEG>
+    <windSpeedMaxKPH>15</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>7</windSpeedMin80mKTS>
+    <feelslikeF>69</feelslikeF>
+    <validTime>2022-10-10T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>8</windSpeedMin80mMPH>
+    <solradMaxWM2>597</solradMaxWM2>
+    <avgTempC>26</avgTempC>
+    <windSpeedMin80mKPH>13</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::SC</weatherPrimaryCoded>
+    <sunrise>1665374020</sunrise>
+    <avgTempF>78</avgTempF>
+    <windDirMin>N</windDirMin>
+    <maxCoverage/>
+    <icon>pcloudy.png</icon>
+    <minFeelslikeC>21</minFeelslikeC>
+    <dewpointC>16</dewpointC>
+    <cloudsCoded>SC</cloudsCoded>
+    <minFeelslikeF>69</minFeelslikeF>
+    <minHumidity>35</minHumidity>
+    <dewpointF>61</dewpointF>
+    <windSpeed80mKTS>7</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>N</windDirMax>
+    <windSpeed80mMPH>8</windSpeed80mMPH>
+    <windSpeed80mKPH>13</windSpeed80mKPH>
+    <windDir80mDEG>8</windDir80mDEG>
+    <maxTempC>31</maxTempC>
+    <pressureMB>1017</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665378000</timestamp>
+    <maxTempF>87</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>13</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>2</windSpeedMinKTS>
+    <windDirMax80mDEG>10</windDirMax80mDEG>
+    <windGustKTS>16</windGustKTS>
+    <windSpeedMinKPH>4</windSpeedMinKPH>
+    <maxDewpointF>61</maxDewpointF>
+    <windSpeedMinMPH>2</windSpeedMinMPH>
+    <avgFeelslikeC>25</avgFeelslikeC>
+    <uvi>6</uvi>
+    <windDirMax80m>N</windDirMax80m>
+    <maxDewpointC>16</maxDewpointC>
+    <pressureIN>30.03</pressureIN>
+    <avgFeelslikeF>78</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>21</minTempC>
+    <minDewpointF>55</minDewpointF>
+    <windSpeedKTS>2</windSpeedKTS>
+    <sunset>1665415821</sunset>
+    <solradWM2>4494</solradWM2>
+    <windSpeedKPH>4</windSpeedKPH>
+    <windGustMPH>19</windGustMPH>
+    <maxHumidity>75</maxHumidity>
+    <windSpeedMPH>2</windSpeedMPH>
+    <windGustKPH>30</windGustKPH>
+    <windDirMaxDEG>10</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-11T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>NNE</windDirMin80m>
+    <windDirMin80mDEG>13</windDirMin80mDEG>
+    <feelslikeC>22</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>18</windSpeedMaxMPH>
+    <windDirDEG>13</windDirDEG>
+    <windDir>NNE</windDir>
+    <sunriseISO>2022-10-11T05:54:18+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>15</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>70</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Sunny</weather>
+    <sunsetISO>2022-10-11T17:29:13+02:00</sunsetISO>
+    <maxFeelslikeC>31</maxFeelslikeC>
+    <humidity>71</humidity>
+    <windDir80m>NNE</windDir80m>
+    <maxFeelslikeF>87</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>0</sky>
+    <windGust80mMPH>19</windGust80mMPH>
+    <windSpeedMax80mMPH>19</windSpeedMax80mMPH>
+    <weatherPrimary>Sunny</weatherPrimary>
+    <windGust80mKPH>31</windGust80mKPH>
+    <avgDewpointF>55</avgDewpointF>
+    <windSpeedMax80mKPH>31</windSpeedMax80mKPH>
+    <windGust80mKTS>17</windGust80mKTS>
+    <avgDewpointC>13</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>17</windSpeedMax80mKTS>
+    <windDirMinDEG>14</windDirMinDEG>
+    <windSpeedMaxKPH>28</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>9</windSpeedMin80mKTS>
+    <feelslikeF>72</feelslikeF>
+    <validTime>2022-10-11T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>
+    <solradMaxWM2>758</solradMaxWM2>
+    <avgTempC>26</avgTempC>
+    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::CL</weatherPrimaryCoded>
+    <sunrise>1665460458</sunrise>
+    <avgTempF>78</avgTempF>
+    <windDirMin>NNE</windDirMin>
+    <maxCoverage/>
+    <icon>sunny.png</icon>
+    <minFeelslikeC>22</minFeelslikeC>
+    <dewpointC>17</dewpointC>
+    <cloudsCoded>CL</cloudsCoded>
+    <minFeelslikeF>72</minFeelslikeF>
+    <minHumidity>30</minHumidity>
+    <dewpointF>62</dewpointF>
+    <windSpeed80mKTS>10</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>NNE</windDirMax>
+    <windSpeed80mMPH>12</windSpeed80mMPH>
+    <windSpeed80mKPH>19</windSpeed80mKPH>
+    <windDir80mDEG>16</windDir80mDEG>
+    <maxTempC>31</maxTempC>
+    <pressureMB>1015</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665464400</timestamp>
+    <maxTempF>87</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>11</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>7</windSpeedMinKTS>
+    <windDirMax80mDEG>28</windDirMax80mDEG>
+    <windGustKTS>15</windGustKTS>
+    <windSpeedMinKPH>14</windSpeedMinKPH>
+    <maxDewpointF>62</maxDewpointF>
+    <windSpeedMinMPH>8</windSpeedMinMPH>
+    <avgFeelslikeC>26</avgFeelslikeC>
+    <uvi>null</uvi>
+    <windDirMax80m>NNE</windDirMax80m>
+    <maxDewpointC>17</maxDewpointC>
+    <pressureIN>29.98</pressureIN>
+    <avgFeelslikeF>79</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>21</minTempC>
+    <minDewpointF>51</minDewpointF>
+    <windSpeedKTS>8</windSpeedKTS>
+    <sunset>1665502153</sunset>
+    <solradWM2>5450</solradWM2>
+    <windSpeedKPH>15</windSpeedKPH>
+    <windGustMPH>17</windGustMPH>
+    <maxHumidity>71</maxHumidity>
+    <windSpeedMPH>9</windSpeedMPH>
+    <windGustKPH>28</windGustKPH>
+    <windDirMaxDEG>28</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <periods>
+    <dateTimeISO>2022-10-12T07:00:00+02:00</dateTimeISO>
+    <windDirMin80m>NNE</windDirMin80m>
+    <windDirMin80mDEG>15</windDirMin80mDEG>
+    <feelslikeC>22</feelslikeC>
+    <visibilityMI>15</visibilityMI>
+    <windSpeedMaxMPH>16</windSpeedMaxMPH>
+    <windDirDEG>12</windDirDEG>
+    <windDir>NNE</windDir>
+    <sunriseISO>2022-10-12T05:54:55+02:00</sunriseISO>
+    <iceaccumMM>null</iceaccumMM>
+    <windSpeedMaxKTS>14</windSpeedMaxKTS>
+    <iceaccumIN>null</iceaccumIN>
+    <minTempF>69</minTempF>
+    <snowIN>0</snowIN>
+    <weather>Mostly Sunny</weather>
+    <sunsetISO>2022-10-12T17:28:04+02:00</sunsetISO>
+    <maxFeelslikeC>31</maxFeelslikeC>
+    <humidity>68</humidity>
+    <windDir80m>NNE</windDir80m>
+    <maxFeelslikeF>88</maxFeelslikeF>
+    <precipMM>0</precipMM>
+    <sky>27</sky>
+    <windGust80mMPH>21</windGust80mMPH>
+    <windSpeedMax80mMPH>21</windSpeedMax80mMPH>
+    <weatherPrimary>Mostly Sunny</weatherPrimary>
+    <windGust80mKPH>33</windGust80mKPH>
+    <avgDewpointF>55</avgDewpointF>
+    <windSpeedMax80mKPH>33</windSpeedMax80mKPH>
+    <windGust80mKTS>18</windGust80mKTS>
+    <avgDewpointC>13</avgDewpointC>
+    <precipIN>0</precipIN>
+    <windSpeedMax80mKTS>18</windSpeedMax80mKTS>
+    <windDirMinDEG>12</windDirMinDEG>
+    <windSpeedMaxKPH>26</windSpeedMaxKPH>
+    <windSpeedMin80mKTS>10</windSpeedMin80mKTS>
+    <feelslikeF>72</feelslikeF>
+    <validTime>2022-10-12T07:00:00+02:00</validTime>
+    <windSpeedMin80mMPH>11</windSpeedMin80mMPH>
+    <solradMaxWM2>743</solradMaxWM2>
+    <avgTempC>26</avgTempC>
+    <windSpeedMin80mKPH>18</windSpeedMin80mKPH>
+    <weatherPrimaryCoded>::FW</weatherPrimaryCoded>
+    <sunrise>1665546895</sunrise>
+    <avgTempF>79</avgTempF>
+    <windDirMin>NNE</windDirMin>
+    <maxCoverage/>
+    <icon>fair.png</icon>
+    <minFeelslikeC>22</minFeelslikeC>
+    <dewpointC>16</dewpointC>
+    <cloudsCoded>FW</cloudsCoded>
+    <minFeelslikeF>72</minFeelslikeF>
+    <minHumidity>29</minHumidity>
+    <dewpointF>60</dewpointF>
+    <windSpeed80mKTS>10</windSpeed80mKTS>
+    <pop>0</pop>
+    <snowCM>0</snowCM>
+    <windDirMax>E</windDirMax>
+    <windSpeed80mMPH>12</windSpeed80mMPH>
+    <windSpeed80mKPH>19</windSpeed80mKPH>
+    <windDir80mDEG>15</windDir80mDEG>
+    <maxTempC>31</maxTempC>
+    <pressureMB>1014</pressureMB>
+    <visibilityKM>24.135</visibilityKM>
+    <timestamp>1665550800</timestamp>
+    <maxTempF>88</maxTempF>
+    <tempF>null</tempF>
+    <minDewpointC>11</minDewpointC>
+    <solradMinWM2>0</solradMinWM2>
+    <windSpeedMinKTS>7</windSpeedMinKTS>
+    <windDirMax80mDEG>96</windDirMax80mDEG>
+    <windGustKTS>15</windGustKTS>
+    <windSpeedMinKPH>13</windSpeedMinKPH>
+    <maxDewpointF>60</maxDewpointF>
+    <windSpeedMinMPH>8</windSpeedMinMPH>
+    <avgFeelslikeC>26</avgFeelslikeC>
+    <uvi>null</uvi>
+    <windDirMax80m>E</windDirMax80m>
+    <maxDewpointC>16</maxDewpointC>
+    <pressureIN>29.95</pressureIN>
+    <avgFeelslikeF>80</avgFeelslikeF>
+    <iceaccum>null</iceaccum>
+    <isDay>true</isDay>
+    <minTempC>21</minTempC>
+    <minDewpointF>51</minDewpointF>
+    <windSpeedKTS>8</windSpeedKTS>
+    <sunset>1665588484</sunset>
+    <solradWM2>4740</solradWM2>
+    <windSpeedKPH>15</windSpeedKPH>
+    <windGustMPH>17</windGustMPH>
+    <maxHumidity>68</maxHumidity>
+    <windSpeedMPH>9</windSpeedMPH>
+    <windGustKPH>28</windGustKPH>
+    <windDirMaxDEG>96</windDirMaxDEG>
+    <tempC>null</tempC>
+  </periods>
+  <interval>day</interval>
+  <place>
+    <country>eg</country>
+    <name>cairo</name>
+    <state>qh</state>
+  </place>
+</response>
+<error>null</error>

From a2c0562e04badc81259cf1d703a52aba7965b464 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Fri, 7 Oct 2022 15:04:09 +0100
Subject: [PATCH 083/212] Removed unused import

---
 src/test/java/org/json/junit/XMLTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 4c46cf1..bfb916c 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -18,7 +18,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 

From 9cb8e153bf38e12554455d13c5c8e7c348236a98 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Fri, 7 Oct 2022 17:57:07 +0100
Subject: [PATCH 084/212] Added JavaDocs

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

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 28a292f..bb614d4 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -755,6 +755,23 @@ public class XML {
         return toString(object, tagName, config, 0, 0);
     }
 
+    /**
+     * Convert a JSONObject into a well-formed, element-normal XML string,
+     * either pretty print or single-lined depending on indent factor.
+     *
+     * @param object
+     *            A JSONObject.
+     * @param tagName
+     *            The optional name of the enclosing tag.
+     * @param config
+     *            Configuration that can control output to XML.
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
+     * @param indent
+     *            The current ident level in spaces.
+     * @return
+     * @throws JSONException
+     */
     private static String toString(final Object object, final String tagName, final XMLParserConfiguration config, int indentFactor, int indent)
             throws JSONException {
         StringBuilder sb = new StringBuilder();
@@ -934,6 +951,13 @@ public class XML {
         return toString(object, tagName, config, indentFactor, 0);
     }
 
+    /**
+     * Return a String consisting of a number of space characters specified by indent
+     *
+     * @param indent
+     *          The number of spaces to be appended to the String.
+     * @return
+     */
     private static final String indent(int indent) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < indent; i++) {

From 7aba3ac941701aad36e70d3ae3c77780aeae73ec Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Mon, 10 Oct 2022 11:09:42 +0100
Subject: [PATCH 085/212] System line seperator now being used in JUnit test

---
 src/test/java/org/json/junit/XMLTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index bfb916c..88ea9ce 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1232,7 +1232,7 @@ public class XMLTest {
                     for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
                         expected.append(buffer, 0, numRead);
                     }
-                    assertEquals(expected.toString(), actualString);
+                    assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.getProperty("line.separator")), actualString);
                 } finally {
                     if (xmlStream != null) {
                         xmlStream.close();

From 85495facbd4a9e2e13f6ef50a35a4b35535c96b5 Mon Sep 17 00:00:00 2001
From: Dean <dean.kane@opencastsoftware.com>
Date: Mon, 10 Oct 2022 11:12:35 +0100
Subject: [PATCH 086/212] Corrected test

---
 src/test/java/org/json/junit/XMLTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 88ea9ce..937658e 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1232,7 +1232,7 @@ public class XMLTest {
                     for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
                         expected.append(buffer, 0, numRead);
                     }
-                    assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.getProperty("line.separator")), actualString);
+                    assertEquals(expected.toString(), actualString.replaceAll("\\n|\\r\\n", System.getProperty("line.separator")));
                 } finally {
                     if (xmlStream != null) {
                         xmlStream.close();

From a2d3d3c9b5dca8359ca6aca2662f3b1b5f023982 Mon Sep 17 00:00:00 2001
From: Bharati Kulkarni <bmk15897@gmail.com>
Date: Tue, 11 Oct 2022 14:33:43 -0500
Subject: [PATCH 087/212] Fix Flaky Test

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

diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index d88803e..45c7dbd 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -72,8 +72,10 @@ public class JSONPointerTest {
 
     @Test
     public void queryByEmptyKeySubObject() {
-        assertEquals( "{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some" +
-                " other value\"}", query("/obj/").toString());
+        JSONObject json = new JSONObject("{\"\":\"empty key of an object with an empty key\",\"subKey\":\"Some" +
+                " other value\"}");
+        JSONObject obj = (JSONObject) query("/obj/");
+        assertTrue(json.similar(obj));
     }
 
     @Test

From 23d5e52a53b2b10825fbd42d2323285d6e84bb05 Mon Sep 17 00:00:00 2001
From: unknown <tomerpacific@gmail.com>
Date: Fri, 28 Oct 2022 08:45:54 +0300
Subject: [PATCH 088/212] feature/update-release-for-JSONMap-Change adding
 breaking change for JSONMap to corresponding release

---
 docs/RELEASES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 0d49331..3fbab78 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -20,6 +20,7 @@ and artifactId "json". For example:
 20190722    Recent commits
 
 20180813    POM change to include Automatic-Module-Name (#431)
+            JSONObject(Map) now throws an exception if any of a map keys are null (#405)
 
 20180130    Recent commits
 

From c798c76ddd46d79140c27ecb15146c588ea34945 Mon Sep 17 00:00:00 2001
From: Niranjani <niranjani_b@live.com>
Date: Sun, 30 Oct 2022 22:10:38 +0530
Subject: [PATCH 089/212] move javadoc comments above the interface definition
 to make it visible

Fix #670
---
 src/main/java/org/json/JSONPropertyIgnore.java | 6 +++---
 src/main/java/org/json/JSONPropertyName.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/org/json/JSONPropertyIgnore.java
index 7c5fa53..d3a5bc5 100644
--- a/src/main/java/org/json/JSONPropertyIgnore.java
+++ b/src/main/java/org/json/JSONPropertyIgnore.java
@@ -11,13 +11,13 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-@Documented
-@Retention(RUNTIME)
-@Target({METHOD})
 /**
  * Use this annotation on a getter method to override the Bean name
  * parser for Bean -&gt; JSONObject mapping. If this annotation is
  * present at any level in the class hierarchy, then the method will
  * not be serialized from the bean into the JSONObject.
  */
+@Documented
+@Retention(RUNTIME)
+@Target({METHOD})
 public @interface JSONPropertyIgnore { }
diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java
index a66f4ad..4391bb7 100644
--- a/src/main/java/org/json/JSONPropertyName.java
+++ b/src/main/java/org/json/JSONPropertyName.java
@@ -11,14 +11,14 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-@Documented
-@Retention(RUNTIME)
-@Target({METHOD})
 /**
  * Use this annotation on a getter method to override the Bean name
  * parser for Bean -&gt; JSONObject mapping. A value set to empty string <code>""</code>
  * will have the Bean parser fall back to the default field name processing.
  */
+@Documented
+@Retention(RUNTIME)
+@Target({METHOD})
 public @interface JSONPropertyName {
     /**
      * @return The name of the property as to be used in the JSON Object.

From 5369442671090b0e50b8ed95c6e628fefc2fc2aa Mon Sep 17 00:00:00 2001
From: ASAlisha <115576463+ASAlishaa@users.noreply.github.com>
Date: Mon, 14 Nov 2022 03:26:18 +0530
Subject: [PATCH 090/212] Added new resource to the repos

Added new useful JSON resource.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5181b8b..003c295 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ JSON in Java [package org.json]
 
 [JSON](http://www.JSON.org/) is a light-weight language-independent data interchange format.
 
-The JSON-Java package is a reference implementation that demonstrates how to parse JSON documents into Java objects and how to generate new JSON documents from the Java classes.
+The JSON-Java package is a reference implementation that demonstrates how to parse [JSON documents](https://www.interviewbit.com/problems/pretty-json/) into Java objects and how to generate new JSON documents from the Java classes.
 
 Project goals include:
 * Reliable and consistent results

From b732188e4e66824227cb299e76b6b6aa57cdbe53 Mon Sep 17 00:00:00 2001
From: ASAlisha <115576463+ASAlishaa@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:31:05 +0530
Subject: [PATCH 091/212] Added new resource to this repos.

Added resource in the correct format.
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 003c295..2fdda56 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ JSON in Java [package org.json]
 
 [JSON](http://www.JSON.org/) is a light-weight language-independent data interchange format.
 
-The JSON-Java package is a reference implementation that demonstrates how to parse [JSON documents](https://www.interviewbit.com/problems/pretty-json/) into Java objects and how to generate new JSON documents from the Java classes.
+The JSON-Java package is a reference implementation that demonstrates how to parse JSON documents into Java objects and how to generate new JSON documents from the Java classes.
 
 Project goals include:
 * Reliable and consistent results
@@ -102,6 +102,10 @@ For more information, please see [NOTES.md](https://github.com/stleary/JSON-java
 
 For more information on files, please see [FILES.md](https://github.com/stleary/JSON-java/blob/master/docs/FILES.md)
 
+# Interview Practice Problems
+
+[Pretty Json](https://www.interviewbit.com/problems/pretty-json/) - Problem asked in Microsoft & Facebook
+
 # Release history:
 
 For the release history, please see [RELEASES.md](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)

From 3b097d051ac2182f6dcf38ed3bd8d6e63d4e5d50 Mon Sep 17 00:00:00 2001
From: 6d64 <61372877+6d64@users.noreply.github.com>
Date: Thu, 1 Dec 2022 03:21:26 +1100
Subject: [PATCH 092/212] Revert pull 707 - interviewbit spam

Reverted commit that was added by a bot adding interviewbit spam to
repos on github
---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 2fdda56..5181b8b 100644
--- a/README.md
+++ b/README.md
@@ -102,10 +102,6 @@ For more information, please see [NOTES.md](https://github.com/stleary/JSON-java
 
 For more information on files, please see [FILES.md](https://github.com/stleary/JSON-java/blob/master/docs/FILES.md)
 
-# Interview Practice Problems
-
-[Pretty Json](https://www.interviewbit.com/problems/pretty-json/) - Problem asked in Microsoft & Facebook
-
 # Release history:
 
 For the release history, please see [RELEASES.md](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)

From f566a1d9ee1f8139357017dc6c7def1da19cd8d4 Mon Sep 17 00:00:00 2001
From: Cleydyr de Albuquerque <cleydyr@gmail.com>
Date: Tue, 31 Jan 2023 17:32:34 +0100
Subject: [PATCH 093/212] fix: limit the nesting depth

---
 src/main/java/org/json/XML.java               | 14 +++++--
 .../java/org/json/XMLParserConfiguration.java | 41 +++++++++++++++++++
 .../org/json/junit/XMLConfigurationTest.java  | 23 +++++++++++
 src/test/java/org/json/junit/XMLTest.java     | 35 ++++++++++++++++
 4 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index bb614d4..b8fdefc 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -232,7 +232,7 @@ public class XML {
      * @return true if the close tag is processed.
      * @throws JSONException
      */
-    private static boolean parse(XMLTokener x, JSONObject context, String name, XMLParserConfiguration config)
+    private static boolean parse(XMLTokener x, JSONObject context, String name, XMLParserConfiguration config, int currentNestingDepth)
             throws JSONException {
         char c;
         int i;
@@ -402,7 +402,11 @@ public class XML {
 
                         } else if (token == LT) {
                             // Nested element
-                            if (parse(x, jsonObject, tagName, config)) {
+                            if (currentNestingDepth == config.getMaxNestingDepth()) {
+                                throw x.syntaxError("Maximum nesting depth of " + config.getMaxNestingDepth() + " reached");
+                            }
+
+                            if (parse(x, jsonObject, tagName, config, currentNestingDepth + 1)) {
                                 if (config.getForceList().contains(tagName)) {
                                     // Force the value to be an array
                                     if (jsonObject.length() == 0) {
@@ -644,6 +648,10 @@ public class XML {
      * All values 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.
      *
+     * This method can parse documents with a maximum nesting depth of 256. If you
+     * need to parse documents with a nesting depth greater than 256, you should use
+     *
+     *
      * @param reader The XML source reader.
      * @param config Configuration options for the parser
      * @return A JSONObject containing the structured data from the XML string.
@@ -655,7 +663,7 @@ public class XML {
         while (x.more()) {
             x.skipPast("<");
             if(x.more()) {
-                parse(x, jo, null, config);
+                parse(x, jo, null, config, 0);
             }
         }
         return jo;
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 9f00710..e3311fc 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -16,6 +16,12 @@ import java.util.Set;
  */
 @SuppressWarnings({""})
 public class XMLParserConfiguration {
+    /**
+     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a XML
+     * document to JSON.
+     */
+    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
         = new XMLParserConfiguration();
@@ -54,6 +60,12 @@ public class XMLParserConfiguration {
      */
     private Set<String> forceList;
 
+    /**
+     * When parsing the XML into JSON, specifies the tags whose values should be converted
+     * to arrays
+     */
+    private int maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert
      * values), and the CDATA Tag Name is "content".
@@ -297,4 +309,33 @@ public class XMLParserConfiguration {
         newConfig.forceList = Collections.unmodifiableSet(cloneForceList);
         return newConfig;
     }
+
+    /**
+     * The maximum nesting depth that the parser will descend before throwing an exception
+     * when parsing the XML into JSON.
+     * @return the maximum nesting depth set for this configuration
+     */
+    public int getMaxNestingDepth() {
+        return maxNestingDepth;
+    }
+
+    /**
+     * Defines the maximum nesting depth that the parser will descend before throwing an exception
+     * when parsing the XML into JSON. The default max nesting depth is undefined, which means the
+     * parser will go as deep as the maximum call stack size allows. Using any negative value as a
+     * parameter is equivalent to setting no limit to the nesting depth.
+     * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
+        XMLParserConfiguration newConfig = this.clone();
+
+        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
+            newConfig.maxNestingDepth = maxNestingDepth;
+        } else {
+            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+        }
+
+        return newConfig;
+    }
 }
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index f9d24a6..25b17e2 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -1051,6 +1051,29 @@ public class XMLConfigurationTest {
 
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
+
+    @Test
+    public void testMaxNestingDepthIsSet() {
+        XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL;
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
+
+        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(42);
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), 42);
+
+        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(0);
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), 0);
+
+        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(-31415926);
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
+
+        xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(Integer.MIN_VALUE);
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
+    }
     
     /**
      * Convenience method, given an input string and expected result,
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 937658e..9c9ada4 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -7,6 +7,7 @@ Public Domain.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -24,6 +25,7 @@ import java.util.Map;
 import org.json.*;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 import org.junit.rules.TemporaryFolder;
 
 
@@ -1247,6 +1249,39 @@ public class XMLTest {
             fail("file writer error: " +e.getMessage());
         }
     }
+
+    @Test
+    public void testMaxNestingDepthIsRespected() {
+        final String wayTooLongMalformedXML = "<a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a>";
+
+        Throwable throwable = assertThrows(JSONException.class, new ThrowingRunnable() {
+
+            @Override
+            public void run() throws Throwable {
+                XML.toJSONObject(wayTooLongMalformedXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(42));
+            }
+        });
+
+        assertTrue("Wrong throwable thrown: not expecting message <" + throwable.getMessage() + ">", throwable.getMessage().startsWith("Maximum nesting depth of"));
+
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        throwable = assertThrows(JSONException.class, new ThrowingRunnable() {
+
+            @Override
+            public void run() throws Throwable {
+                XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(1));
+            }
+        });
+
+        assertTrue("Wrong throwable thrown: not expecting message <" + throwable.getMessage() + ">", throwable.getMessage().startsWith("Maximum nesting depth of"));
+    }
 }
 
 

From a14cb12c85d50060b1f95840c01f0be5de24503d Mon Sep 17 00:00:00 2001
From: Cleydyr de Albuquerque <cleydyr@gmail.com>
Date: Wed, 1 Feb 2023 20:20:18 +0100
Subject: [PATCH 094/212] refactor: keep consistence with other tests and tidy
 up constant

---
 src/test/java/org/json/junit/XMLTest.java | 39 ++++++++++++-----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 9c9ada4..6c0de9f 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -7,7 +7,6 @@ Public Domain.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -25,7 +24,6 @@ import java.util.Map;
 import org.json.*;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
 import org.junit.rules.TemporaryFolder;
 
 
@@ -1251,19 +1249,23 @@ public class XMLTest {
     }
 
     @Test
-    public void testMaxNestingDepthIsRespected() {
-        final String wayTooLongMalformedXML = "<a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a><a>";
+    public void testMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
 
-        Throwable throwable = assertThrows(JSONException.class, new ThrowingRunnable() {
+        final int maxNestingDepth = 42;
 
-            @Override
-            public void run() throws Throwable {
-                XML.toJSONObject(wayTooLongMalformedXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(42));
-            }
-        });
+        try {
+            XML.toJSONObject(wayTooLongMalformedXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
-        assertTrue("Wrong throwable thrown: not expecting message <" + throwable.getMessage() + ">", throwable.getMessage().startsWith("Maximum nesting depth of"));
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
+    }
 
+    @Test
+    public void testMaxNestingDepthIsRespectedWithValidXML() {
         final String perfectlyFineXML = "<Test>\n" +
             "  <employee>\n" +
             "    <name>sonoo</name>\n" +
@@ -1272,15 +1274,16 @@ public class XMLTest {
             "  </employee>\n" +
             "</Test>\n";
 
-        throwable = assertThrows(JSONException.class, new ThrowingRunnable() {
+        final int maxNestingDepth = 1;
 
-            @Override
-            public void run() throws Throwable {
-                XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(1));
-            }
-        });
+        try {
+            XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
-        assertTrue("Wrong throwable thrown: not expecting message <" + throwable.getMessage() + ">", throwable.getMessage().startsWith("Maximum nesting depth of"));
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
     }
 }
 

From 651511f50099a3b8d59617838c82e3d72dd39178 Mon Sep 17 00:00:00 2001
From: Cleydyr de Albuquerque <cleydyr@gmail.com>
Date: Wed, 1 Feb 2023 20:21:14 +0100
Subject: [PATCH 095/212] tests: add new test to verify that an XML having the
 permitted nesting depth can be converted

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

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 6c0de9f..7d22610 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1285,6 +1285,27 @@ public class XMLTest {
                 e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
         }
     }
+
+    @Test
+    public void testMaxNestingDepthWithValidFittingXML() {
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        final int maxNestingDepth = 3;
+
+        try {
+            XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
+                "parameter of the XMLParserConfiguration used");
+        }
+    }
 }
 
 

From eb56704e68a186f975400e009d28d4e0b5d887ec Mon Sep 17 00:00:00 2001
From: Cleydyr de Albuquerque <cleydyr@gmail.com>
Date: Thu, 2 Feb 2023 18:15:03 +0100
Subject: [PATCH 096/212] fix: set default maximum nesting depth as 512

---
 src/main/java/org/json/XMLParserConfiguration.java    | 11 ++++++++---
 src/test/java/org/json/junit/JSONArrayTest.java       |  1 -
 .../java/org/json/junit/XMLConfigurationTest.java     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index e3311fc..f118a81 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -22,6 +22,11 @@ public class XMLParserConfiguration {
      */
     public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
 
+    /**
+     * The default maximum nesting depth when parsing a XML document to JSON.
+     */
+    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
         = new XMLParserConfiguration();
@@ -64,7 +69,7 @@ public class XMLParserConfiguration {
      * When parsing the XML into JSON, specifies the tags whose values should be converted
      * to arrays
      */
-    private int maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+    private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
 
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert
@@ -321,8 +326,8 @@ public class XMLParserConfiguration {
 
     /**
      * Defines the maximum nesting depth that the parser will descend before throwing an exception
-     * when parsing the XML into JSON. The default max nesting depth is undefined, which means the
-     * parser will go as deep as the maximum call stack size allows. Using any negative value as a
+     * when parsing the XML into JSON. The default max nesting depth is 512, which means the parser
+     * will go as deep as the maximum call stack size allows. Using any negative value as a
      * parameter is equivalent to setting no limit to the nesting depth.
      * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
      * @return The existing configuration will not be modified. A new configuration is returned.
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 1a2df7f..aa8657f 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -6,7 +6,6 @@ Public Domain.
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 25b17e2..21a2b59 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -1056,7 +1056,7 @@ public class XMLConfigurationTest {
     public void testMaxNestingDepthIsSet() {
         XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL;
 
-        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH);
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
 
         xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(42);
 

From 448e204186784adc85c3498cf487eb7c8e83fa57 Mon Sep 17 00:00:00 2001
From: Cleydyr de Albuquerque <cleydyr@gmail.com>
Date: Thu, 2 Feb 2023 20:16:16 +0100
Subject: [PATCH 097/212] docs: remove wrong description of parse method

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

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index b8fdefc..db3c79f 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -648,10 +648,6 @@ public class XML {
      * All values 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.
      *
-     * This method can parse documents with a maximum nesting depth of 256. If you
-     * need to parse documents with a nesting depth greater than 256, you should use
-     *
-     *
      * @param reader The XML source reader.
      * @param config Configuration options for the parser
      * @return A JSONObject containing the structured data from the XML string.

From 2391d248cc77202eb31d0e4df0edecfbde4ab2dc Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Fri, 10 Feb 2023 01:45:34 +0000
Subject: [PATCH 098/212] fix: amend XMLParserConfiguration.clone() to include
 the new maxNestingDepth param.

Amend Javadoc for XML and XMLParserConfiguration classes.
---
 src/main/java/org/json/XML.java               | 24 ++++++----
 .../java/org/json/XMLParserConfiguration.java | 48 ++++++++++---------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index db3c79f..925f056 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -98,7 +98,7 @@ public class XML {
     /**
      * Replace special characters with XML escapes:
      *
-     * <pre>{@code 
+     * <pre>{@code
      * &amp; (ampersand) is replaced by &amp;amp;
      * &lt; (less than) is replaced by &amp;lt;
      * &gt; (greater than) is replaced by &amp;gt;
@@ -229,8 +229,12 @@ public class XML {
      *            The JSONObject that will include the new material.
      * @param name
      *            The tag name.
+     * @param config
+     *            The XML parser configuration.
+     * @param currentNestingDepth
+     *            The current nesting depth.
      * @return true if the close tag is processed.
-     * @throws JSONException
+     * @throws JSONException Thrown if any parsing error occurs.
      */
     private static boolean parse(XMLTokener x, JSONObject context, String name, XMLParserConfiguration config, int currentNestingDepth)
             throws JSONException {
@@ -427,7 +431,7 @@ public class XML {
                                         context.accumulate(tagName, jsonObject);
                                     }
                                 }
-                                
+
                                 return false;
                             }
                         }
@@ -491,7 +495,7 @@ public class XML {
         }
         return string;
     }
-    
+
     /**
      * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
      */
@@ -538,7 +542,7 @@ public class XML {
             // integer representation.
             // This will narrow any values to the smallest reasonable Object representation
             // (Integer, Long, or BigInteger)
-            
+
             // BigInteger down conversion: We use a similar bitLength compare as
             // BigInteger#intValueExact uses. Increases GC, but objects hold
             // only what they need. i.e. Less runtime overhead if the value is
@@ -554,7 +558,7 @@ public class XML {
         }
         throw new NumberFormatException("val ["+val+"] is not a valid number.");
     }
-    
+
     /**
      * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain Android support.
      */
@@ -572,7 +576,7 @@ public class XML {
      * 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 
+     * "content" member. Comments, prologs, DTDs, and <pre>{@code
      * &lt;[ [ ]]>}</pre>
      * are ignored.
      *
@@ -593,7 +597,7 @@ public class XML {
      * 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 
+     * "content" member. Comments, prologs, DTDs, and <pre>{@code
      * &lt;[ [ ]]>}</pre>
      * are ignored.
      *
@@ -673,7 +677,7 @@ public class XML {
      * 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 
+     * "content" member. Comments, prologs, DTDs, and <pre>{@code
      * &lt;[ [ ]]>}</pre>
      * are ignored.
      *
@@ -699,7 +703,7 @@ public class XML {
      * 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 
+     * "content" member. Comments, prologs, DTDs, and <pre>{@code
      * &lt;[ [ ]]>}</pre>
      * are ignored.
      *
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index f118a81..103023e 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -39,14 +39,14 @@ public class XMLParserConfiguration {
      * they should try to be guessed into JSON values (numeric, boolean, string)
      */
     private boolean keepStrings;
-    
+
     /**
      * 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
      * processing.
      */
     private String cDataTagName;
-    
+
     /**
      * When parsing the XML into JSON, specifies if values with attribute xsi:nil="true"
      * should be kept as attribute(<code>false</code>), or they should be converted to
@@ -66,8 +66,7 @@ public class XMLParserConfiguration {
     private Set<String> forceList;
 
     /**
-     * When parsing the XML into JSON, specifies the tags whose values should be converted
-     * to arrays
+     * The maximum nesting depth when parsing a XML document to JSON.
      */
     private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
 
@@ -157,15 +156,18 @@ public class XMLParserConfiguration {
      *                                  <code>false</code> to parse values with attribute xsi:nil="true" as {"xsi:nil":true}.
      * @param xsiTypeMap  <code>new HashMap<String, XMLXsiTypeConverter<?>>()</code> to parse values with attribute
      *                   xsi:type="integer" as integer,  xsi:type="string" as string
-     * @param forceList  <code>new HashSet<String>()</code> to parse the provided tags' values as arrays 
+     * @param forceList  <code>new HashSet<String>()</code> to parse the provided tags' values as arrays
+     * @param maxNestingDepth <code>int</code> to limit the nesting depth
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
-            final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList ) {
+            final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList,
+            final int maxNestingDepth) {
         this.keepStrings = keepStrings;
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
         this.forceList = Collections.unmodifiableSet(forceList);
+        this.maxNestingDepth = maxNestingDepth;
     }
 
     /**
@@ -183,14 +185,15 @@ public class XMLParserConfiguration {
                 this.cDataTagName,
                 this.convertNilAttributeToNull,
                 this.xsiTypeMap,
-                this.forceList
+                this.forceList,
+                this.maxNestingDepth
         );
     }
-    
+
     /**
      * When parsing the XML into JSON, 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)
-     * 
+     *
      * @return The <code>keepStrings</code> configuration value.
      */
     public boolean isKeepStrings() {
@@ -200,10 +203,10 @@ public class XMLParserConfiguration {
     /**
      * When parsing the XML into JSON, 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.
-     * 
+     *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
@@ -216,7 +219,7 @@ public class XMLParserConfiguration {
      * 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
      * processing.
-     * 
+     *
      * @return The <code>cDataTagName</code> configuration value.
      */
     public String getcDataTagName() {
@@ -227,10 +230,10 @@ public class XMLParserConfiguration {
      * 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
      * processing.
-     * 
+     *
      * @param newVal
      *      new value to use for the <code>cDataTagName</code> configuration option.
-     * 
+     *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     public XMLParserConfiguration withcDataTagName(final String newVal) {
@@ -243,7 +246,7 @@ public class XMLParserConfiguration {
      * When parsing the XML into JSON, specifies if values with attribute xsi:nil="true"
      * should be kept as attribute(<code>false</code>), or they should be converted to
      * <code>null</code>(<code>true</code>)
-     * 
+     *
      * @return The <code>convertNilAttributeToNull</code> configuration value.
      */
     public boolean isConvertNilAttributeToNull() {
@@ -254,10 +257,10 @@ public class XMLParserConfiguration {
      * When parsing the XML into JSON, specifies if values with attribute xsi:nil="true"
      * should be kept as attribute(<code>false</code>), or they should be converted to
      * <code>null</code>(<code>true</code>)
-     * 
+     *
      * @param newVal
      *      new value to use for the <code>convertNilAttributeToNull</code> configuration option.
-     * 
+     *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     public XMLParserConfiguration withConvertNilAttributeToNull(final boolean newVal) {
@@ -295,7 +298,7 @@ public class XMLParserConfiguration {
 
     /**
      * When parsing the XML into JSON, specifies that tags that will be converted to arrays
-     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays 
+     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays
      * @return <code>forceList</code> unmodifiable configuration set.
      */
     public Set<String> getForceList() {
@@ -304,8 +307,8 @@ public class XMLParserConfiguration {
 
     /**
      * When parsing the XML into JSON, specifies that tags that will be converted to arrays
-     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays 
-     * @param forceList  {@code new HashSet<String>()} to parse the provided tags' values as arrays 
+     * in this configuration {@code Set<String>} to parse the provided tags' values as arrays
+     * @param forceList  {@code new HashSet<String>()} to parse the provided tags' values as arrays
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     public XMLParserConfiguration withForceList(final Set<String> forceList) {
@@ -327,8 +330,9 @@ public class XMLParserConfiguration {
     /**
      * Defines the maximum nesting depth that the parser will descend before throwing an exception
      * when parsing the XML into JSON. The default max nesting depth is 512, which means the parser
-     * will go as deep as the maximum call stack size allows. Using any negative value as a
-     * parameter is equivalent to setting no limit to the nesting depth.
+     * 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
      * @return The existing configuration will not be modified. A new configuration is returned.
      */

From a6e412bded7a0ad605adfeca029318f184c32102 Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Fri, 10 Feb 2023 01:46:44 +0000
Subject: [PATCH 099/212] fix: limit the nesting depth in JSONML

Limit the XML nesting depth for CVE-2022-45688 when using the JsonML transform.
---
 src/main/java/org/json/JSONML.java            | 113 +++++++++++---
 .../json/XMLtoJSONMLParserConfiguration.java  | 128 ++++++++++++++++
 src/test/java/org/json/junit/JSONMLTest.java  | 140 +++++++++++++-----
 3 files changed, 322 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/org/json/XMLtoJSONMLParserConfiguration.java

diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index 2f9b840..c418ed7 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -27,7 +27,32 @@ public class JSONML {
         XMLTokener x,
         boolean    arrayForm,
         JSONArray  ja,
-        boolean keepStrings
+        boolean keepStrings,
+        int currentNestingDepth
+    ) throws JSONException {
+        return parse(x,arrayForm, ja,
+            keepStrings ? XMLtoJSONMLParserConfiguration.KEEP_STRINGS : XMLtoJSONMLParserConfiguration.ORIGINAL,
+            currentNestingDepth);
+    }
+
+    /**
+     * Parse XML values and store them in a JSONArray.
+     * @param x       The XMLTokener containing the source string.
+     * @param arrayForm true if array form, false if object form.
+     * @param ja      The JSONArray that is containing the current tag or null
+     *     if we are at the outermost level.
+     * @param config  The XML parser configuration:
+     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means Don't type-convert text nodes and attribute values.
+     * @return A JSONArray if the value is the outermost tag, otherwise null.
+     * @throws JSONException if a parsing error occurs
+     */
+    private static Object parse(
+        XMLTokener x,
+        boolean    arrayForm,
+        JSONArray  ja,
+        XMLtoJSONMLParserConfiguration config,
+        int currentNestingDepth
     ) throws JSONException {
         String     attribute;
         char       c;
@@ -152,7 +177,7 @@ public class JSONML {
                             if (!(token instanceof String)) {
                                 throw x.syntaxError("Missing value");
                             }
-                            newjo.accumulate(attribute, keepStrings ? ((String)token) :XML.stringToValue((String)token));
+                            newjo.accumulate(attribute, config.isKeepStrings() ? ((String)token) :XML.stringToValue((String)token));
                             token = null;
                         } else {
                             newjo.accumulate(attribute, "");
@@ -181,7 +206,12 @@ public class JSONML {
                         if (token != XML.GT) {
                             throw x.syntaxError("Misshaped tag");
                         }
-                        closeTag = (String)parse(x, arrayForm, newja, keepStrings);
+
+                        if (currentNestingDepth == config.getMaxNestingDepth()) {
+                            throw x.syntaxError("Maximum nesting depth of " + config.getMaxNestingDepth() + " reached");
+                        }
+
+                        closeTag = (String)parse(x, arrayForm, newja, config, currentNestingDepth + 1);
                         if (closeTag != null) {
                             if (!closeTag.equals(tagName)) {
                                 throw x.syntaxError("Mismatched '" + tagName +
@@ -203,7 +233,7 @@ public class JSONML {
             } else {
                 if (ja != null) {
                     ja.put(token instanceof String
-                        ? keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token)
+                        ? (config.isKeepStrings() ? XML.unescape((String)token) : XML.stringToValue((String)token))
                         : token);
                 }
             }
@@ -224,7 +254,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONArray
      */
     public static JSONArray toJSONArray(String string) throws JSONException {
-        return (JSONArray)parse(new XMLTokener(string), true, null, false);
+        return (JSONArray)parse(new XMLTokener(string), true, null, XMLtoJSONMLParserConfiguration.ORIGINAL, 0);
     }
 
 
@@ -235,8 +265,8 @@ public class JSONML {
      * attributes, then the second element will be JSONObject containing the
      * name/value pairs. If the tag contains children, then strings and
      * JSONArrays will represent the child tags.
-     * As opposed to toJSONArray this method does not attempt to convert 
-     * any text node or attribute value to any type 
+     * As opposed to toJSONArray this method does not attempt to convert
+     * any text node or attribute value to any type
      * but just leaves it as a string.
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param string The source string.
@@ -246,7 +276,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONArray
      */
     public static JSONArray toJSONArray(String string, boolean keepStrings) throws JSONException {
-        return (JSONArray)parse(new XMLTokener(string), true, null, keepStrings);
+        return (JSONArray)parse(new XMLTokener(string), true, null, keepStrings, 0);
     }
 
 
@@ -257,8 +287,8 @@ public class JSONML {
      * attributes, then the second element will be JSONObject containing the
      * name/value pairs. If the tag contains children, then strings and
      * JSONArrays will represent the child content and tags.
-     * As opposed to toJSONArray this method does not attempt to convert 
-     * any text node or attribute value to any type 
+     * As opposed to toJSONArray this method does not attempt to convert
+     * any text node or attribute value to any type
      * but just leaves it as a string.
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param x An XMLTokener.
@@ -268,7 +298,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONArray
      */
     public static JSONArray toJSONArray(XMLTokener x, boolean keepStrings) throws JSONException {
-        return (JSONArray)parse(x, true, null, keepStrings);
+        return (JSONArray)parse(x, true, null, keepStrings, 0);
     }
 
 
@@ -285,7 +315,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONArray
      */
     public static JSONArray toJSONArray(XMLTokener x) throws JSONException {
-        return (JSONArray)parse(x, true, null, false);
+        return (JSONArray)parse(x, true, null, false, 0);
     }
 
 
@@ -303,10 +333,10 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONObject
      */
     public static JSONObject toJSONObject(String string) throws JSONException {
-        return (JSONObject)parse(new XMLTokener(string), false, null, false);
+        return (JSONObject)parse(new XMLTokener(string), false, null, false, 0);
     }
-    
-    
+
+
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject using the JsonML transform. Each XML tag is represented as
@@ -323,10 +353,32 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONObject
      */
     public static JSONObject toJSONObject(String string, boolean keepStrings) throws JSONException {
-        return (JSONObject)parse(new XMLTokener(string), false, null, keepStrings);
+        return (JSONObject)parse(new XMLTokener(string), false, null, keepStrings, 0);
     }
 
-    
+
+    /**
+     * Convert a well-formed (but not necessarily valid) XML string into a
+     * JSONObject using the JsonML transform. Each XML tag is represented as
+     * a JSONObject with a "tagName" property. If the tag has attributes, then
+     * the attributes will be in the JSONObject as properties. If the tag
+     * contains children, the object will have a "childNodes" property which
+     * will be an array of strings and JsonML JSONObjects.
+
+     * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
+     * @param string The XML source text.
+     * @param config  The XML parser configuration:
+     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     *       or numeric values and will instead be left as strings
+     * @return A JSONObject containing the structured data from the XML string.
+     * @throws JSONException Thrown on error converting to a JSONObject
+     */
+    public static JSONObject toJSONObject(String string, XMLtoJSONMLParserConfiguration config) throws JSONException {
+        return (JSONObject)parse(new XMLTokener(string), false, null, config, 0);
+    }
+
+
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject using the JsonML transform. Each XML tag is represented as
@@ -341,7 +393,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONObject
      */
     public static JSONObject toJSONObject(XMLTokener x) throws JSONException {
-           return (JSONObject)parse(x, false, null, false);
+           return (JSONObject)parse(x, false, null, false, 0);
     }
 
 
@@ -361,7 +413,29 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONObject
      */
     public static JSONObject toJSONObject(XMLTokener x, boolean keepStrings) throws JSONException {
-           return (JSONObject)parse(x, false, null, keepStrings);
+           return (JSONObject)parse(x, false, null, keepStrings, 0);
+    }
+
+
+    /**
+     * Convert a well-formed (but not necessarily valid) XML string into a
+     * JSONObject using the JsonML transform. Each XML tag is represented as
+     * a JSONObject with a "tagName" property. If the tag has attributes, then
+     * the attributes will be in the JSONObject as properties. If the tag
+     * contains children, the object will have a "childNodes" property which
+     * will be an array of strings and JsonML JSONObjects.
+
+     * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
+     * @param x An XMLTokener of the XML source text.
+     * @param config  The XML parser configuration:
+     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     *       or numeric values and will instead be left as strings
+     * @return A JSONObject containing the structured data from the XML string.
+     * @throws JSONException Thrown on error converting to a JSONObject
+     */
+    public static JSONObject toJSONObject(XMLTokener x, XMLtoJSONMLParserConfiguration config) throws JSONException {
+        return (JSONObject)parse(x, false, null, config, 0);
     }
 
 
@@ -442,6 +516,7 @@ public class JSONML {
         return sb.toString();
     }
 
+
     /**
      * Reverse the JSONML transformation, making an XML text from a JSONObject.
      * The JSONObject must contain a "tagName" property. If it has children,
diff --git a/src/main/java/org/json/XMLtoJSONMLParserConfiguration.java b/src/main/java/org/json/XMLtoJSONMLParserConfiguration.java
new file mode 100644
index 0000000..452f992
--- /dev/null
+++ b/src/main/java/org/json/XMLtoJSONMLParserConfiguration.java
@@ -0,0 +1,128 @@
+package org.json;
+/*
+Public Domain.
+*/
+
+/**
+ * Configuration object for the XML to JSONML parser. The configuration is immutable.
+ */
+@SuppressWarnings({""})
+public class XMLtoJSONMLParserConfiguration {
+    /**
+     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a XML
+     * document to JSONML.
+     */
+    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+
+    /**
+     * The default maximum nesting depth when parsing a XML document to JSONML.
+     */
+    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+
+    /** Original Configuration of the XML to JSONML Parser. */
+    public static final XMLtoJSONMLParserConfiguration ORIGINAL
+        = new XMLtoJSONMLParserConfiguration();
+    /** Original configuration of the XML to JSONML Parser except that values are kept as strings. */
+    public static final XMLtoJSONMLParserConfiguration KEEP_STRINGS
+        = new XMLtoJSONMLParserConfiguration().withKeepStrings(true);
+
+    /**
+     * 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)
+     */
+    private boolean keepStrings;
+
+    /**
+     * The maximum nesting depth when parsing a XML document to JSONML.
+     */
+    private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+
+    /**
+     * Default parser configuration. Does not keep strings (tries to implicitly convert values).
+     */
+    public XMLtoJSONMLParserConfiguration() {
+        this.keepStrings = false;
+    }
+
+    /**
+     * Configure the parser string processing and use the default CDATA Tag Name as "content".
+     * @param keepStrings <code>true</code> to parse all values as string.
+     *      <code>false</code> to try and convert XML string values into a JSON value.
+     * @param maxNestingDepth <code>int</code> to limit the nesting depth
+     */
+    public XMLtoJSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+        this.keepStrings = keepStrings;
+        this.maxNestingDepth = maxNestingDepth;
+    }
+
+    /**
+     * Provides a new instance of the same configuration.
+     */
+    @Override
+    protected XMLtoJSONMLParserConfiguration clone() {
+        // future modifications to this method should always ensure a "deep"
+        // clone in the case of collections. i.e. if a Map is added as a configuration
+        // item, a new map instance should be created and if possible each value in the
+        // 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 XMLtoJSONMLParserConfiguration(
+                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)
+     *
+     * @return The <code>keepStrings</code> configuration value.
+     */
+    public boolean isKeepStrings() {
+        return this.keepStrings;
+    }
+
+    /**
+     * 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.
+     *
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLtoJSONMLParserConfiguration withKeepStrings(final boolean newVal) {
+        XMLtoJSONMLParserConfiguration newConfig = 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.
+     * @return the maximum nesting depth set for this configuration
+     */
+    public int getMaxNestingDepth() {
+        return maxNestingDepth;
+    }
+
+    /**
+     * 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.
+     * 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
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public XMLtoJSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
+        XMLtoJSONMLParserConfiguration newConfig = this.clone();
+
+        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
+            newConfig.maxNestingDepth = maxNestingDepth;
+        } else {
+            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+        }
+
+        return newConfig;
+    }
+}
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 34bc9f0..6a5062e 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -11,19 +11,19 @@ import org.junit.Test;
 
 /**
  * Tests for org.json.JSONML.java
- * 
+ *
  * Certain inputs are expected to result in exceptions. These tests are
  * executed first. JSONML provides an API to:
- *     Convert an XML string into a JSONArray or a JSONObject. 
+ *     Convert an XML string into a JSONArray or a JSONObject.
  *     Convert a JSONArray or JSONObject into an XML string.
  * Both fromstring and tostring operations operations should be symmetrical
- * within the limits of JSONML. 
+ * within the limits of JSONML.
  * It should be possible to perform the following operations, which should
  * result in the original string being recovered, within the limits of the
  * underlying classes:
  *  Convert a string -> JSONArray -> string -> JSONObject -> string
  *  Convert a string -> JSONObject -> string -> JSONArray -> string
- * 
+ *
  */
 public class JSONMLTest {
 
@@ -56,7 +56,7 @@ public class JSONMLTest {
 
     /**
      * Attempts to call JSONML.toString() with a null JSONArray.
-     * Expects a NullPointerException. 
+     * Expects a NullPointerException.
      */
     @Test(expected=NullPointerException.class)
     public void nullJSONXMLException() {
@@ -69,7 +69,7 @@ public class JSONMLTest {
 
     /**
      * Attempts to call JSONML.toString() with a null JSONArray.
-     * Expects a JSONException. 
+     * Expects a JSONException.
      */
     @Test
     public void emptyJSONXMLException() {
@@ -125,7 +125,7 @@ public class JSONMLTest {
             "[\"addresses\","+
                 "{\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
                     "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"},"+
-                // this array has no name 
+                // this array has no name
                 "["+
                     "[\"name\"],"+
                     "[\"nocontent\"],"+
@@ -180,7 +180,7 @@ public class JSONMLTest {
     }
 
     /**
-     * Attempts to transform a malformed XML document 
+     * Attempts to transform a malformed XML document
      * (element tag has a frontslash) to a JSONArray.\
      * Expects a JSONException
      */
@@ -191,7 +191,7 @@ public class JSONMLTest {
          * In this case, the XML is invalid because the 'name' element
          * contains an invalid frontslash.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -216,7 +216,7 @@ public class JSONMLTest {
      */
     @Test
     public void invalidBangInTagException() {
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -246,7 +246,7 @@ public class JSONMLTest {
          * In this case, the XML is invalid because an element
          * starts with '!' and has no closing tag
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -276,7 +276,7 @@ public class JSONMLTest {
          * In this case, the XML is invalid because an element
          * has no closing '>'.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -306,7 +306,7 @@ public class JSONMLTest {
          * In this case, the XML is invalid because an element
          * has no name after the closing tag '</'.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -336,7 +336,7 @@ public class JSONMLTest {
          * In this case, the XML is invalid because an element
          * has '>' after the closing tag '</' and name.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation=\"test.xsd\">\n"+
@@ -364,9 +364,9 @@ public class JSONMLTest {
         /**
          * xmlStr contains XML text which is transformed into a JSONArray.
          * In this case, the XML is invalid because an element
-         * does not have a complete CDATA string. 
+         * does not have a complete CDATA string.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
             "   xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -388,7 +388,7 @@ public class JSONMLTest {
     /**
      * Convert an XML document into a JSONArray, then use JSONML.toString()
      * to convert it into a string. This string is then converted back into
-     * a JSONArray. Both JSONArrays are compared against a control to 
+     * a JSONArray. Both JSONArrays are compared against a control to
      * confirm the contents.
      */
     @Test
@@ -405,7 +405,7 @@ public class JSONMLTest {
          * which is used to create a final JSONArray, which is also compared
          * against the expected JSONArray.
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
                  "xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -414,7 +414,7 @@ public class JSONMLTest {
                      "<nocontent/>>\n"+
                  "</address>\n"+
             "</addresses>";
-        String expectedStr = 
+        String expectedStr =
             "[\"addresses\","+
                 "{\"xsi:noNamespaceSchemaLocation\":\"test.xsd\","+
                     "\"xmlns:xsi\":\"http://www.w3.org/2001/XMLSchema-instance\"},"+
@@ -434,12 +434,12 @@ public class JSONMLTest {
     }
 
     /**
-     * Convert an XML document into a JSONObject. Use JSONML.toString() to 
+     * Convert an XML document into a JSONObject. Use JSONML.toString() to
      * convert it back into a string, and then re-convert it into a JSONObject.
      * Both JSONObjects are compared against a control JSONObject to confirm
      * the contents.
      * <p>
-     * Next convert the XML document into a JSONArray. Use JSONML.toString() to 
+     * Next convert the XML document into a JSONArray. Use JSONML.toString() to
      * convert it back into a string, and then re-convert it into a JSONArray.
      * Both JSONArrays are compared against a control JSONArray to confirm
      * the contents.
@@ -452,23 +452,23 @@ public class JSONMLTest {
         /**
          * xmlStr contains XML text which is transformed into a JSONObject,
          * restored to XML, transformed into a JSONArray, and then restored
-         * to XML again. Both JSONObject and JSONArray should contain the same 
+         * to XML again. Both JSONObject and JSONArray should contain the same
          * information and should produce the same XML, allowing for non-ordered
          * attributes.
-         * 
+         *
          * Transformation to JSONObject:
          *      The elementName is stored as a string where key="tagName"
          *      Attributes are simply stored as key/value pairs
          *      If the element has either content or child elements, they are stored
          *      in a jsonArray with key="childNodes".
-         * 
+         *
          * Transformation to JSONArray:
          *      1st entry = elementname
          *      2nd entry = attributes object (if present)
          *      3rd entry = content (if present)
          *      4th entry = child element JSONArrays (if present)
          */
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<addresses xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""+
                 "xsi:noNamespaceSchemaLocation='test.xsd'>\n"+
@@ -585,7 +585,7 @@ public class JSONMLTest {
                 "\"tagName\":\"addresses\""+
             "}";
 
-        String expectedJSONArrayStr = 
+        String expectedJSONArrayStr =
             "["+
                 "\"addresses\","+
                 "{"+
@@ -645,12 +645,12 @@ public class JSONMLTest {
         JSONObject finalJsonObject = JSONML.toJSONObject(jsonObjectXmlToStr);
         Util.compareActualVsExpectedJsonObjects(finalJsonObject, expectedJsonObject);
 
-        // create a JSON array from the original string and make sure it 
+        // create a JSON array from the original string and make sure it
         // looks as expected
         JSONArray jsonArray = JSONML.toJSONArray(xmlStr);
         JSONArray expectedJsonArray = new JSONArray(expectedJSONArrayStr);
         Util.compareActualVsExpectedJsonArrays(jsonArray,expectedJsonArray);
-    
+
         // restore the XML, then make another JSONArray and make sure it
         // looks as expected
         String jsonArrayXmlToStr = JSONML.toString(jsonArray);
@@ -668,14 +668,14 @@ public class JSONMLTest {
      * Convert an XML document which contains embedded comments into
      * a JSONArray. Use JSONML.toString() to turn it into a string, then
      * reconvert it into a JSONArray. Compare both JSONArrays to a control
-     * JSONArray to confirm the contents. 
+     * JSONArray to confirm the contents.
      * <p>
      * This test shows how XML comments are handled.
      */
     @Test
     public void commentsInXML() {
 
-        String xmlStr = 
+        String xmlStr =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
             "<!-- this is a comment -->\n"+
             "<addresses>\n"+
@@ -734,7 +734,7 @@ public class JSONMLTest {
         final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",\"1\"],[\"id\",\"00\"],[\"id\",\"0\"],[\"item\",{\"id\":\"01\"}],[\"title\",\"True\"]]";
         final JSONArray json = JSONML.toJSONArray(originalXml,true);
         assertEquals(expectedJsonString, json.toString());
-        
+
         final String reverseXml = JSONML.toString(json);
         assertEquals(originalXml, reverseXml);
     }
@@ -749,7 +749,7 @@ public class JSONMLTest {
         final String revertedXml = JSONML.toString(jsonArray);
         assertEquals(revertedXml, originalXml);
     }
-    
+
     /**
      * JSON string cannot be reverted to original xml. See test result in
      * comment below.
@@ -770,7 +770,7 @@ public class JSONMLTest {
 // 1. Our XML parser does not handle generic HTML entities, only valid XML entities. Hence &nbsp;
 //     or other HTML specific entities would fail on reversability
 // 2. Our JSON implementation for storing the XML attributes uses the standard unordered map.
-//     This means that <tag attr1="v1" attr2="v2" /> can not be reversed reliably.  
+//     This means that <tag attr1="v1" attr2="v2" /> can not be reversed reliably.
 //
 //    /**
 //     * Test texts taken from jsonml.org. Currently our implementation FAILS this conversion but shouldn't.
@@ -783,13 +783,13 @@ public class JSONMLTest {
 //        final String expectedJsonString = "[\"table\",{\"class\" : \"MyTable\",\"style\" : \"background-color:yellow\"},[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#550758\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:red\"},\"Example text here\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#993101\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:green\"},\"127624015\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#E33D87\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:blue\"},\"\u00A0\",[\"span\",{ \"style\" : \"background-color:maroon\" },\"\u00A9\"],\"\u00A0\"]]]";
 //        final JSONArray json = JSONML.toJSONArray(originalXml,true);
 //        final String actualJsonString = json.toString();
-//        
+//
 //        final String reverseXml = JSONML.toString(json);
 //        assertNotEquals(originalXml, reverseXml);
 //
 //        assertNotEquals(expectedJsonString, actualJsonString);
 //    }
-//    
+//
 //    /**
 //     * Test texts taken from jsonml.org but modified to have XML entities only.
 //     */
@@ -799,15 +799,15 @@ public class JSONMLTest {
 //        final String expectedJsonString = "[\"table\",{\"class\" : \"MyTable\",\"style\" : \"background-color:yellow\"},[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#550758\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:red\"},\"Example text here\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#993101\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:green\"},\"127624015\"]],[\"tr\",[\"td\",{\"class\" : \"MyTD\",\"style\" : \"border:1px solid black\"},\"#E33D87\"],[\"td\",{\"class\" : \"MyTD\",\"style\" : \"background-color:blue\"},\"&\",[\"span\",{ \"style\" : \"background-color:maroon\" },\">\"],\"<\"]]]";
 //        final JSONArray jsonML = JSONML.toJSONArray(originalXml,true);
 //        final String actualJsonString = jsonML.toString();
-//        
+//
 //        final String reverseXml = JSONML.toString(jsonML);
 //        // currently not equal because the hashing of the attribute objects makes the attribute
-//        // order not happen the same way twice 
+//        // order not happen the same way twice
 //        assertEquals(originalXml, reverseXml);
 //
 //        assertEquals(expectedJsonString, actualJsonString);
 //    }
-    
+
     @Test (timeout = 6000)
     public void testIssue484InfinteLoop1() {
         try {
@@ -819,11 +819,11 @@ public class JSONMLTest {
                     ex.getMessage());
         }
     }
-    
+
     @Test (timeout = 6000)
     public void testIssue484InfinteLoop2() {
         try {
-            String input = "??*\n" + 
+            String input = "??*\n" +
                     "??|?CglR??`??>?w??PIlr??D?$?-?o??O?*??{OD?Y??`2a????NM?bq?:O?>S$?J?B.gUK?m\b??zE???!v]?
???
???c??????h???s???g???`?qbi??:Zl?)?}1^??k?0??:$V?$?Ovs(}J??????2;gQ?
???Tg?K?`?h%c?hmGA?<!C*?9?~?t?)??,zA???S}?Q??.q?j????]";
          JSONML.toJSONObject(input);
             fail("Exception expected for invalid JSON.");
@@ -833,4 +833,64 @@ public class JSONMLTest {
                     ex.getMessage());
         }
     }
+
+    @Test
+    public void testMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
+
+        final int maxNestingDepth = 42;
+
+        try {
+            JSONML.toJSONObject(wayTooLongMalformedXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
+    }
+
+    @Test
+    public void testMaxNestingDepthIsRespectedWithValidXML() {
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        final int maxNestingDepth = 1;
+
+        try {
+            JSONML.toJSONObject(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
+    }
+
+    @Test
+    public void testMaxNestingDepthWithValidFittingXML() {
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        final int maxNestingDepth = 3;
+
+        try {
+            JSONML.toJSONObject(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
+                "parameter of the XMLtoJSONMLParserConfiguration used");
+        }
+    }
+
 }

From df2d6f83630df4d302b0e20c1f32d5c4d47030db Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Sat, 11 Feb 2023 01:52:13 +0000
Subject: [PATCH 100/212] fix: introduce optional
 XMLtoJSONMLParserConfiguration parameter for JSONML.toJSONArray(...)
 functions, to facilitate max nesting depth override.

---
 src/main/java/org/json/JSONML.java           | 49 ++++++++++++++
 src/test/java/org/json/junit/JSONMLTest.java | 70 +++++++++++++++++++-
 2 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index c418ed7..a58137e 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -280,6 +280,55 @@ public class JSONML {
     }
 
 
+
+    /**
+     * Convert a well-formed (but not necessarily valid) XML string into a
+     * JSONArray using the JsonML transform. Each XML tag is represented as
+     * a JSONArray in which the first element is the tag name. If the tag has
+     * attributes, then the second element will be JSONObject containing the
+     * name/value pairs. If the tag contains children, then strings and
+     * JSONArrays will represent the child tags.
+     * As opposed to toJSONArray this method does not attempt to convert
+     * any text node or attribute value to any type
+     * but just leaves it as a string.
+     * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
+     * @param string The source string.
+     * @param config  The XML parser configuration:
+     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     *       or numeric values and will instead be left as strings
+     * @return A JSONArray containing the structured data from the XML string.
+     * @throws JSONException Thrown on error converting to a JSONArray
+     */
+    public static JSONArray toJSONArray(String string, XMLtoJSONMLParserConfiguration config) throws JSONException {
+        return (JSONArray)parse(new XMLTokener(string), true, null, config, 0);
+    }
+
+
+    /**
+     * Convert a well-formed (but not necessarily valid) XML string into a
+     * JSONArray using the JsonML transform. Each XML tag is represented as
+     * a JSONArray in which the first element is the tag name. If the tag has
+     * attributes, then the second element will be JSONObject containing the
+     * name/value pairs. If the tag contains children, then strings and
+     * JSONArrays will represent the child content and tags.
+     * As opposed to toJSONArray this method does not attempt to convert
+     * any text node or attribute value to any type
+     * but just leaves it as a string.
+     * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
+     * @param x An XMLTokener.
+     * @param config  The XML parser configuration:
+     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     *       or numeric values and will instead be left as strings
+     * @return A JSONArray containing the structured data from the XML string.
+     * @throws JSONException Thrown on error converting to a JSONArray
+     */
+    public static JSONArray toJSONArray(XMLTokener x, XMLtoJSONMLParserConfiguration config) throws JSONException {
+        return (JSONArray)parse(x, true, null, config, 0);
+    }
+
+
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONArray using the JsonML transform. Each XML tag is represented as
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 6a5062e..7d0a285 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -835,7 +835,71 @@ public class JSONMLTest {
     }
 
     @Test
-    public void testMaxNestingDepthOf42IsRespected() {
+    public void testToJSONArrayMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
+
+        final int maxNestingDepth = 42;
+
+        try {
+            JSONML.toJSONArray(wayTooLongMalformedXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
+    }
+
+
+    @Test
+    public void testToJSONArrayMaxNestingDepthIsRespectedWithValidXML() {
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        final int maxNestingDepth = 1;
+
+        try {
+            JSONML.toJSONArray(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + maxNestingDepth));
+        }
+    }
+
+    @Test
+    public void testToJSONArrayMaxNestingDepthWithValidFittingXML() {
+        final String perfectlyFineXML = "<Test>\n" +
+            "  <employee>\n" +
+            "    <name>sonoo</name>\n" +
+            "    <salary>56000</salary>\n" +
+            "    <married>true</married>\n" +
+            "  </employee>\n" +
+            "</Test>\n";
+
+        final int maxNestingDepth = 3;
+
+        try {
+            JSONML.toJSONArray(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
+                "parameter of the XMLtoJSONMLParserConfiguration used");
+        }
+    }
+
+
+
+
+
+    @Test
+    public void testToJSONObjectMaxNestingDepthOf42IsRespected() {
         final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
 
         final int maxNestingDepth = 42;
@@ -851,7 +915,7 @@ public class JSONMLTest {
     }
 
     @Test
-    public void testMaxNestingDepthIsRespectedWithValidXML() {
+    public void testToJSONObjectMaxNestingDepthIsRespectedWithValidXML() {
         final String perfectlyFineXML = "<Test>\n" +
             "  <employee>\n" +
             "    <name>sonoo</name>\n" +
@@ -873,7 +937,7 @@ public class JSONMLTest {
     }
 
     @Test
-    public void testMaxNestingDepthWithValidFittingXML() {
+    public void testToJSONObjectMaxNestingDepthWithValidFittingXML() {
         final String perfectlyFineXML = "<Test>\n" +
             "  <employee>\n" +
             "    <name>sonoo</name>\n" +

From 72f4c3e6468c7391b34bc530c1905056fdd596e6 Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Sun, 12 Feb 2023 01:32:34 +0000
Subject: [PATCH 101/212] refactor: rename XMLtoJSONMLParserConfiguration to
 JSONMLParserConfiguration

---
 src/main/java/org/json/JSONML.java            | 44 +++++++++----------
 ...on.java => JSONMLParserConfiguration.java} | 26 +++++------
 src/test/java/org/json/junit/JSONMLTest.java  | 16 +++----
 3 files changed, 43 insertions(+), 43 deletions(-)
 rename src/main/java/org/json/{XMLtoJSONMLParserConfiguration.java => JSONMLParserConfiguration.java} (83%)

diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index a58137e..4aea014 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -31,7 +31,7 @@ public class JSONML {
         int currentNestingDepth
     ) throws JSONException {
         return parse(x,arrayForm, ja,
-            keepStrings ? XMLtoJSONMLParserConfiguration.KEEP_STRINGS : XMLtoJSONMLParserConfiguration.ORIGINAL,
+            keepStrings ? JSONMLParserConfiguration.KEEP_STRINGS : JSONMLParserConfiguration.ORIGINAL,
             currentNestingDepth);
     }
 
@@ -41,9 +41,9 @@ public class JSONML {
      * @param arrayForm true if array form, false if object form.
      * @param ja      The JSONArray that is containing the current tag or null
      *     if we are at the outermost level.
-     * @param config  The XML parser configuration:
-     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
-     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means Don't type-convert text nodes and attribute values.
+     * @param config  The parser configuration:
+     *     JSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     JSONMLParserConfiguration.KEEP_STRINGS means Don't type-convert text nodes and attribute values.
      * @return A JSONArray if the value is the outermost tag, otherwise null.
      * @throws JSONException if a parsing error occurs
      */
@@ -51,7 +51,7 @@ public class JSONML {
         XMLTokener x,
         boolean    arrayForm,
         JSONArray  ja,
-        XMLtoJSONMLParserConfiguration config,
+        JSONMLParserConfiguration config,
         int currentNestingDepth
     ) throws JSONException {
         String     attribute;
@@ -254,7 +254,7 @@ public class JSONML {
      * @throws JSONException Thrown on error converting to a JSONArray
      */
     public static JSONArray toJSONArray(String string) throws JSONException {
-        return (JSONArray)parse(new XMLTokener(string), true, null, XMLtoJSONMLParserConfiguration.ORIGINAL, 0);
+        return (JSONArray)parse(new XMLTokener(string), true, null, JSONMLParserConfiguration.ORIGINAL, 0);
     }
 
 
@@ -293,14 +293,14 @@ public class JSONML {
      * but just leaves it as a string.
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param string The source string.
-     * @param config  The XML parser configuration:
-     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
-     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     * @param config  The parser configuration:
+     *     JSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     JSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
      *       or numeric values and will instead be left as strings
      * @return A JSONArray containing the structured data from the XML string.
      * @throws JSONException Thrown on error converting to a JSONArray
      */
-    public static JSONArray toJSONArray(String string, XMLtoJSONMLParserConfiguration config) throws JSONException {
+    public static JSONArray toJSONArray(String string, JSONMLParserConfiguration config) throws JSONException {
         return (JSONArray)parse(new XMLTokener(string), true, null, config, 0);
     }
 
@@ -317,14 +317,14 @@ public class JSONML {
      * but just leaves it as a string.
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param x An XMLTokener.
-     * @param config  The XML parser configuration:
-     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
-     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     * @param config  The parser configuration:
+     *     JSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     JSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
      *       or numeric values and will instead be left as strings
      * @return A JSONArray containing the structured data from the XML string.
      * @throws JSONException Thrown on error converting to a JSONArray
      */
-    public static JSONArray toJSONArray(XMLTokener x, XMLtoJSONMLParserConfiguration config) throws JSONException {
+    public static JSONArray toJSONArray(XMLTokener x, JSONMLParserConfiguration config) throws JSONException {
         return (JSONArray)parse(x, true, null, config, 0);
     }
 
@@ -416,14 +416,14 @@ public class JSONML {
 
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param string The XML source text.
-     * @param config  The XML parser configuration:
-     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
-     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     * @param config  The parser configuration:
+     *     JSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     JSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
      *       or numeric values and will instead be left as strings
      * @return A JSONObject containing the structured data from the XML string.
      * @throws JSONException Thrown on error converting to a JSONObject
      */
-    public static JSONObject toJSONObject(String string, XMLtoJSONMLParserConfiguration config) throws JSONException {
+    public static JSONObject toJSONObject(String string, JSONMLParserConfiguration config) throws JSONException {
         return (JSONObject)parse(new XMLTokener(string), false, null, config, 0);
     }
 
@@ -476,14 +476,14 @@ public class JSONML {
 
      * Comments, prologs, DTDs, and <pre>{@code &lt;[ [ ]]>}</pre> are ignored.
      * @param x An XMLTokener of the XML source text.
-     * @param config  The XML parser configuration:
-     *     XMLtoJSONMLParserConfiguration.ORIGINAL is the default behaviour;
-     *     XMLtoJSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
+     * @param config  The parser configuration:
+     *     JSONMLParserConfiguration.ORIGINAL is the default behaviour;
+     *     JSONMLParserConfiguration.KEEP_STRINGS means values will not be coerced into boolean
      *       or numeric values and will instead be left as strings
      * @return A JSONObject containing the structured data from the XML string.
      * @throws JSONException Thrown on error converting to a JSONObject
      */
-    public static JSONObject toJSONObject(XMLTokener x, XMLtoJSONMLParserConfiguration config) throws JSONException {
+    public static JSONObject toJSONObject(XMLTokener x, JSONMLParserConfiguration config) throws JSONException {
         return (JSONObject)parse(x, false, null, config, 0);
     }
 
diff --git a/src/main/java/org/json/XMLtoJSONMLParserConfiguration.java b/src/main/java/org/json/JSONMLParserConfiguration.java
similarity index 83%
rename from src/main/java/org/json/XMLtoJSONMLParserConfiguration.java
rename to src/main/java/org/json/JSONMLParserConfiguration.java
index 452f992..26f7386 100644
--- a/src/main/java/org/json/XMLtoJSONMLParserConfiguration.java
+++ b/src/main/java/org/json/JSONMLParserConfiguration.java
@@ -7,7 +7,7 @@ Public Domain.
  * Configuration object for the XML to JSONML parser. The configuration is immutable.
  */
 @SuppressWarnings({""})
-public class XMLtoJSONMLParserConfiguration {
+public class JSONMLParserConfiguration {
     /**
      * Used to indicate there's no defined limit to the maximum nesting depth when parsing a XML
      * document to JSONML.
@@ -20,11 +20,11 @@ public class XMLtoJSONMLParserConfiguration {
     public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
 
     /** Original Configuration of the XML to JSONML Parser. */
-    public static final XMLtoJSONMLParserConfiguration ORIGINAL
-        = new XMLtoJSONMLParserConfiguration();
+    public static final JSONMLParserConfiguration ORIGINAL
+        = new JSONMLParserConfiguration();
     /** Original configuration of the XML to JSONML Parser except that values are kept as strings. */
-    public static final XMLtoJSONMLParserConfiguration KEEP_STRINGS
-        = new XMLtoJSONMLParserConfiguration().withKeepStrings(true);
+    public static final JSONMLParserConfiguration KEEP_STRINGS
+        = new JSONMLParserConfiguration().withKeepStrings(true);
 
     /**
      * When parsing the XML into JSONML, specifies if values should be kept as strings (<code>true</code>), or if
@@ -40,7 +40,7 @@ public class XMLtoJSONMLParserConfiguration {
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert values).
      */
-    public XMLtoJSONMLParserConfiguration() {
+    public JSONMLParserConfiguration() {
         this.keepStrings = false;
     }
 
@@ -50,7 +50,7 @@ public class XMLtoJSONMLParserConfiguration {
      *      <code>false</code> to try and convert XML string values into a JSON value.
      * @param maxNestingDepth <code>int</code> to limit the nesting depth
      */
-    public XMLtoJSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+    public JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
         this.keepStrings = keepStrings;
         this.maxNestingDepth = maxNestingDepth;
     }
@@ -59,13 +59,13 @@ public class XMLtoJSONMLParserConfiguration {
      * Provides a new instance of the same configuration.
      */
     @Override
-    protected XMLtoJSONMLParserConfiguration clone() {
+    protected JSONMLParserConfiguration clone() {
         // future modifications to this method should always ensure a "deep"
         // clone in the case of collections. i.e. if a Map is added as a configuration
         // item, a new map instance should be created and if possible each value in the
         // 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 XMLtoJSONMLParserConfiguration(
+        return new JSONMLParserConfiguration(
                 this.keepStrings,
                 this.maxNestingDepth
         );
@@ -90,8 +90,8 @@ public class XMLtoJSONMLParserConfiguration {
      *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
-    public XMLtoJSONMLParserConfiguration withKeepStrings(final boolean newVal) {
-        XMLtoJSONMLParserConfiguration newConfig = this.clone();
+    public JSONMLParserConfiguration withKeepStrings(final boolean newVal) {
+        JSONMLParserConfiguration newConfig = this.clone();
         newConfig.keepStrings = newVal;
         return newConfig;
     }
@@ -114,8 +114,8 @@ public class XMLtoJSONMLParserConfiguration {
      * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
-    public XMLtoJSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
-        XMLtoJSONMLParserConfiguration newConfig = this.clone();
+    public JSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
+        JSONMLParserConfiguration newConfig = this.clone();
 
         if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
             newConfig.maxNestingDepth = maxNestingDepth;
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 7d0a285..1514ddd 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -841,7 +841,7 @@ public class JSONMLTest {
         final int maxNestingDepth = 42;
 
         try {
-            JSONML.toJSONArray(wayTooLongMalformedXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONArray(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
             fail("Expecting a JSONException");
         } catch (JSONException e) {
@@ -864,7 +864,7 @@ public class JSONMLTest {
         final int maxNestingDepth = 1;
 
         try {
-            JSONML.toJSONArray(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONArray(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
             fail("Expecting a JSONException");
         } catch (JSONException e) {
@@ -886,11 +886,11 @@ public class JSONMLTest {
         final int maxNestingDepth = 3;
 
         try {
-            JSONML.toJSONArray(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONArray(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
         } catch (JSONException e) {
             e.printStackTrace();
             fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
-                "parameter of the XMLtoJSONMLParserConfiguration used");
+                "parameter of the JSONMLParserConfiguration used");
         }
     }
 
@@ -905,7 +905,7 @@ public class JSONMLTest {
         final int maxNestingDepth = 42;
 
         try {
-            JSONML.toJSONObject(wayTooLongMalformedXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONObject(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
             fail("Expecting a JSONException");
         } catch (JSONException e) {
@@ -927,7 +927,7 @@ public class JSONMLTest {
         final int maxNestingDepth = 1;
 
         try {
-            JSONML.toJSONObject(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONObject(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
 
             fail("Expecting a JSONException");
         } catch (JSONException e) {
@@ -949,11 +949,11 @@ public class JSONMLTest {
         final int maxNestingDepth = 3;
 
         try {
-            JSONML.toJSONObject(perfectlyFineXML, XMLtoJSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
+            JSONML.toJSONObject(perfectlyFineXML, JSONMLParserConfiguration.ORIGINAL.withMaxNestingDepth(maxNestingDepth));
         } catch (JSONException e) {
             e.printStackTrace();
             fail("XML document should be parsed as its maximum depth fits the maxNestingDepth " +
-                "parameter of the XMLtoJSONMLParserConfiguration used");
+                "parameter of the JSONMLParserConfiguration used");
         }
     }
 

From 9234eab00a421850a20691b04bb18c7cffe4c58a Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Mon, 13 Feb 2023 01:09:29 +0000
Subject: [PATCH 102/212] refactor: make JSONMLParserConfiguration all-args
 constructor private, enforcing the builder pattern.

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

diff --git a/src/main/java/org/json/JSONMLParserConfiguration.java b/src/main/java/org/json/JSONMLParserConfiguration.java
index 26f7386..b7162bf 100644
--- a/src/main/java/org/json/JSONMLParserConfiguration.java
+++ b/src/main/java/org/json/JSONMLParserConfiguration.java
@@ -50,7 +50,7 @@ public class JSONMLParserConfiguration {
      *      <code>false</code> to try and convert XML string values into a JSON value.
      * @param maxNestingDepth <code>int</code> to limit the nesting depth
      */
-    public JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+    private JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
         this.keepStrings = keepStrings;
         this.maxNestingDepth = maxNestingDepth;
     }

From 24093491a8d9c1dfa8e062df9ae0c1dde56bba5a Mon Sep 17 00:00:00 2001
From: Tamas Perger <tamas.perger@engineering.digital.dwp.gov.uk>
Date: Tue, 21 Feb 2023 19:13:07 +0000
Subject: [PATCH 103/212] refactor: introduce ParserConfiguration class
 hierarchy

---
 .../org/json/JSONMLParserConfiguration.java   |  83 ++-----------
 .../java/org/json/ParserConfiguration.java    | 112 ++++++++++++++++++
 .../java/org/json/XMLParserConfiguration.java |  64 ++--------
 src/test/java/org/json/junit/JSONMLTest.java  |  29 +++++
 4 files changed, 162 insertions(+), 126 deletions(-)
 create mode 100644 src/main/java/org/json/ParserConfiguration.java

diff --git a/src/main/java/org/json/JSONMLParserConfiguration.java b/src/main/java/org/json/JSONMLParserConfiguration.java
index b7162bf..b2514ab 100644
--- a/src/main/java/org/json/JSONMLParserConfiguration.java
+++ b/src/main/java/org/json/JSONMLParserConfiguration.java
@@ -7,17 +7,12 @@ Public Domain.
  * Configuration object for the XML to JSONML parser. The configuration is immutable.
  */
 @SuppressWarnings({""})
-public class JSONMLParserConfiguration {
-    /**
-     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a XML
-     * document to JSONML.
-     */
-    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+public class JSONMLParserConfiguration extends ParserConfiguration {
 
     /**
-     * The default maximum nesting depth when parsing a XML document to JSONML.
+     * We can override the default maximum nesting depth if needed.
      */
-    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH;
 
     /** Original Configuration of the XML to JSONML Parser. */
     public static final JSONMLParserConfiguration ORIGINAL
@@ -26,22 +21,12 @@ public class JSONMLParserConfiguration {
     public static final JSONMLParserConfiguration KEEP_STRINGS
         = new JSONMLParserConfiguration().withKeepStrings(true);
 
-    /**
-     * 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)
-     */
-    private boolean keepStrings;
-
-    /**
-     * The maximum nesting depth when parsing a XML document to JSONML.
-     */
-    private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
-
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert values).
      */
     public JSONMLParserConfiguration() {
-        this.keepStrings = false;
+        super();
+        this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
     }
 
     /**
@@ -50,9 +35,8 @@ public class JSONMLParserConfiguration {
      *      <code>false</code> to try and convert XML string values into a JSON value.
      * @param maxNestingDepth <code>int</code> to limit the nesting depth
      */
-    private JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
-        this.keepStrings = keepStrings;
-        this.maxNestingDepth = maxNestingDepth;
+    protected JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+        super(keepStrings, maxNestingDepth);
     }
 
     /**
@@ -71,58 +55,13 @@ public class JSONMLParserConfiguration {
         );
     }
 
-    /**
-     * 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)
-     *
-     * @return The <code>keepStrings</code> configuration value.
-     */
-    public boolean isKeepStrings() {
-        return this.keepStrings;
-    }
-
-    /**
-     * 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.
-     *
-     * @return The existing configuration will not be modified. A new configuration is returned.
-     */
+    @Override
     public JSONMLParserConfiguration withKeepStrings(final boolean newVal) {
-        JSONMLParserConfiguration newConfig = this.clone();
-        newConfig.keepStrings = newVal;
-        return newConfig;
+        return super.withKeepStrings(newVal);
     }
 
-    /**
-     * The maximum nesting depth that the parser will descend before throwing an exception
-     * when parsing the XML into JSONML.
-     * @return the maximum nesting depth set for this configuration
-     */
-    public int getMaxNestingDepth() {
-        return maxNestingDepth;
-    }
-
-    /**
-     * 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.
-     * 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
-     * @return The existing configuration will not be modified. A new configuration is returned.
-     */
+    @Override
     public JSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
-        JSONMLParserConfiguration newConfig = this.clone();
-
-        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
-            newConfig.maxNestingDepth = maxNestingDepth;
-        } else {
-            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
-        }
-
-        return newConfig;
+        return super.withMaxNestingDepth(maxNestingDepth);
     }
 }
diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/ParserConfiguration.java
new file mode 100644
index 0000000..519e209
--- /dev/null
+++ b/src/main/java/org/json/ParserConfiguration.java
@@ -0,0 +1,112 @@
+package org.json;
+/*
+Public Domain.
+*/
+
+/**
+ * Configuration base object for parsers. The configuration is immutable.
+ */
+@SuppressWarnings({""})
+public class ParserConfiguration {
+    /**
+     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a document.
+     */
+    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+
+    /**
+     * The default maximum nesting depth when parsing a document.
+     */
+    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+
+    /**
+     * 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)
+     */
+    protected boolean keepStrings;
+
+    /**
+     * The maximum nesting depth when parsing a document.
+     */
+    protected int maxNestingDepth;
+
+    public ParserConfiguration() {
+        this.keepStrings = false;
+        this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+    }
+
+    protected ParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+        this.keepStrings = keepStrings;
+        this.maxNestingDepth = maxNestingDepth;
+    }
+
+    /**
+     * Provides a new instance of the same configuration.
+     */
+    @Override
+    protected ParserConfiguration clone() {
+        // future modifications to this method should always ensure a "deep"
+        // clone in the case of collections. i.e. if a Map is added as a configuration
+        // item, a new map instance should be created and if possible each value in the
+        // 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
+        );
+    }
+
+    /**
+     * 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)
+     *
+     * @return The <code>keepStrings</code> configuration value.
+     */
+    public boolean isKeepStrings() {
+        return this.keepStrings;
+    }
+
+    /**
+     * 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.
+     *
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public <T extends ParserConfiguration> T withKeepStrings(final boolean newVal) {
+        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.
+     * @return the maximum nesting depth set for this configuration
+     */
+    public int getMaxNestingDepth() {
+        return maxNestingDepth;
+    }
+
+    /**
+     * 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.
+     * 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
+     * @return The existing configuration will not be modified. A new configuration is returned.
+     */
+    public <T extends ParserConfiguration> T withMaxNestingDepth(int maxNestingDepth) {
+        T newConfig = (T)this.clone();
+
+        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
+            newConfig.maxNestingDepth = maxNestingDepth;
+        } else {
+            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
+        }
+
+        return newConfig;
+    }
+}
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 103023e..566146d 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -15,17 +15,12 @@ import java.util.Set;
  * @author AylwardJ
  */
 @SuppressWarnings({""})
-public class XMLParserConfiguration {
-    /**
-     * Used to indicate there's no defined limit to the maximum nesting depth when parsing a XML
-     * document to JSON.
-     */
-    public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
+public class XMLParserConfiguration extends ParserConfiguration {
 
     /**
      * The default maximum nesting depth when parsing a XML document to JSON.
      */
-    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
+//    public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512; // We could override
 
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
@@ -34,12 +29,6 @@ public class XMLParserConfiguration {
     public static final XMLParserConfiguration KEEP_STRINGS
         = new XMLParserConfiguration().withKeepStrings(true);
 
-    /**
-     * When parsing the XML into JSON, 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)
-     */
-    private boolean keepStrings;
-
     /**
      * 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
@@ -65,17 +54,12 @@ public class XMLParserConfiguration {
      */
     private Set<String> forceList;
 
-    /**
-     * The maximum nesting depth when parsing a XML document to JSON.
-     */
-    private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
-
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert
      * values), and the CDATA Tag Name is "content".
      */
     public XMLParserConfiguration () {
-        this.keepStrings = false;
+        super();
         this.cDataTagName = "content";
         this.convertNilAttributeToNull = false;
         this.xsiTypeMap = Collections.emptyMap();
@@ -122,7 +106,7 @@ public class XMLParserConfiguration {
      */
     @Deprecated
     public XMLParserConfiguration (final boolean keepStrings, final String cDataTagName) {
-        this.keepStrings = keepStrings;
+        super(keepStrings, DEFAULT_MAXIMUM_NESTING_DEPTH);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = false;
     }
@@ -141,7 +125,7 @@ public class XMLParserConfiguration {
      */
     @Deprecated
     public XMLParserConfiguration (final boolean keepStrings, final String cDataTagName, final boolean convertNilAttributeToNull) {
-        this.keepStrings = keepStrings;
+        super(keepStrings, DEFAULT_MAXIMUM_NESTING_DEPTH);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
     }
@@ -162,12 +146,11 @@ public class XMLParserConfiguration {
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
             final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList,
             final int maxNestingDepth) {
-        this.keepStrings = keepStrings;
+        super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
         this.forceList = Collections.unmodifiableSet(forceList);
-        this.maxNestingDepth = maxNestingDepth;
     }
 
     /**
@@ -190,16 +173,6 @@ public class XMLParserConfiguration {
         );
     }
 
-    /**
-     * When parsing the XML into JSON, 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)
-     *
-     * @return The <code>keepStrings</code> configuration value.
-     */
-    public boolean isKeepStrings() {
-        return this.keepStrings;
-    }
-
     /**
      * When parsing the XML into JSON, 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)
@@ -209,10 +182,9 @@ public class XMLParserConfiguration {
      *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
+    @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
-        XMLParserConfiguration newConfig = this.clone();
-        newConfig.keepStrings = newVal;
-        return newConfig;
+        return super.withKeepStrings(newVal);
     }
 
     /**
@@ -318,15 +290,6 @@ public class XMLParserConfiguration {
         return newConfig;
     }
 
-    /**
-     * The maximum nesting depth that the parser will descend before throwing an exception
-     * when parsing the XML into JSON.
-     * @return the maximum nesting depth set for this configuration
-     */
-    public int getMaxNestingDepth() {
-        return maxNestingDepth;
-    }
-
     /**
      * Defines the maximum nesting depth that the parser will descend before throwing an exception
      * when parsing the XML into JSON. The default max nesting depth is 512, which means the parser
@@ -336,15 +299,8 @@ public class XMLParserConfiguration {
      * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
+    @Override
     public XMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
-        XMLParserConfiguration newConfig = this.clone();
-
-        if (maxNestingDepth > UNDEFINED_MAXIMUM_NESTING_DEPTH) {
-            newConfig.maxNestingDepth = maxNestingDepth;
-        } else {
-            newConfig.maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH;
-        }
-
-        return newConfig;
+        return super.withMaxNestingDepth(maxNestingDepth);
     }
 }
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 1514ddd..35c0af2 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -895,7 +895,36 @@ public class JSONMLTest {
     }
 
 
+    @Test
+    public void testToJSONObjectMaxDefaultNestingDepthIsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
 
+        try {
+            JSONML.toJSONObject(wayTooLongMalformedXML, JSONMLParserConfiguration.ORIGINAL);
+
+            fail("Expecting a JSONException");
+        } catch (JSONException e) {
+            assertTrue("Wrong throwable thrown: not expecting message <" + e.getMessage() + ">",
+                e.getMessage().startsWith("Maximum nesting depth of " + JSONMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH));
+        }
+    }
+
+    @Test
+    public void testToJSONObjectUnlimitedNestingDepthIsPossible() {
+        int actualDepth = JSONMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH +10;
+        final String deeperThanDefaultMax = new String(new char[actualDepth]).replace("\0", "<a>") +
+            "value" +
+            new String(new char[actualDepth]).replace("\0", "</a>");
+
+        try {
+            JSONML.toJSONObject(deeperThanDefaultMax, JSONMLParserConfiguration.ORIGINAL
+                .withMaxNestingDepth(JSONMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("XML document should be parsed beyond the default maximum depth if maxNestingDepth " +
+                "parameter is set to -1 in JSONMLParserConfiguration");
+        }
+    }
 
 
     @Test

From f0a05e6911a6080749ad82df7c39acd5374af706 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 27 Feb 2023 07:17:51 -0600
Subject: [PATCH 104/212] Update README.md

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

diff --git a/README.md b/README.md
index 5181b8b..0ecc12b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20220924/json-20220924.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230227/json-20230227.jar)**
 
 
 # Overview

From 0df034c9fd9189d0f9745c2e22803f6d339e534c Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 27 Feb 2023 07:20:10 -0600
Subject: [PATCH 105/212] Update for release 20230227

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 3fbab78..166c43a 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20230227    Fix for CVE-2022-45688 and recent commits
+
 20220924    New License - public domain, and some minor updates
 
 20220320    Wrap StackOverflow with JSONException

From 47fb49b6a871cd1652870e33e89cbff082bb0ee1 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 27 Feb 2023 07:21:11 -0600
Subject: [PATCH 106/212] Update for release 20230227

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ef85a8..f17e0ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20220924</version>
+    <version>20230227</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From 0d436d92e2d4625ae34572889ea97ca751d8e9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Farias?= <joao@thatsabug.com>
Date: Thu, 2 Mar 2023 16:39:11 +0100
Subject: [PATCH 107/212] Removing commented out code

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 68d302d..97906b6 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1290,11 +1290,7 @@ public class JSONObject {
         if (val == null) {
             return defaultValue;
         }
-        final double doubleValue = val.doubleValue();
-        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
-        // return defaultValue;
-        // }
-        return doubleValue;
+        return val.doubleValue();
     }
 
     /**

From e1eabc9c27f954ce8fe8032f12f92f51c0e7c9eb Mon Sep 17 00:00:00 2001
From: HariBabu t <htallapaneni@ap.equinix.com>
Date: Sat, 4 Mar 2023 23:08:32 +0800
Subject: [PATCH 108/212] JSONTokener implemented java.io.Closeable

---
 src/main/java/org/json/JSONTokener.java          | 16 +++++++++-------
 .../java/org/json/junit/JSONTokenerTest.java     | 12 ++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 8c98c77..4b7d833 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -1,11 +1,6 @@
 package org.json;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
 
 /*
 Public Domain.
@@ -18,7 +13,7 @@ Public Domain.
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONTokener {
+public class JSONTokener implements Closeable {
     /** current read character position on the current line. */
     private long character;
     /** flag to indicate if the end of the input has been found. */
@@ -522,4 +517,11 @@ public class JSONTokener {
         return " at " + this.index + " [character " + this.character + " line " +
                 this.line + "]";
     }
+
+    @Override
+    public void close() throws IOException {
+        if(reader!=null){
+            reader.close();
+        }
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
index da716b8..59ca6d8 100644
--- a/src/test/java/org/json/junit/JSONTokenerTest.java
+++ b/src/test/java/org/json/junit/JSONTokenerTest.java
@@ -313,4 +313,16 @@ public class JSONTokenerTest {
         assertEquals(0, t2.next());
         assertFalse(t2.more());
    }
+
+   @Test
+   public void testAutoClose(){
+       Reader reader = new StringReader("some test string");
+       try {
+           JSONTokener tokener = new JSONTokener(reader);
+           tokener.close();
+           tokener.next();
+       } catch (Exception exception){
+           assertEquals("Stream closed", exception.getMessage());
+       }
+   }
 }

From 7eca507d13c741dcf0fb468565439dcad937e794 Mon Sep 17 00:00:00 2001
From: HariBabu t <htallapaneni@ap.equinix.com>
Date: Tue, 7 Mar 2023 13:58:30 +0800
Subject: [PATCH 109/212] Removed overriding closable interface.

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

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 4b7d833..c180580 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -13,7 +13,7 @@ Public Domain.
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONTokener implements Closeable {
+public class JSONTokener {
     /** current read character position on the current line. */
     private long character;
     /** flag to indicate if the end of the input has been found. */
@@ -518,7 +518,6 @@ public class JSONTokener implements Closeable {
                 this.line + "]";
     }
 
-    @Override
     public void close() throws IOException {
         if(reader!=null){
             reader.close();

From 48fb5261fec33a806deccf9107843fb90b5c3e2b Mon Sep 17 00:00:00 2001
From: superMaaax <minchaoh2002@gmail.com>
Date: Tue, 21 Mar 2023 20:58:32 -0500
Subject: [PATCH 110/212] Fixed Flaky Tests Caused by JSON permutations

###Description
Flaky Tests found using NonDex by running the commands -
mvn -pl . edu.illinois:nondex-maven-plugin:2.1.1:nondex -Dtest=org.json.junit.XMLTest#testIndentComplicatedJsonObject

mvn -pl . edu.illinois:nondex-maven-plugin:2.1.1:nondex -Dtest=org.json.junit.XMLTest#testIndentSimpleJsonArray

mvn -pl . edu.illinois:nondex-maven-plugin:2.1.1:nondex -Dtest=org.json.junit.XMLTest#testIndentSimpleJsonObject

The logged failure was-

[ERROR] Failures:
[ERROR] XMLTest.testIndentSimpleJsonObject:1193 expected:<...>
<employee>
<[married>true</married>
<name>sonoo</name>
<salary>56000</salary]>
</employee>
</Te...> but was:<...>
<employee>
<[name>sonoo</name>
<salary>56000</salary>
<married>true</married]>
</employee>
</Te...>

The issue is the same for all three tests, so here I only show the failure message for the third test (to reduce the length of the error message).

### Investigation

The tests fail with a comparison error while comparing an expected JSON String and the result from the value returned from XML.toString(). The toString function of XML makes no guarantees as to the iteration order of the attributes in the object. This makes the test outcome non-deterministic, and the test fails whenever the function returns a mismatch in order of the elements in the JSON String. To fix this, the expected and actual keys should be checked in a more deterministic way so that the assertions do not fail.

### Fix

Expected and Actual values can be converted into JSONObject and the similar function can be used to compare these objects. As this function compares the values inside the JSONObjects without needing order, the test becomes deterministic and ensures that the flakiness from the test is removed.

The PR does not introduce a breaking change.
---
 src/test/java/org/json/junit/XMLTest.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 7d22610..aefaa49 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1111,6 +1111,7 @@ public class XMLTest {
                 "}" ;
         JSONObject jsonObject = new JSONObject(str);
         String actualIndentedXmlString = XML.toString(jsonObject, 1);
+        JSONObject actualJsonObject = XML.toJSONObject(actualIndentedXmlString);
         String expected = "<success>true</success>\n" +
                 "<response>\n" +
                 " <dateTimeISO>2022-10-05T00:00:00+03:00</dateTimeISO>\n" +
@@ -1170,7 +1171,8 @@ public class XMLTest {
                 " <timestamp>1664917200</timestamp>\n" +
                 "</response>\n" +
                 "<error>null</error>\n";
-        assertEquals(actualIndentedXmlString, expected);
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
 
 
     }
@@ -1183,6 +1185,7 @@ public class XMLTest {
                 "    }}";
         JSONObject jsonObject = new JSONObject(str);
         String actual = XML.toString(jsonObject, "Test", 2);
+        JSONObject actualJsonObject = XML.toJSONObject(actual);
         String expected = "<Test>\n" +
                 "  <employee>\n" +
                 "    <name>sonoo</name>\n" +
@@ -1190,7 +1193,8 @@ public class XMLTest {
                 "    <married>true</married>\n" +
                 "  </employee>\n" +
                 "</Test>\n";
-        assertEquals(actual, expected);
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
     }
 
     @Test
@@ -1201,6 +1205,7 @@ public class XMLTest {
                 "]  ";
         JSONArray jsonObject = new JSONArray(str);
         String actual = XML.toString(jsonObject, 2);
+        JSONObject actualJsonObject = XML.toJSONObject(actual);
         String expected = "<array>\n" +
                 "  <name>Ram</name>\n" +
                 "  <email>Ram@gmail.com</email>\n" +
@@ -1209,7 +1214,8 @@ public class XMLTest {
                 "  <name>Bob</name>\n" +
                 "  <email>bob32@gmail.com</email>\n" +
                 "</array>\n";
-        assertEquals(actual, expected);
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
 
 
     }

From 133c0cc75fa55fae24c9b528f40a31179fe40a41 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michael.osipov@siemens.com>
Date: Wed, 24 May 2023 11:45:25 +0200
Subject: [PATCH 111/212] JSONTokener(InputStream) violates rfc8259#section-8.1
 (#739)

Always use UTF-8 when an InputStream is passed.

This fixes #739.
---
 src/main/java/org/json/JSONTokener.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index c180580..5dc8ae8 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -1,6 +1,7 @@
 package org.json;
 
 import java.io.*;
+import java.nio.charset.Charset;
 
 /*
 Public Domain.
@@ -56,7 +57,7 @@ public class JSONTokener {
      * @param inputStream The source.
      */
     public JSONTokener(InputStream inputStream) {
-        this(new InputStreamReader(inputStream));
+        this(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
     }
 
 
@@ -120,7 +121,7 @@ public class JSONTokener {
 
     /**
      * Checks if the end of the input has been reached.
-     *  
+     *
      * @return true if at the end of the file and we didn't step back
      */
     public boolean end() {
@@ -184,7 +185,7 @@ public class JSONTokener {
         this.previous = (char) c;
         return this.previous;
     }
-    
+
     /**
      * Get the last character read from the input or '\0' if nothing has been read yet.
      * @return the last character read from the input.

From 084b24cbe7030cc5057effa9e6d269749ddf0beb Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:16:14 -0500
Subject: [PATCH 112/212] Update README.md for 20230618

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

diff --git a/README.md b/README.md
index 0ecc12b..e999230 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230227/json-20230227.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230618/json-20230618.jar)**
 
 
 # Overview

From f6e5bfa2db9c91f7a183c1e96d41e1328ee1b638 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:17:56 -0500
Subject: [PATCH 113/212] Update RELEASES.md for 20230618

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 166c43a..ae43983 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20230618    Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.
+
 20230227    Fix for CVE-2022-45688 and recent commits
 
 20220924    New License - public domain, and some minor updates

From c048b36516a1e35a52498f3350c6d11c10fb6f20 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:18:36 -0500
Subject: [PATCH 114/212] Update pom.xml for 20230618

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f17e0ab..ba3edbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20230227</version>
+    <version>20230618</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From a963115ac2527dee688f54f7c1150d6f25b887c1 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:58:32 -0500
Subject: [PATCH 115/212] Update pom.xml for maven deploy

Deploy failed on the mac pro with: gpg: signing failed: Inappropriate ioctl for device

Somehow I had a different gpg version installed. This change fixed it.
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index ba3edbd..b9e0e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,12 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

From 3d524349a11f8af5142b00f6fc67b5294682be66 Mon Sep 17 00:00:00 2001
From: dburbrid <dburbrid@4L005165.mshome.net>
Date: Mon, 26 Jun 2023 09:33:03 +0100
Subject: [PATCH 116/212] Correction of bug when compiling/testing on Windows:
 Issue537 file must be read as UTF-8 (Issue 745)

---
 src/test/java/org/json/junit/XMLTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index aefaa49..e940032 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -915,7 +916,7 @@ public class XMLTest {
             InputStream xmlStream = null;
             try {
                 xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue537.xml");
-                Reader xmlReader = new InputStreamReader(xmlStream);
+                Reader xmlReader = new InputStreamReader(xmlStream, Charset.forName("UTF-8"));
                 JSONObject actual = XML.toJSONObject(xmlReader, true);
                 InputStream jsonStream = null;
                 try {

From 4951ec48c8d4879ca1d4f22a1a3d5c489976a52c Mon Sep 17 00:00:00 2001
From: dburbrid <dburbrid@4L005165.mshome.net>
Date: Thu, 29 Jun 2023 09:39:34 +0100
Subject: [PATCH 117/212] Renamed object methods from ...Obj to ...Object.
 Added object method for optDoubleObject (returns Double vice double). Added
 similar methods in JSONArray. Added test methods.

---
 src/main/java/org/json/JSONArray.java         | 168 +++++++++++++++++
 src/main/java/org/json/JSONObject.java        | 176 +++++++++++++++++-
 .../java/org/json/junit/JSONArrayTest.java    |  40 ++++
 .../org/json/junit/JSONObjectNumberTest.java  |  20 ++
 .../java/org/json/junit/JSONObjectTest.java   |  65 +++++++
 5 files changed, 467 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 3be3e14..375d038 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -599,6 +599,38 @@ public class JSONArray implements Iterable<Object> {
         }
     }
 
+    /**
+     * Get the optional Boolean object associated with an index. It returns false
+     * if there is no value at that index, or if the value is not Boolean.TRUE
+     * or the String "true".
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(int index) {
+        return this.optBooleanObject(index, false);
+    }
+
+    /**
+     * Get the optional Boolean object associated with an index. It returns the
+     * defaultValue if there is no value at that index or if it is not a Boolean
+     * or the String "true" or "false" (case insensitive).
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            A boolean default.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(int index, Boolean defaultValue) {
+        try {
+            return this.getBoolean(index);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
     /**
      * Get the optional double value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
@@ -635,6 +667,42 @@ public class JSONArray implements Iterable<Object> {
         return doubleValue;
     }
 
+    /**
+     * Get the optional Double object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Double optDoubleObject(int index) {
+        return this.optDoubleObject(index, Double.NaN);
+    }
+
+    /**
+     * Get the optional double value associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            subscript
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Double optDoubleObject(int index, Double defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Double doubleValue = val.doubleValue();
+        // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
+        // return defaultValue;
+        // }
+        return doubleValue;
+    }
+
     /**
      * Get the optional float value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
@@ -671,6 +739,42 @@ public class JSONArray implements Iterable<Object> {
         return floatValue;
     }
 
+    /**
+     * Get the optional Float object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Float optFloatObject(int index) {
+        return this.optFloatObject(index, Float.NaN);
+    }
+
+    /**
+     * Get the optional Float object associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            subscript
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Float optFloatObject(int index, Float defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Float floatValue = val.floatValue();
+        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
+        // return floatValue;
+        // }
+        return floatValue;
+    }
+
     /**
      * Get the optional int value associated with an index. Zero is returned if
      * there is no value for the index, or if the value is not a number and
@@ -703,6 +807,38 @@ public class JSONArray implements Iterable<Object> {
         return val.intValue();
     }
 
+    /**
+     * Get the optional Integer object associated with an index. Zero is returned if
+     * there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Integer optIntegerObject(int index) {
+        return this.optIntegerObject(index, 0);
+    }
+
+    /**
+     * Get the optional Integer object associated with an index. The defaultValue is
+     * returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Integer optIntegerObject(int index, Integer defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.intValue();
+    }
+
     /**
      * Get the enum value associated with a key.
      * 
@@ -846,6 +982,38 @@ public class JSONArray implements Iterable<Object> {
         return val.longValue();
     }
 
+    /**
+     * Get the optional Long object associated with an index. Zero is returned if
+     * there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @return The object.
+     */
+    public Long optLongObject(int index) {
+        return this.optLongObject(index, 0L);
+    }
+
+    /**
+     * Get the optional Long object associated with an index. The defaultValue is
+     * returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Long optLongObject(int index, Long defaultValue) {
+        final Number val = this.optNumber(index, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.longValue();
+    }
+
     /**
      * Get an optional {@link Number} value associated with a key, or <code>null</code>
      * if there is no such key or if the value is not a number. If the value is a string,
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 97906b6..08eb8fd 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1131,6 +1131,45 @@ public class JSONObject {
         }
     }
 
+    /**
+     * Get an optional boolean object associated with a key. It returns false if there
+     * is no such key, or if the value is not Boolean.TRUE or the String "true".
+     *
+     * @param key
+     *            A key string.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(String key) {
+        return this.optBooleanObject(key, false);
+    }
+
+    /**
+     * Get an optional boolean object associated with a key. It returns the
+     * defaultValue if there is no such key, or if it is not a Boolean or the
+     * String "true" or "false" (case insensitive).
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return The truth.
+     */
+    public Boolean optBooleanObject(String key, Boolean defaultValue) {
+        Object val = this.opt(key);
+        if (NULL.equals(val)) {
+            return defaultValue;
+        }
+        if (val instanceof Boolean){
+            return ((Boolean) val).booleanValue();
+        }
+        try {
+            // we'll use the get anyway because it does string conversion.
+            return this.getBoolean(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
     /**
      * Get an optional BigDecimal associated with a key, or the defaultValue if
      * there is no such key or if its value is not a number. If the value is a
@@ -1294,7 +1333,39 @@ public class JSONObject {
     }
 
     /**
-     * Get the optional double value associated with an index. NaN is returned
+     * Get an optional Double object associated with a key, or NaN if there is no such
+     * key or if its value is not a number. If the value is a string, an attempt
+     * will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A string which is the key.
+     * @return An object which is the value.
+     */
+    public Double optDoubleObject(String key) {
+        return this.optDoubleObject(key, Double.NaN);
+    }
+
+    /**
+     * Get an optional Double object associated with a key, or the defaultValue if
+     * there is no such key or if its value is not a number. If the value is a
+     * string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Double optDoubleObject(String key, Double defaultValue) {
+        Number val = this.optNumber(key);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.doubleValue();
+    }
+
+    /**
+     * Get the optional float value associated with an index. NaN is returned
      * if there is no value for the index, or if the value is not a number and
      * cannot be converted to a number.
      *
@@ -1307,7 +1378,7 @@ public class JSONObject {
     }
 
     /**
-     * Get the optional double value associated with an index. The defaultValue
+     * Get the optional float value associated with an index. The defaultValue
      * is returned if there is no value for the index, or if the value is not a
      * number and cannot be converted to a number.
      *
@@ -1329,6 +1400,42 @@ public class JSONObject {
         return floatValue;
     }
 
+    /**
+     * Get the optional Float object associated with an index. NaN is returned
+     * if there is no value for the index, or if the value is not a number and
+     * cannot be converted to a number.
+     *
+     * @param key
+     *            A key string.
+     * @return The object.
+     */
+    public Float optFloatObject(String key) {
+        return this.optFloatObject(key, Float.NaN);
+    }
+
+    /**
+     * Get the optional Float object associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default object.
+     * @return The object.
+     */
+    public Float optFloatObject(String key, Float defaultValue) {
+        Number val = this.optNumber(key);
+        if (val == null) {
+            return defaultValue;
+        }
+        final Float floatValue = val.floatValue();
+        // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) {
+        // return defaultValue;
+        // }
+        return floatValue;
+    }
+
     /**
      * Get an optional int value associated with a key, or zero if there is no
      * such key or if the value is not a number. If the value is a string, an
@@ -1361,6 +1468,38 @@ public class JSONObject {
         return val.intValue();
     }
 
+    /**
+     * Get an optional Integer object associated with a key, or zero if there is no
+     * such key or if the value is not a number. If the value is a string, an
+     * attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @return An object which is the value.
+     */
+    public Integer optIntegerObject(String key) {
+        return this.optIntegerObject(key, 0);
+    }
+
+    /**
+     * Get an optional Integer object associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Integer optIntegerObject(String key, Integer defaultValue) {
+        final Number val = this.optNumber(key, null);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val.intValue();
+    }
+
     /**
      * Get an optional JSONArray associated with a key. It returns null if there
      * is no such key, or if its value is not a JSONArray.
@@ -1432,6 +1571,39 @@ public class JSONObject {
         return val.longValue();
     }
 
+    /**
+     * Get an optional Long object associated with a key, or zero if there is no
+     * such key or if the value is not a number. If the value is a string, an
+     * attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @return An object which is the value.
+     */
+    public Long optLongObject(String key) {
+        return this.optLongObject(key, 0L);
+    }
+
+    /**
+     * Get an optional Long object associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return An object which is the value.
+     */
+    public Long optLongObject(String key, Long defaultValue) {
+        final Number val = this.optNumber(key, null);
+        if (val == null) {
+            return defaultValue;
+        }
+
+        return val.longValue();
+    }
+
     /**
      * Get an optional {@link Number} value associated with a key, or <code>null</code>
      * if there is no such key or if the value is not a number. If the value is a string,
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index aa8657f..aea4e30 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -537,6 +537,13 @@ public class JSONArrayTest {
         assertTrue("Array opt boolean implicit default",
                 Boolean.FALSE == jsonArray.optBoolean(-1));
 
+         assertTrue("Array opt boolean object",
+                Boolean.TRUE.equals(jsonArray.optBooleanObject(0)));
+        assertTrue("Array opt boolean object default",
+                Boolean.FALSE.equals(jsonArray.optBooleanObject(-1, Boolean.FALSE)));
+        assertTrue("Array opt boolean object implicit default",
+                Boolean.FALSE.equals(jsonArray.optBooleanObject(-1)));
+
         assertTrue("Array opt double",
                 new Double(23.45e-4).equals(jsonArray.optDouble(5)));
         assertTrue("Array opt double default",
@@ -544,6 +551,13 @@ public class JSONArrayTest {
         assertTrue("Array opt double default implicit",
            new Double(jsonArray.optDouble(99)).isNaN());
 
+        assertTrue("Array opt double object",
+                Double.valueOf(23.45e-4).equals(jsonArray.optDoubleObject(5)));
+        assertTrue("Array opt double object default",
+                Double.valueOf(1).equals(jsonArray.optDoubleObject(0, 1D)));
+        assertTrue("Array opt double object default implicit",
+                jsonArray.optDoubleObject(99).isNaN());
+
         assertTrue("Array opt float",
                 new Float(23.45e-4).equals(jsonArray.optFloat(5)));
         assertTrue("Array opt float default",
@@ -551,6 +565,13 @@ public class JSONArrayTest {
         assertTrue("Array opt float default implicit",
            new Float(jsonArray.optFloat(99)).isNaN());
 
+        assertTrue("Array opt float object",
+                Float.valueOf(23.45e-4F).equals(jsonArray.optFloatObject(5)));
+        assertTrue("Array opt float object default",
+                Float.valueOf(1).equals(jsonArray.optFloatObject(0, 1F)));
+        assertTrue("Array opt float object default implicit",
+                jsonArray.optFloatObject(99).isNaN());
+
         assertTrue("Array opt Number",
                 BigDecimal.valueOf(23.45e-4).equals(jsonArray.optNumber(5)));
         assertTrue("Array opt Number default",
@@ -565,6 +586,13 @@ public class JSONArrayTest {
         assertTrue("Array opt int default implicit",
                 0 == jsonArray.optInt(0));
 
+        assertTrue("Array opt int object",
+                Integer.valueOf(42).equals(jsonArray.optIntegerObject(7)));
+        assertTrue("Array opt int object default",
+                Integer.valueOf(-1).equals(jsonArray.optIntegerObject(0, -1)));
+        assertTrue("Array opt int object default implicit",
+                Integer.valueOf(0).equals(jsonArray.optIntegerObject(0)));
+
         JSONArray nestedJsonArray = jsonArray.optJSONArray(9);
         assertTrue("Array opt JSONArray", nestedJsonArray != null);
         assertTrue("Array opt JSONArray default", 
@@ -582,6 +610,13 @@ public class JSONArrayTest {
         assertTrue("Array opt long default implicit",
                 0 == jsonArray.optLong(-1));
 
+        assertTrue("Array opt long object",
+                Long.valueOf(0).equals(jsonArray.optLongObject(11)));
+        assertTrue("Array opt long object default",
+                Long.valueOf(-2).equals(jsonArray.optLongObject(-1, -2L)));
+        assertTrue("Array opt long object default implicit",
+                Long.valueOf(0).equals(jsonArray.optLongObject(-1)));
+
         assertTrue("Array opt string",
                 "hello".equals(jsonArray.optString(4)));
         assertTrue("Array opt string default implicit",
@@ -599,10 +634,15 @@ public class JSONArrayTest {
     public void optStringConversion(){
         JSONArray ja = new JSONArray("[\"123\",\"true\",\"false\"]");
         assertTrue("unexpected optBoolean value",ja.optBoolean(1,false)==true);
+        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(true).equals(ja.optBooleanObject(1,false)));
         assertTrue("unexpected optBoolean value",ja.optBoolean(2,true)==false);
+        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(false).equals(ja.optBooleanObject(2,true)));
         assertTrue("unexpected optInt value",ja.optInt(0,0)==123);
+        assertTrue("unexpected optIntegerObject value",Integer.valueOf(123).equals(ja.optIntegerObject(0,0)));
         assertTrue("unexpected optLong value",ja.optLong(0,0)==123);
+        assertTrue("unexpected optLongObject value",Long.valueOf(123).equals(ja.optLongObject(0,0L)));
         assertTrue("unexpected optDouble value",ja.optDouble(0,0.0)==123.0);
+        assertTrue("unexpected optDoubleObject value",Double.valueOf(123.0).equals(ja.optDoubleObject(0,0.0)));
         assertTrue("unexpected optBigInteger value",ja.optBigInteger(0,BigInteger.ZERO).compareTo(new BigInteger("123"))==0);
         assertTrue("unexpected optBigDecimal value",ja.optBigDecimal(0,BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
         Util.checkJSONArrayMaps(ja);
diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
index f6e13c6..43173a2 100644
--- a/src/test/java/org/json/junit/JSONObjectNumberTest.java
+++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java
@@ -109,18 +109,38 @@ public class JSONObjectNumberTest {
         assertEquals(value.floatValue(), object.optFloat("value"), 0.0f);
     }
 
+    @Test
+    public void testOptFloatObject() {
+        assertEquals((Float) value.floatValue(), object.optFloatObject("value"), 0.0f);
+    }
+
     @Test
     public void testOptDouble() {
         assertEquals(value.doubleValue(), object.optDouble("value"), 0.0d);
     }
 
+    @Test
+    public void testOptDoubleObject() {
+        assertEquals((Double) value.doubleValue(), object.optDoubleObject("value"), 0.0d);
+    }
+
     @Test
     public void testOptInt() {
         assertEquals(value.intValue(), object.optInt("value"));
     }
 
+    @Test
+    public void testOptIntegerObject() {
+        assertEquals((Integer) value.intValue(), object.optIntegerObject("value"));
+    }
+
     @Test
     public void testOptLong() {
         assertEquals(value.longValue(), object.optLong("value"));
     }
+
+    @Test
+    public void testOptLongObject() {
+        assertEquals((Long) value.longValue(), object.optLongObject("value"));
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index ea0cec3..ade5523 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -231,6 +231,11 @@ public class JSONObjectTest {
         assert 26315000000253009L == actualLong : "Incorrect key value. Got "
                 + actualLong + " expected " + str;
 
+        final Long actualLongObject = json.optLongObject("key");
+        assert actualLongObject != 0L : "Unable to extract Long value for string " + str;
+        assert Long.valueOf(26315000000253009L).equals(actualLongObject) : "Incorrect key value. Got "
+                + actualLongObject + " expected " + str;
+
         final String actualString = json.optString("key");
         assert str.equals(actualString) : "Incorrect key value. Got "
                 + actualString + " expected " + str;
@@ -866,9 +871,11 @@ public class JSONObjectTest {
         JSONObject jsonObject = new JSONObject(str);
         assertTrue("trueKey should be true", jsonObject.getBoolean("trueKey"));
         assertTrue("opt trueKey should be true", jsonObject.optBoolean("trueKey"));
+        assertTrue("opt trueKey should be true", jsonObject.optBooleanObject("trueKey"));
         assertTrue("falseKey should be false", !jsonObject.getBoolean("falseKey"));
         assertTrue("trueStrKey should be true", jsonObject.getBoolean("trueStrKey"));
         assertTrue("trueStrKey should be true", jsonObject.optBoolean("trueStrKey"));
+        assertTrue("trueStrKey should be true", jsonObject.optBooleanObject("trueStrKey"));
         assertTrue("falseStrKey should be false", !jsonObject.getBoolean("falseStrKey"));
         assertTrue("stringKey should be string",
             jsonObject.getString("stringKey").equals("hello world!"));
@@ -884,6 +891,10 @@ public class JSONObjectTest {
                 jsonObject.optDouble("doubleKey") == -23.45e7);
         assertTrue("opt doubleKey with Default should be double", 
                 jsonObject.optDouble("doubleStrKey", Double.NaN) == 1);
+        assertTrue("opt doubleKey should be Double",
+                Double.valueOf(-23.45e7).equals(jsonObject.optDoubleObject("doubleKey")));
+        assertTrue("opt doubleKey with Default should be Double",
+                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", Double.NaN)));
         assertTrue("opt negZeroKey should be a Double", 
                 jsonObject.opt("negZeroKey") instanceof Double);
         assertTrue("get negZeroKey should be a Double", 
@@ -896,6 +907,10 @@ public class JSONObjectTest {
                 Double.compare(jsonObject.optDouble("negZeroKey"), -0.0d) == 0);
         assertTrue("opt negZeroStrKey with Default should be double", 
                 Double.compare(jsonObject.optDouble("negZeroStrKey"), -0.0d) == 0);
+        assertTrue("opt negZeroKey should be Double",
+                Double.valueOf(-0.0d).equals(jsonObject.optDoubleObject("negZeroKey")));
+        assertTrue("opt negZeroStrKey with Default should be Double",
+                Double.valueOf(-0.0d).equals(jsonObject.optDoubleObject("negZeroStrKey")));
         assertTrue("optNumber negZeroKey should be -0.0", 
                 Double.compare(jsonObject.optNumber("negZeroKey").doubleValue(), -0.0d) == 0);
         assertTrue("optNumber negZeroStrKey should be -0.0", 
@@ -904,10 +919,18 @@ public class JSONObjectTest {
                 jsonObject.optFloat("doubleKey") == -23.45e7f);
         assertTrue("optFloat doubleKey with Default should be float", 
                 jsonObject.optFloat("doubleStrKey", Float.NaN) == 1f);
+        assertTrue("optFloat doubleKey should be Float",
+                Float.valueOf(-23.45e7f).equals(jsonObject.optFloatObject("doubleKey")));
+        assertTrue("optFloat doubleKey with Default should be Float",
+                Float.valueOf(1f).equals(jsonObject.optFloatObject("doubleStrKey", Float.NaN)));
         assertTrue("intKey should be int", 
                 jsonObject.optInt("intKey") == 42);
         assertTrue("opt intKey should be int", 
                 jsonObject.optInt("intKey", 0) == 42);
+        assertTrue("intKey should be Integer",
+                Integer.valueOf(42).equals(jsonObject.optIntegerObject("intKey")));
+        assertTrue("opt intKey should be Integer",
+                Integer.valueOf(42).equals(jsonObject.optIntegerObject("intKey", 0)));
         assertTrue("opt intKey with default should be int", 
                 jsonObject.getInt("intKey") == 42);
         assertTrue("intStrKey should be int", 
@@ -918,6 +941,10 @@ public class JSONObjectTest {
                 jsonObject.optLong("longKey") == 1234567890123456789L);
         assertTrue("opt longKey with default should be long", 
                 jsonObject.optLong("longKey", 0) == 1234567890123456789L);
+        assertTrue("opt longKey should be Long",
+                Long.valueOf(1234567890123456789L).equals(jsonObject.optLongObject("longKey")));
+        assertTrue("opt longKey with default should be Long",
+                Long.valueOf(1234567890123456789L).equals(jsonObject.optLongObject("longKey", 0L)));
         assertTrue("longStrKey should be long", 
                 jsonObject.getLong("longStrKey") == 987654321098765432L);
         assertTrue("optNumber int should return Integer",
@@ -2465,8 +2492,12 @@ public class JSONObjectTest {
                 BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
         assertTrue("optBoolean() should return default boolean",
                  jsonObject.optBoolean("myKey", true));
+        assertTrue("optBooleanObject() should return default Boolean",
+                 jsonObject.optBooleanObject("myKey", true));
         assertTrue("optInt() should return default int",
                 42 == jsonObject.optInt("myKey", 42));
+        assertTrue("optIntegerObject() should return default Integer",
+                Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
         assertTrue("optEnum() should return default Enum",
                 MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
         assertTrue("optJSONArray() should return null ",
@@ -2475,10 +2506,16 @@ public class JSONObjectTest {
                 jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
         assertTrue("optLong() should return default long",
                 42l == jsonObject.optLong("myKey", 42l));
+        assertTrue("optLongObject() should return default Long",
+                Long.valueOf(42l).equals(jsonObject.optLongObject("myKey", 42l)));
         assertTrue("optDouble() should return default double",
                 42.3d == jsonObject.optDouble("myKey", 42.3d));
+        assertTrue("optDoubleObject() should return default Double",
+                Double.valueOf(42.3d).equals(jsonObject.optDoubleObject("myKey", 42.3d)));
         assertTrue("optFloat() should return default float",
                 42.3f == jsonObject.optFloat("myKey", 42.3f));
+        assertTrue("optFloatObject() should return default Float",
+                Float.valueOf(42.3f).equals(jsonObject.optFloatObject("myKey", 42.3f)));
         assertTrue("optNumber() should return default Number",
                 42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
         assertTrue("optString() should return default string",
@@ -2502,8 +2539,12 @@ public class JSONObjectTest {
                  BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
          assertTrue("optBoolean() should return default boolean",
                   jsonObject.optBoolean("myKey", true));
+         assertTrue("optBooleanObject() should return default Boolean",
+                  jsonObject.optBooleanObject("myKey", true));
          assertTrue("optInt() should return default int",
                  42 == jsonObject.optInt("myKey", 42));
+         assertTrue("optIntegerObject() should return default Integer",
+                 Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
          assertTrue("optEnum() should return default Enum",
                  MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
          assertTrue("optJSONArray() should return null ",
@@ -2512,10 +2553,16 @@ public class JSONObjectTest {
                 jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
          assertTrue("optLong() should return default long",
                  42l == jsonObject.optLong("myKey", 42l));
+         assertTrue("optLongObject() should return default Long",
+                 Long.valueOf(42l).equals(jsonObject.optLongObject("myKey", 42l)));
          assertTrue("optDouble() should return default double",
                  42.3d == jsonObject.optDouble("myKey", 42.3d));
+         assertTrue("optDoubleObject() should return default Double",
+                 Double.valueOf(42.3d).equals(jsonObject.optDoubleObject("myKey", 42.3d)));
          assertTrue("optFloat() should return default float",
                  42.3f == jsonObject.optFloat("myKey", 42.3f));
+         assertTrue("optFloatObject() should return default Float",
+                 Float.valueOf(42.3f).equals(jsonObject.optFloatObject("myKey", 42.3f)));
          assertTrue("optNumber() should return default Number",
                  42l == jsonObject.optNumber("myKey", Long.valueOf(42)).longValue());
          assertTrue("optString() should return default string",
@@ -2530,11 +2577,17 @@ public class JSONObjectTest {
     public void jsonObjectOptStringConversion() {
         JSONObject jo = new JSONObject("{\"int\":\"123\",\"true\":\"true\",\"false\":\"false\"}");
         assertTrue("unexpected optBoolean value",jo.optBoolean("true",false)==true);
+        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(true).equals(jo.optBooleanObject("true",false)));
         assertTrue("unexpected optBoolean value",jo.optBoolean("false",true)==false);
+        assertTrue("unexpected optBooleanObject value",Boolean.valueOf(false).equals(jo.optBooleanObject("false",true)));
         assertTrue("unexpected optInt value",jo.optInt("int",0)==123);
+        assertTrue("unexpected optIntegerObject value",Integer.valueOf(123).equals(jo.optIntegerObject("int",0)));
         assertTrue("unexpected optLong value",jo.optLong("int",0)==123l);
+        assertTrue("unexpected optLongObject value",Long.valueOf(123l).equals(jo.optLongObject("int",0L)));
         assertTrue("unexpected optDouble value",jo.optDouble("int",0.0d)==123.0d);
+        assertTrue("unexpected optDoubleObject value",Double.valueOf(123.0d).equals(jo.optDoubleObject("int",0.0d)));
         assertTrue("unexpected optFloat value",jo.optFloat("int",0.0f)==123.0f);
+        assertTrue("unexpected optFloatObject value",Float.valueOf(123.0f).equals(jo.optFloatObject("int",0.0f)));
         assertTrue("unexpected optBigInteger value",jo.optBigInteger("int",BigInteger.ZERO).compareTo(new BigInteger("123"))==0);
         assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
         assertTrue("unexpected optBigDecimal value",jo.optBigDecimal("int",BigDecimal.ZERO).compareTo(new BigDecimal("123"))==0);
@@ -2555,23 +2608,35 @@ public class JSONObjectTest {
         assertEquals(new BigDecimal("19007199254740993.35481234487103587486413587843213584"), jo.optBigDecimal("largeNumber",null));
         assertEquals(new BigInteger("19007199254740993"), jo.optBigInteger("largeNumber",null));
         assertEquals(1.9007199254740992E16, jo.optDouble("largeNumber"),0.0);
+        assertEquals(1.9007199254740992E16, jo.optDoubleObject("largeNumber"),0.0);
         assertEquals(1.90071995E16f, jo.optFloat("largeNumber"),0.0f);
+        assertEquals(1.90071995E16f, jo.optFloatObject("largeNumber"),0.0f);
         assertEquals(19007199254740993l, jo.optLong("largeNumber"));
+        assertEquals(Long.valueOf(19007199254740993l), jo.optLongObject("largeNumber"));
         assertEquals(1874919425, jo.optInt("largeNumber"));
+        assertEquals(Integer.valueOf(1874919425), jo.optIntegerObject("largeNumber"));
 
         // conversion from a string
         assertEquals(new BigDecimal("19007199254740993.35481234487103587486413587843213584"), jo.optBigDecimal("largeNumberStr",null));
         assertEquals(new BigInteger("19007199254740993"), jo.optBigInteger("largeNumberStr",null));
         assertEquals(1.9007199254740992E16, jo.optDouble("largeNumberStr"),0.0);
+        assertEquals(1.9007199254740992E16, jo.optDoubleObject("largeNumberStr"),0.0);
         assertEquals(1.90071995E16f, jo.optFloat("largeNumberStr"),0.0f);
+        assertEquals(1.90071995E16f, jo.optFloatObject("largeNumberStr"),0.0f);
         assertEquals(19007199254740993l, jo.optLong("largeNumberStr"));
+        assertEquals(Long.valueOf(19007199254740993l), jo.optLongObject("largeNumberStr"));
         assertEquals(1874919425, jo.optInt("largeNumberStr"));
+        assertEquals(Integer.valueOf(1874919425), jo.optIntegerObject("largeNumberStr"));
 
         // the integer portion of the actual value is larger than a double can hold.
         assertNotEquals((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optLong("largeNumber"));
+        assertNotEquals(Long.valueOf((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optLongObject("largeNumber"));
         assertNotEquals((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optInt("largeNumber"));
+        assertNotEquals(Integer.valueOf((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optIntegerObject("largeNumber"));
         assertNotEquals((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optLong("largeNumberStr"));
+        assertNotEquals(Long.valueOf((long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optLongObject("largeNumberStr"));
         assertNotEquals((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"), jo.optInt("largeNumberStr"));
+        assertNotEquals(Integer.valueOf((int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584")), jo.optIntegerObject("largeNumberStr"));
         assertEquals(19007199254740992l, (long)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
         assertEquals(2147483647, (int)Double.parseDouble("19007199254740993.35481234487103587486413587843213584"));
         Util.checkJSONObjectMaps(jo);

From c8a9e15a57886dbf3e51cd450bde8e0c4599bff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 1 Aug 2023 13:11:25 -0700
Subject: [PATCH 118/212] Don't skip past `\0` when parsing JSON objects.

A better solution might be to use -1 instead 0 to represent EOF everywhere,
which of course means changing `char` variables to `int`. The solution here is
enough to solve the immediate problem, though.

Fixes #758.
---
 src/main/java/org/json/JSONObject.java           | 6 +++++-
 src/test/java/org/json/junit/JSONObjectTest.java | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 08eb8fd..36f02d6 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -253,7 +253,11 @@ public class JSONObject {
             switch (x.nextClean()) {
             case ';':
             case ',':
-                if (x.nextClean() == '}') {
+                c = x.nextClean();
+                if (c == 0) {
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                }
+                if (c == '}') {
                     return;
                 }
                 x.back();
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index ade5523..76c46ef 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2225,6 +2225,15 @@ public class JSONObjectTest {
                     "Expected a ',' or '}' at 15 [character 16 line 1]",
                     e.getMessage());
         }
+        try {
+            // \0 after ,
+            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+          assertEquals("Expecting an exception message",
+              "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+              e.getMessage());
+        }
         try {
             // append to wrong key
             String str = "{\"myKey\":true, \"myOtherKey\":false}";

From b6ff0db984a42550dabbef6d7fc9de2be4b56e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 1 Aug 2023 13:49:59 -0700
Subject: [PATCH 119/212] Fix indentation in test.

---
 src/test/java/org/json/junit/JSONObjectTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 76c46ef..e869a8d 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2230,9 +2230,9 @@ public class JSONObjectTest {
             String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
             assertNull("Expected an exception",new JSONObject(str));
         } catch (JSONException e) {
-          assertEquals("Expecting an exception message",
-              "A JSONObject text must end with '}' at 15 [character 16 line 1]",
-              e.getMessage());
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+                    e.getMessage());
         }
         try {
             // append to wrong key

From 2a4bc3420acc10e30d99841279164d195d2a525e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 1 Aug 2023 14:38:45 -0700
Subject: [PATCH 120/212] Apply simplification suggested by @johnjaylward.

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 36f02d6..5e00eb9 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -253,13 +253,12 @@ public class JSONObject {
             switch (x.nextClean()) {
             case ';':
             case ',':
-                c = x.nextClean();
-                if (c == 0) {
-                    throw x.syntaxError("A JSONObject text must end with '}'");
-                }
-                if (c == '}') {
+                if (x.nextClean() == '}') {
                     return;
                 }
+                if (x.end()) {
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                }
                 x.back();
                 break;
             case '}':

From b2943eb395b41ea67cfee303e24b47dce6e24f1b Mon Sep 17 00:00:00 2001
From: Ethan McCue <ethan@mccue.dev>
Date: Wed, 16 Aug 2023 11:24:57 -0400
Subject: [PATCH 121/212] Add module-info to maven build

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

diff --git a/pom.xml b/pom.xml
index b9e0e60..fe1525f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,31 @@
                     <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.Final</version>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfo>
+                                    <name>org.json</name>
+                                    <exports>
+                                        org.json;
+                                    </exports>
+                                </moduleInfo>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

From 50dfcc59b3f9a376761e41dc3c6b2ad06d90c8ea Mon Sep 17 00:00:00 2001
From: Ethan McCue <ethan@mccue.dev>
Date: Wed, 16 Aug 2023 11:25:15 -0400
Subject: [PATCH 122/212] Remove automatic module name

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

diff --git a/pom.xml b/pom.xml
index fe1525f..3502b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,13 +188,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.json</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
         </plugins>
     </build>

From e563dbcaaae945a163349ad7c14ed8b7f58c3d2c Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 29 May 2023 10:34:40 +0300
Subject: [PATCH 123/212] Setup java 8 as minimum version

---
 .github/workflows/pipeline.yml                | 24 +++++++++++--------
 pom.xml                                       | 20 ++++++++--------
 .../java/org/json/junit/JSONObjectTest.java   |  6 ++---
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 08352a0..f55506d 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -11,19 +11,21 @@ on:
 
 jobs:
   # old-school build and jar method. No tests run or compiled.
-  build-1_6: 
+  build-11: 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build for java 1.6, however don't run any tests
-        java: [ 1.6 ]
+        # build for java 11, however don't run any tests
+        java: [ 11, 17, 19, 20 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup java
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
+          cache: 'maven'
       - name: Compile Java ${{ matrix.java }}
         run: |
           mkdir -p target/classes
@@ -42,14 +44,16 @@ jobs:
     strategy:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 8, 11 ]
+        java: [ 11, 17 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup java
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
+          cache: 'maven'
       - name: Compile Java ${{ matrix.java }}
         run: mvn clean compile -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true
       - name: Run Tests ${{ matrix.java }}
diff --git a/pom.xml b/pom.xml
index b9e0e60..d6ed899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
+            <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -79,7 +79,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>5.1.9</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -93,16 +93,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -131,7 +131,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -162,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -173,4 +173,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e869a8d..3250c25 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -626,9 +626,9 @@ public class JSONObjectTest {
         assertTrue("expected 42", Integer.valueOf("42").equals(jsonObject.query("/intKey")));
         assertTrue("expected -23.45e7", Double.valueOf("-23.45e7").equals(jsonObject.query("/doubleKey")));
         // sorry, mockito artifact
-        assertTrue("expected 2 callbacks items", ((List<?>)(JsonPath.read(doc, "$.callbacks"))).size() == 2);
-        assertTrue("expected 0 handler items", ((Map<?,?>)(JsonPath.read(doc, "$.callbacks[0].handler"))).size() == 0);
-        assertTrue("expected 0 callbacks[1] items", ((Map<?,?>)(JsonPath.read(doc, "$.callbacks[1]"))).size() == 0);
+        assertTrue("expected 2 mockitoInterceptor items", ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor"))).size() == 2);
+        assertTrue("expected 0 mockitoInterceptor.serializationSupport items",
+                ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor.serializationSupport"))).size() == 0);
         Util.checkJSONObjectMaps(jsonObject);
     }
 

From bae0b0dac924ac446952fc7395158cc804fbd958 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 29 May 2023 11:01:16 +0300
Subject: [PATCH 124/212] Updated mockito

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

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 3250c25..a9935a6 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -625,10 +625,13 @@ public class JSONObjectTest {
         assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
         assertTrue("expected 42", Integer.valueOf("42").equals(jsonObject.query("/intKey")));
         assertTrue("expected -23.45e7", Double.valueOf("-23.45e7").equals(jsonObject.query("/doubleKey")));
+<<<<<<< HEAD
         // sorry, mockito artifact
         assertTrue("expected 2 mockitoInterceptor items", ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor"))).size() == 2);
         assertTrue("expected 0 mockitoInterceptor.serializationSupport items",
                 ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor.serializationSupport"))).size() == 0);
+=======
+>>>>>>> 88968f3 (Updated mockito)
         Util.checkJSONObjectMaps(jsonObject);
     }
 

From 3dd8f2ecd5ac7700c6403b2fe57ae281b9c057b3 Mon Sep 17 00:00:00 2001
From: dburbrid <dburbrid@4L005165.mshome.net>
Date: Mon, 26 Jun 2023 09:33:03 +0100
Subject: [PATCH 125/212] Correction of bug when compiling/testing on Windows:
 Issue537 file must be read as UTF-8 (Issue 745)

---
 src/test/java/org/json/junit/JSONObjectTest.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index a9935a6..3250c25 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -625,13 +625,10 @@ public class JSONObjectTest {
         assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/escapeStringKey")));
         assertTrue("expected 42", Integer.valueOf("42").equals(jsonObject.query("/intKey")));
         assertTrue("expected -23.45e7", Double.valueOf("-23.45e7").equals(jsonObject.query("/doubleKey")));
-<<<<<<< HEAD
         // sorry, mockito artifact
         assertTrue("expected 2 mockitoInterceptor items", ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor"))).size() == 2);
         assertTrue("expected 0 mockitoInterceptor.serializationSupport items",
                 ((Map<?,?>)(JsonPath.read(doc, "$.mockitoInterceptor.serializationSupport"))).size() == 0);
-=======
->>>>>>> 88968f3 (Updated mockito)
         Util.checkJSONObjectMaps(jsonObject);
     }
 

From a4e152f4f0bc4daa52d5ae4e32c679bc8eaecd80 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Sun, 27 Aug 2023 15:42:27 +0300
Subject: [PATCH 126/212] Update pipeline.yml

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

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index f55506d..a8e7ad6 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -11,12 +11,12 @@ on:
 
 jobs:
   # old-school build and jar method. No tests run or compiled.
-  build-11: 
+  build-8: 
     runs-on: ubuntu-latest
     strategy:
       matrix:
         # build for java 11, however don't run any tests
-        java: [ 11, 17, 19, 20 ]
+        java: [ 8, 11, 17, 19, 20 ]
     name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 11, 17 ]
+        java: [ 8, 11, 17 ]
     name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3

From 48089a4da75bbca566ce1c33a9b6b218d11cd609 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 28 Aug 2023 02:21:18 +0300
Subject: [PATCH 127/212] Update pipeline.yml

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

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index a8e7ad6..5f7474a 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # build for java 11, however don't run any tests
+        # build for java 8, however don't run any tests
         java: [ 8, 11, 17, 19, 20 ]
     name: Java ${{ matrix.java }}
     steps:

From be33deb7d5d1276e5d428125df1b4cd7f78e04c6 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 28 Aug 2023 02:36:02 +0300
Subject: [PATCH 128/212] Update README.md

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

diff --git a/README.md b/README.md
index e999230..0ecc12b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230618/json-20230618.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230227/json-20230227.jar)**
 
 
 # Overview

From 2c674be1b64971327451b5c1e9c06fcb83b3b5b6 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 28 Aug 2023 18:13:22 +0300
Subject: [PATCH 129/212] Update pipeline.yml

---
 .github/workflows/pipeline.yml | 29 -----------------------------
 README.md                      |  2 +-
 pom.xml                        |  2 +-
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 5f7474a..5e1dd42 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -10,35 +10,6 @@ on:
     branches: [ master ]
 
 jobs:
-  # old-school build and jar method. No tests run or compiled.
-  build-8: 
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # build for java 8, however don't run any tests
-        java: [ 8, 11, 17, 19, 20 ]
-    name: Java ${{ matrix.java }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Compile Java ${{ matrix.java }}
-        run: |
-          mkdir -p target/classes
-          javac -d target/classes/ src/main/java/org/json/*.java
-      - name: Create java ${{ matrix.java }} JAR
-        run: |
-          jar cvf target/org.json.jar -C target/classes .
-      - name: Upload Java ${{ matrix.java }} JAR
-        uses: actions/upload-artifact@v1
-        with:
-          name: Java ${{ matrix.java }} JAR
-          path: target/org.json.jar
-      
   build:
     runs-on: ubuntu-latest
     strategy:
diff --git a/README.md b/README.md
index 0ecc12b..e999230 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230227/json-20230227.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230618/json-20230618.jar)**
 
 
 # Overview
diff --git a/pom.xml b/pom.xml
index d6ed899..e17f145 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,4 +173,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

From 9b69ec49adc404043540628dd8aa25d3862a0c58 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 28 Aug 2023 12:43:17 -0400
Subject: [PATCH 130/212] update CodeQL action version

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

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4afee84..df4bf79 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,11 +25,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       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@v1
+      uses: github/codeql-action/analyze@v2

From af6d07cecb95af5cd5ed09b24c48734e2b26ce28 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Tue, 29 Aug 2023 03:22:20 +0300
Subject: [PATCH 131/212] Resolved Gradle build dependency

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 63a31a7..91503d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ repositories {
 dependencies {
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.mockito:mockito-core:4.2.0'
 }
 
 subprojects {

From e27da22e05b795ada5dba698c2781f1d8027ba3b Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Tue, 29 Aug 2023 05:00:13 +0300
Subject: [PATCH 132/212] Update build.gradle

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 91503d0..8a3708a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,9 +30,9 @@ subprojects {
 }
 
 group = 'org.json'
-version = 'v20211205-SNAPSHOT'
+version = 'v20230618-SNAPSHOT'
 description = 'JSON in Java'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 configurations.all {
 }

From 7c1b6531e7ed3044f3edd5565416eb25cd9057ce Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 3 Sep 2023 11:35:15 -0500
Subject: [PATCH 133/212] Update CONTRIBUTING.md

Updated for Hacktoberfest 2023
---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d81ff61..8102dcf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 # Contribution Guidelines
 
-Feel free to work on any issue with a #hacktoberfest label.
+Feel free to work on any open issue, you don't need to ask permission first. This year, the hacktoberfest label will be added to any PR and associated issue during the month of October.
 
-If you discover an issue you would like to work on, you can add a new issue to the list. If it meets our criteria, a hacktoberfest label will be added.
+If you discover an issue you would like to work on, you can add a new issue to the list. If it meets our criteria, it will be available to work on (if not, it will be closed after review).
 
 # Who is allowed to submit pull requests for this project?
 

From 74cd73f97c469e1996112389685256fec29bcaba Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Fri, 8 Sep 2023 07:34:00 +0300
Subject: [PATCH 134/212] Addressed compile warnings

---
 .../java/org/json/junit/JSONArrayTest.java    | 44 +++++++-------
 .../java/org/json/junit/JSONObjectTest.java   | 57 +++++++++----------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index aea4e30..ad938cf 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -368,16 +368,16 @@ public class JSONArrayTest {
                 "hello".equals(jsonArray.getString(4)));
         // doubles
         assertTrue("Array double",
-                new Double(23.45e-4).equals(jsonArray.getDouble(5)));
+                Double.valueOf(23.45e-4).equals(jsonArray.getDouble(5)));
         assertTrue("Array string double",
-                new Double(23.45).equals(jsonArray.getDouble(6)));
+                Double.valueOf(23.45).equals(jsonArray.getDouble(6)));
         assertTrue("Array double can be float",
-                new Float(23.45e-4f).equals(jsonArray.getFloat(5)));
+                Float.valueOf(23.45e-4f).equals(jsonArray.getFloat(5)));
         // ints
         assertTrue("Array value int",
-                new Integer(42).equals(jsonArray.getInt(7)));
+                Integer.valueOf(42).equals(jsonArray.getInt(7)));
         assertTrue("Array value string int",
-                new Integer(43).equals(jsonArray.getInt(8)));
+                Integer.valueOf(43).equals(jsonArray.getInt(8)));
         // nested objects
         JSONArray nestedJsonArray = jsonArray.getJSONArray(9);
         assertTrue("Array value JSONArray", nestedJsonArray != null);
@@ -385,9 +385,9 @@ public class JSONArrayTest {
         assertTrue("Array value JSONObject", nestedJsonObject != null);
         // longs
         assertTrue("Array value long",
-                new Long(0).equals(jsonArray.getLong(11)));
+                Long.valueOf(0).equals(jsonArray.getLong(11)));
         assertTrue("Array value string long",
-                new Long(-1).equals(jsonArray.getLong(12)));
+                Long.valueOf(-1).equals(jsonArray.getLong(12)));
 
         assertTrue("Array value null", jsonArray.isNull(-1));
         Util.checkJSONArrayMaps(jsonArray);
@@ -545,11 +545,11 @@ public class JSONArrayTest {
                 Boolean.FALSE.equals(jsonArray.optBooleanObject(-1)));
 
         assertTrue("Array opt double",
-                new Double(23.45e-4).equals(jsonArray.optDouble(5)));
+                Double.valueOf(23.45e-4).equals(jsonArray.optDouble(5)));
         assertTrue("Array opt double default",
-                new Double(1).equals(jsonArray.optDouble(0, 1)));
+                Double.valueOf(1).equals(jsonArray.optDouble(0, 1)));
         assertTrue("Array opt double default implicit",
-           new Double(jsonArray.optDouble(99)).isNaN());
+           Double.valueOf(jsonArray.optDouble(99)).isNaN());
 
         assertTrue("Array opt double object",
                 Double.valueOf(23.45e-4).equals(jsonArray.optDoubleObject(5)));
@@ -559,11 +559,11 @@ public class JSONArrayTest {
                 jsonArray.optDoubleObject(99).isNaN());
 
         assertTrue("Array opt float",
-                new Float(23.45e-4).equals(jsonArray.optFloat(5)));
+                Float.valueOf(Double.valueOf(23.45e-4).floatValue()).equals(jsonArray.optFloat(5)));
         assertTrue("Array opt float default",
-                new Float(1).equals(jsonArray.optFloat(0, 1)));
+                Float.valueOf(1).equals(jsonArray.optFloat(0, 1)));
         assertTrue("Array opt float default implicit",
-           new Float(jsonArray.optFloat(99)).isNaN());
+           Float.valueOf(jsonArray.optFloat(99)).isNaN());
 
         assertTrue("Array opt float object",
                 Float.valueOf(23.45e-4F).equals(jsonArray.optFloatObject(5)));
@@ -575,14 +575,14 @@ public class JSONArrayTest {
         assertTrue("Array opt Number",
                 BigDecimal.valueOf(23.45e-4).equals(jsonArray.optNumber(5)));
         assertTrue("Array opt Number default",
-                new Double(1).equals(jsonArray.optNumber(0, 1d)));
+                Double.valueOf(1).equals(jsonArray.optNumber(0, 1d)));
         assertTrue("Array opt Number default implicit",
-           new Double(jsonArray.optNumber(99,Double.NaN).doubleValue()).isNaN());
+           Double.valueOf(jsonArray.optNumber(99,Double.NaN).doubleValue()).isNaN());
 
         assertTrue("Array opt int",
-                new Integer(42).equals(jsonArray.optInt(7)));
+                Integer.valueOf(42).equals(jsonArray.optInt(7)));
         assertTrue("Array opt int default",
-                new Integer(-1).equals(jsonArray.optInt(0, -1)));
+                Integer.valueOf(-1).equals(jsonArray.optInt(0, -1)));
         assertTrue("Array opt int default implicit",
                 0 == jsonArray.optInt(0));
 
@@ -1011,12 +1011,12 @@ public class JSONArrayTest {
         assertTrue("Array double [23.45e-4]",
                 new BigDecimal("0.002345").equals(it.next()));
         assertTrue("Array string double",
-                new Double(23.45).equals(Double.parseDouble((String)it.next())));
+                Double.valueOf(23.45).equals(Double.parseDouble((String)it.next())));
 
         assertTrue("Array value int",
-                new Integer(42).equals(it.next()));
+                Integer.valueOf(42).equals(it.next()));
         assertTrue("Array value string int",
-                new Integer(43).equals(Integer.parseInt((String)it.next())));
+                Integer.valueOf(43).equals(Integer.parseInt((String)it.next())));
 
         JSONArray nestedJsonArray = (JSONArray)it.next();
         assertTrue("Array value JSONArray", nestedJsonArray != null);
@@ -1025,9 +1025,9 @@ public class JSONArrayTest {
         assertTrue("Array value JSONObject", nestedJsonObject != null);
 
         assertTrue("Array value long",
-                new Long(0).equals(((Number) it.next()).longValue()));
+                Long.valueOf(0).equals(((Number) it.next()).longValue()));
         assertTrue("Array value string long",
-                new Long(-1).equals(Long.parseLong((String) it.next())));
+                Long.valueOf(-1).equals(Long.parseLong((String) it.next())));
         assertTrue("should be at end of array", !it.hasNext());
         Util.checkJSONArraysMaps(new ArrayList<JSONArray>(Arrays.asList(
                 jsonArray, nestedJsonArray
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 3250c25..2de8f81 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -54,7 +54,6 @@ import org.json.junit.data.Singleton;
 import org.json.junit.data.SingletonEnum;
 import org.json.junit.data.WeirdList;
 import org.junit.Test;
-import org.json.junit.Util;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
@@ -304,12 +303,12 @@ public class JSONObjectTest {
     @Test
     public void jsonObjectByMap() {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("trueKey", new Boolean(true));
-        map.put("falseKey", new Boolean(false));
+        map.put("trueKey", Boolean.valueOf(true));
+        map.put("falseKey", Boolean.valueOf(false));
         map.put("stringKey", "hello world!");
         map.put("escapeStringKey", "h\be\tllo w\u1234orld!");
-        map.put("intKey", new Long(42));
-        map.put("doubleKey", new Double(-23.45e67));
+        map.put("intKey", Long.valueOf(42));
+        map.put("doubleKey", Double.valueOf(-23.45e67));
         JSONObject jsonObject = new JSONObject(map);
 
         // validate JSON
@@ -570,13 +569,13 @@ public class JSONObjectTest {
     @Test
     public void jsonObjectByMapWithNullValue() {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("trueKey", new Boolean(true));
-        map.put("falseKey", new Boolean(false));
+        map.put("trueKey", Boolean.valueOf(true));
+        map.put("falseKey", Boolean.valueOf(false));
         map.put("stringKey", "hello world!");
         map.put("nullKey", null);
         map.put("escapeStringKey", "h\be\tllo w\u1234orld!");
-        map.put("intKey", new Long(42));
-        map.put("doubleKey", new Double(-23.45e67));
+        map.put("intKey", Long.valueOf(42));
+        map.put("doubleKey", Double.valueOf(-23.45e67));
         JSONObject jsonObject = new JSONObject(map);
 
         // validate JSON
@@ -996,7 +995,7 @@ public class JSONObjectTest {
         assertTrue( "0.2 should be a BigDecimal!",
                 JSONObject.stringToValue( "0.2" ) instanceof BigDecimal );
         assertTrue( "Doubles should be BigDecimal, even when incorrectly converting floats!",
-                JSONObject.stringToValue( new Double( "0.2f" ).toString() ) instanceof BigDecimal );
+                JSONObject.stringToValue( Double.valueOf( "0.2f" ).toString() ) instanceof BigDecimal );
         /**
          * This test documents a need for BigDecimal conversion.
          */
@@ -1006,13 +1005,13 @@ public class JSONObjectTest {
         assertTrue( "1 should be an Integer!",
                 JSONObject.stringToValue( "1" ) instanceof Integer );
         assertTrue( "Integer.MAX_VALUE should still be an Integer!",
-                JSONObject.stringToValue( new Integer( Integer.MAX_VALUE ).toString() ) instanceof Integer );
+                JSONObject.stringToValue( Integer.valueOf( Integer.MAX_VALUE ).toString() ) instanceof Integer );
         assertTrue( "Large integers should be a Long!",
                 JSONObject.stringToValue( Long.valueOf(((long)Integer.MAX_VALUE) + 1 ) .toString() ) instanceof Long );
         assertTrue( "Long.MAX_VALUE should still be an Integer!",
-                JSONObject.stringToValue( new Long( Long.MAX_VALUE ).toString() ) instanceof Long );
+                JSONObject.stringToValue( Long.valueOf( Long.MAX_VALUE ).toString() ) instanceof Long );
 
-        String str = new BigInteger( new Long( Long.MAX_VALUE ).toString() ).add( BigInteger.ONE ).toString();
+        String str = new BigInteger( Long.valueOf( Long.MAX_VALUE ).toString() ).add( BigInteger.ONE ).toString();
         assertTrue( "Really large integers currently evaluate to BigInteger",
                 JSONObject.stringToValue(str).equals(new BigInteger("9223372036854775808")));
     }
@@ -1259,8 +1258,8 @@ public class JSONObjectTest {
         String key30 = "key30";
         String key31 = "key31";
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put(key30, new Double(3.0));
-        jsonObject.put(key31, new Double(3.1));
+        jsonObject.put(key30, Double.valueOf(3.0));
+        jsonObject.put(key31, Double.valueOf(3.1));
 
         assertTrue("3.0 should remain a double",
                 jsonObject.getDouble(key30) == 3); 
@@ -1713,19 +1712,19 @@ public class JSONObjectTest {
         */
         assertFalse("Document unexpected behaviour with explicit type-casting float as double!", (double)0.2f == 0.2d );
         assertFalse("Document unexpected behaviour with implicit type-cast!", 0.2f == 0.2d );
-        Double d1 = new Double( 1.1f );
-        Double d2 = new Double( "1.1f" );
+        Double d1 = Double.valueOf( 1.1f );
+        Double d2 = Double.valueOf( "1.1f" );
         assertFalse( "Document implicit type cast from float to double before calling Double(double d) constructor", d1.equals( d2 ) );
 
-        assertTrue( "Correctly converting float to double via base10 (string) representation!", new Double( 3.1d ).equals(  new Double( new Float( 3.1f ).toString() ) ) );
+        assertTrue( "Correctly converting float to double via base10 (string) representation!", Double.valueOf( 3.1d ).equals(  Double.valueOf( Float.valueOf( 3.1f ).toString() ) ) );
 
         // Pinpointing the not so obvious "buggy" conversion from float to double in JSONObject
         JSONObject jo = new JSONObject();
         jo.put( "bug", 3.1f ); // will call put( String key, double value ) with implicit and "buggy" type-cast from float to double
-        assertFalse( "The java-compiler did add some zero bits for you to the mantissa (unexpected, but well documented)", jo.get( "bug" ).equals(  new Double( 3.1d ) ) );
+        assertFalse( "The java-compiler did add some zero bits for you to the mantissa (unexpected, but well documented)", jo.get( "bug" ).equals(  Double.valueOf( 3.1d ) ) );
 
         JSONObject inc = new JSONObject();
-        inc.put( "bug", new Float( 3.1f ) ); // This will put in instance of Float into JSONObject, i.e. call put( String key, Object value )
+        inc.put( "bug", Float.valueOf( 3.1f ) ); // This will put in instance of Float into JSONObject, i.e. call put( String key, Object value )
         assertTrue( "Everything is ok here!", inc.get( "bug" ) instanceof Float );
         inc.increment( "bug" ); // after adding 1, increment will call put( String key, double value ) with implicit and "buggy" type-cast from float to double!
         // this.put(key, (Float) value + 1);
@@ -2040,14 +2039,14 @@ public class JSONObjectTest {
         assertTrue("map valueToString() incorrect",
                 jsonObject.toString().equals(JSONObject.valueToString(map))); 
         Collection<Integer> collection = new ArrayList<Integer>();
-        collection.add(new Integer(1));
-        collection.add(new Integer(2));
-        collection.add(new Integer(3));
+        collection.add(Integer.valueOf(1));
+        collection.add(Integer.valueOf(2));
+        collection.add(Integer.valueOf(3));
         assertTrue("collection valueToString() expected: "+
                 jsonArray.toString()+ " actual: "+
                 JSONObject.valueToString(collection),
                 jsonArray.toString().equals(JSONObject.valueToString(collection))); 
-        Integer[] array = { new Integer(1), new Integer(2), new Integer(3) };
+        Integer[] array = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) };
         assertTrue("array valueToString() incorrect",
                 jsonArray.toString().equals(JSONObject.valueToString(array)));
         Util.checkJSONObjectMaps(jsonObject);
@@ -2085,7 +2084,7 @@ public class JSONObjectTest {
                 JSONObject.NULL == JSONObject.wrap(null));
 
         // wrap(Integer) returns Integer
-        Integer in = new Integer(1);
+        Integer in = Integer.valueOf(1);
         assertTrue("Integer wrap() incorrect",
                 in == JSONObject.wrap(in));
 
@@ -2112,9 +2111,9 @@ public class JSONObjectTest {
 
         // wrap collection returns JSONArray
         Collection<Integer> collection = new ArrayList<Integer>();
-        collection.add(new Integer(1));
-        collection.add(new Integer(2));
-        collection.add(new Integer(3));
+        collection.add(Integer.valueOf(1));
+        collection.add(Integer.valueOf(2));
+        collection.add(Integer.valueOf(3));
         JSONArray jsonArray = (JSONArray) (JSONObject.wrap(collection));
 
         // validate JSON
@@ -2125,7 +2124,7 @@ public class JSONObjectTest {
         assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2")));
 
         // wrap Array returns JSONArray
-        Integer[] array = { new Integer(1), new Integer(2), new Integer(3) };
+        Integer[] array = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) };
         JSONArray integerArrayJsonArray = (JSONArray)(JSONObject.wrap(array));
 
         // validate JSON

From becc1631e6dbe41e3a0245d765b01509de2608b5 Mon Sep 17 00:00:00 2001
From: simonh5 <simonh5@illinois.edu>
Date: Mon, 18 Sep 2023 20:20:13 -0500
Subject: [PATCH 135/212] fix: flakiness in
 JSONMLTest#testToJSONObject_reversibility

---
 build.gradle                                 | 1 +
 pom.xml                                      | 7 +++++++
 src/test/java/org/json/junit/JSONMLTest.java | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8a3708a..5a5be37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.1'
 }
 
 subprojects {
diff --git a/pom.xml b/pom.xml
index 720529c..8bbcc3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,13 @@
             <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.skyscreamer/jsonassert -->
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 35c0af2..9b5e5b6 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.*;
 
 import org.json.*;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 /**
  * Tests for org.json.JSONML.java
@@ -763,7 +764,7 @@ public class JSONMLTest {
         final JSONObject revertedObject = JSONML.toJSONObject(xml, false);
         final String newJson = revertedObject.toString();
         assertTrue("JSON Objects are not similar",originalObject.similar(revertedObject));
-        assertEquals("original JSON does not equal the new JSON",originalJson, newJson);
+        JSONAssert.assertEquals("original JSON does not equal the new JSON", originalJson, newJson, false);
     }
 
 // these tests do not pass for the following reasons:

From 3e688afc66a8cb84d0dcd9a49f2431cb304ba72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 19 Sep 2023 07:38:13 -0700
Subject: [PATCH 136/212] Small test fixes.

One test method was missing `@Test` so it was never run.

One test method used another test class as the base for finding a test
resource. While this works in practice with Maven, it is not strictly
right.
---
 src/test/java/org/json/junit/JSONArrayTest.java  | 2 +-
 src/test/java/org/json/junit/JSONObjectTest.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index ad938cf..cb97eea 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -1369,7 +1369,7 @@ public class JSONArrayTest {
     @Test(expected = JSONException.class)
     public void issue654StackOverflowInputWellFormed() {
         //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
-        final InputStream resourceAsStream = JSONObjectTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedArray.json");
+        final InputStream resourceAsStream = JSONArrayTest.class.getClassLoader().getResourceAsStream("Issue654WellFormedArray.json");
         JSONTokener tokener = new JSONTokener(resourceAsStream);
         JSONArray json_input = new JSONArray(tokener);
         assertNotNull(json_input);
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2de8f81..c3fb8f3 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3288,6 +3288,7 @@ public class JSONObjectTest {
      * Sample test case from https://github.com/stleary/JSON-java/issues/531
      * which verifies that no regression in double/BigDecimal support is present.
      */
+    @Test
     public void testObjectToBigDecimal() {  
         double value = 1412078745.01074;  
         Reader reader = new StringReader("[{\"value\": " + value + "}]");

From ca88454f1cdaedf46bcce546c0a9ce79709c544c Mon Sep 17 00:00:00 2001
From: simonh5 <simonh5@illinois.edu>
Date: Tue, 19 Sep 2023 14:28:06 -0500
Subject: [PATCH 137/212] fix: flakiness in
 org.json.junit.JSONObjectTest#valueToString

---
 build.gradle                                     | 1 +
 pom.xml                                          | 7 +++++++
 src/test/java/org/json/junit/JSONObjectTest.java | 9 +++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a3708a..5a5be37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.1'
 }
 
 subprojects {
diff --git a/pom.xml b/pom.xml
index 720529c..8bbcc3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,13 @@
             <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.skyscreamer/jsonassert -->
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2de8f81..4eefea8 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -57,6 +57,7 @@ import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 /**
  * JSONObject, along with JSONArray, are the central classes of the reference app.
@@ -2025,8 +2026,8 @@ public class JSONObjectTest {
                 "\"key3\":\"val3\""+
              "}";
         JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        assertTrue("jsonObject valueToString() incorrect",
-                JSONObject.valueToString(jsonObject).equals(jsonObject.toString()));
+        JSONAssert.assertEquals("jsonObject valueToString() incorrect",
+                                JSONObject.valueToString(jsonObject), jsonObject.toString(), false);
         String jsonArrayStr = 
             "[1,2,3]";
         JSONArray jsonArray = new JSONArray(jsonArrayStr);
@@ -2036,8 +2037,8 @@ public class JSONObjectTest {
         map.put("key1", "val1");
         map.put("key2", "val2");
         map.put("key3", "val3");
-        assertTrue("map valueToString() incorrect",
-                jsonObject.toString().equals(JSONObject.valueToString(map))); 
+        JSONAssert.assertEquals("map valueToString() incorrect",
+                jsonObject.toString(), JSONObject.valueToString(map), false);
         Collection<Integer> collection = new ArrayList<Integer>();
         collection.add(Integer.valueOf(1));
         collection.add(Integer.valueOf(2));

From 661114c50dcfd53bb041aab66f14bb91e0a87c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Wed, 20 Sep 2023 10:50:48 -0700
Subject: [PATCH 138/212] Generalize the logic to disallow nested objects and
 arrays as keys in objects.

Fixes #771.
---
 src/main/java/org/json/JSONObject.java        | 16 ++++-----------
 src/main/java/org/json/JSONTokener.java       | 20 ++++++++++++++-----
 .../java/org/json/junit/JSONObjectTest.java   | 18 +++++++++++++++++
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 5e00eb9..3986c56 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -208,22 +208,14 @@ public class JSONObject {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
         for (;;) {
-            char prev = x.getPrevious();
             c = x.nextClean();
             switch (c) {
             case 0:
                 throw x.syntaxError("A JSONObject text must end with '}'");
             case '}':
                 return;
-            case '{':
-            case '[':
-                if(prev=='{') {
-                    throw x.syntaxError("A JSON Object can not directly nest another JSON Object or JSON Array.");
-                }
-                // fall through
             default:
-                x.back();
-                key = x.nextValue().toString();
+                key = x.nextSimpleValue(c).toString();
             }
 
             // The key is followed by ':'.
@@ -1712,12 +1704,12 @@ public class JSONObject {
                         final Object result = method.invoke(bean);
                         if (result != null) {
                             // check cyclic dependency and throw error if needed
-                            // the wrap and populateMap combination method is 
+                            // the wrap and populateMap combination method is
                             // itself DFS recursive
                             if (objectsRecord.contains(result)) {
                                 throw recursivelyDefinedObjectException(key);
                             }
-                            
+
                             objectsRecord.add(result);
 
                             this.map.put(key, wrap(result, objectsRecord));
@@ -1726,7 +1718,7 @@ public class JSONObject {
 
                             // 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 
+                            // after calling toString
                             if (result instanceof Closeable) {
                                 try {
                                     ((Closeable) result).close();
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 5dc8ae8..4a7122f 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -402,12 +402,7 @@ public class JSONTokener {
      */
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
-        String string;
-
         switch (c) {
-        case '"':
-        case '\'':
-            return this.nextString(c);
         case '{':
             this.back();
             try {
@@ -423,6 +418,21 @@ public class JSONTokener {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
         }
+        return nextSimpleValue(c);
+    }
+
+    Object nextSimpleValue(char c) {
+        String string;
+
+        switch (c) {
+        case '"':
+        case '\'':
+            return this.nextString(c);
+        case '{':
+            throw syntaxError("Nested object not expected here.");
+        case '[':
+            throw syntaxError("Nested array not expected here.");
+        }
 
         /*
          * Handle unquoted text. This could be the values true, false, or
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2de8f81..23feda9 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2224,6 +2224,24 @@ public class JSONObjectTest {
                     "Expected a ',' or '}' at 15 [character 16 line 1]",
                     e.getMessage());
         }
+        try {
+            // key is a nested map
+            String str = "{{\"foo\": \"bar\"}: \"baz\"}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Nested object not expected here. at 2 [character 3 line 1]",
+                e.getMessage());
+        }
+        try {
+            // key is a nested array containing a map
+            String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Nested array not expected here. at 10 [character 11 line 1]",
+                e.getMessage());
+        }
         try {
             // \0 after ,
             String str = "{\"myKey\":true, \0\"myOtherKey\":false}";

From db0fde2a566f5333a3ad2e70e6d21fc5680422f1 Mon Sep 17 00:00:00 2001
From: Edijs <edijs.egle@gmail.com>
Date: Mon, 25 Sep 2023 20:18:33 +0300
Subject: [PATCH 139/212] Add optJSONArray method to JSONObject with a default
 value

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 5e00eb9..c6ac47a 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1512,8 +1512,22 @@ public class JSONObject {
      * @return A JSONArray which is the value.
      */
     public JSONArray optJSONArray(String key) {
-        Object o = this.opt(key);
-        return o instanceof JSONArray ? (JSONArray) o : null;
+        return this.optJSONArray(key, null);
+    }
+
+    /**
+     * Get an optional JSONArray associated with a key, or the default if there
+     * is no such key, or if its value is not a JSONArray.
+     *
+     * @param key
+     *            A key string.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONArray which is the value.
+     */
+    public JSONArray optJSONArray(String key, JSONArray defaultValue) {
+        Object object = this.opt(key);
+        return object instanceof JSONArray ? (JSONArray) object : defaultValue;
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2de8f81..07eb38b 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2510,6 +2510,8 @@ public class JSONObjectTest {
                 MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
         assertTrue("optJSONArray() should return null ",
                 null==jsonObject.optJSONArray("myKey"));
+        assertTrue("optJSONArray() should return default JSONArray",
+                "value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
         assertTrue("optJSONObject() should return default JSONObject ",
                 jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
         assertTrue("optLong() should return default long",
@@ -2555,6 +2557,8 @@ public class JSONObjectTest {
                  Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
          assertTrue("optEnum() should return default Enum",
                  MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
+         assertTrue("optJSONArray() should return default JSONArray",
+                 "value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
          assertTrue("optJSONArray() should return null ",
                  null==jsonObject.optJSONArray("myKey"));
          assertTrue("optJSONObject() should return default JSONObject ",

From 284a31683898111b64ee5c92fa909b604bd9051d Mon Sep 17 00:00:00 2001
From: Edijs <edijs.egle@gmail.com>
Date: Wed, 27 Sep 2023 19:30:45 +0300
Subject: [PATCH 140/212] Add optJSONArray and optJSONObject methods to
 JSONArray with a default value

---
 src/main/java/org/json/JSONArray.java         | 47 +++++++++++++++----
 .../java/org/json/junit/JSONArrayTest.java    |  8 +++-
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 375d038..cc9531e 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -924,30 +924,57 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional JSONArray associated with an index.
+     * Get the optional JSONArray associated with an index. Null is returned if
+     * there is no value at that index or if the value is not a JSONArray.
      *
      * @param index
-     *            subscript
-     * @return A JSONArray value, or null if the index has no value, or if the
-     *         value is not a JSONArray.
+     *            The index must be between 0 and length() - 1.
+     * @return A JSONArray value.
      */
     public JSONArray optJSONArray(int index) {
-        Object o = this.opt(index);
-        return o instanceof JSONArray ? (JSONArray) o : null;
+        return this.optJSONArray(index, null);
+    }
+
+    /**
+     * Get the optional JSONArray associated with an index. The defaultValue is returned if
+     * there is no value at that index or if the value is not a JSONArray.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONArray value.
+     */
+    public JSONArray optJSONArray(int index, JSONArray defaultValue) {
+        Object object = this.opt(index);
+        return object instanceof JSONArray ? (JSONArray) object : defaultValue;
     }
 
     /**
      * Get the optional JSONObject associated with an index. Null is returned if
-     * the key is not found, or null if the index has no value, or if the value
-     * is not a JSONObject.
+     * there is no value at that index or if the value is not a JSONObject.
      *
      * @param index
      *            The index must be between 0 and length() - 1.
      * @return A JSONObject value.
      */
     public JSONObject optJSONObject(int index) {
-        Object o = this.opt(index);
-        return o instanceof JSONObject ? (JSONObject) o : null;
+        return this.optJSONObject(index, null);
+    }
+
+    /**
+     * Get the optional JSONObject associated with an index. The defaultValue is returned if
+     * there is no value at that index or if the value is not a JSONObject.
+     *
+     * @param index
+     *            The index must be between 0 and length() - 1.
+     * @param defaultValue
+     *            The default.
+     * @return A JSONObject value.
+     */
+    public JSONObject optJSONObject(int index, JSONObject defaultValue) {
+        Object object = this.opt(index);
+        return object instanceof JSONObject ? (JSONObject) object : defaultValue;
     }
 
     /**
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index ad938cf..d735bf5 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -595,13 +595,17 @@ public class JSONArrayTest {
 
         JSONArray nestedJsonArray = jsonArray.optJSONArray(9);
         assertTrue("Array opt JSONArray", nestedJsonArray != null);
-        assertTrue("Array opt JSONArray default", 
+        assertTrue("Array opt JSONArray null",
                 null == jsonArray.optJSONArray(99));
+        assertTrue("Array opt JSONArray default",
+                "value".equals(jsonArray.optJSONArray(99, new JSONArray("[\"value\"]")).getString(0)));
 
         JSONObject nestedJsonObject = jsonArray.optJSONObject(10);
         assertTrue("Array opt JSONObject", nestedJsonObject != null);
-        assertTrue("Array opt JSONObject default", 
+        assertTrue("Array opt JSONObject null",
                 null == jsonArray.optJSONObject(99));
+        assertTrue("Array opt JSONObject default",
+                "value".equals(jsonArray.optJSONObject(99, new JSONObject("{\"key\":\"value\"}")).getString("key")));
 
         assertTrue("Array opt long",
                 0 == jsonArray.optLong(11));

From 16967f322ee65c301b48fa79bb681e38896fd212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Wed, 27 Sep 2023 12:42:04 -0700
Subject: [PATCH 141/212] Simplify the check for object keys that are
 themselves objects.

For object keys, we can just skip the part of `nextValue()` that parses values
that are objects or arrays. Then the existing logic for unquoted values will
already stop at `{` or `[`, and that will produce a `Missing value` exception.
---
 src/main/java/org/json/JSONTokener.java          | 4 ----
 src/test/java/org/json/junit/JSONObjectTest.java | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 4a7122f..4a83a69 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -428,10 +428,6 @@ public class JSONTokener {
         case '"':
         case '\'':
             return this.nextString(c);
-        case '{':
-            throw syntaxError("Nested object not expected here.");
-        case '[':
-            throw syntaxError("Nested array not expected here.");
         }
 
         /*
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 23feda9..88115c8 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -2230,7 +2230,7 @@ public class JSONObjectTest {
             assertNull("Expected an exception",new JSONObject(str));
         } catch (JSONException e) {
             assertEquals("Expecting an exception message",
-                "Nested object not expected here. at 2 [character 3 line 1]",
+                "Missing value at 1 [character 2 line 1]",
                 e.getMessage());
         }
         try {
@@ -2239,7 +2239,7 @@ public class JSONObjectTest {
             assertNull("Expected an exception",new JSONObject(str));
         } catch (JSONException e) {
             assertEquals("Expecting an exception message",
-                "Nested array not expected here. at 10 [character 11 line 1]",
+                "Missing value at 9 [character 10 line 1]",
                 e.getMessage());
         }
         try {

From dbb113176b143b519ad0a50b033a9997cc2248fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 28 Sep 2023 11:05:50 -0700
Subject: [PATCH 142/212] Add more test cases for unquoted text in objects and
 arrays.

---
 .../java/org/json/junit/JSONArrayTest.java    | 16 ++++++++++++-
 .../java/org/json/junit/JSONObjectTest.java   | 24 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index ad938cf..5a98878 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -118,7 +118,7 @@ public class JSONArrayTest {
      * Expects a JSONException.
      */
     @Test
-    public void emptStr() {
+    public void emptyStr() {
         String str = "";
         try {
             assertNull("Should throw an exception", new JSONArray(str));
@@ -460,6 +460,20 @@ public class JSONArrayTest {
         Util.checkJSONArrayMaps(jsonArray);
     }
 
+    /**
+     * The JSON parser is permissive of unambiguous unquoted keys and values.
+     * Such JSON text should be allowed, even if it does not strictly conform
+     * to the spec. However, after being parsed, toString() should emit strictly
+     * conforming JSON text.  
+     */
+    @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());
+    }
+
     /**
      * Exercise JSONArray.join() by converting a JSONArray into a 
      * comma-separated string. Since this is very nearly a JSON document,
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 88115c8..b9ff59e 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -205,13 +205,17 @@ public class JSONObjectTest {
      */
     @Test
     public void unquotedText() {
-        String str = "{key1:value1, key2:42}";
+        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);
     }
     
@@ -2242,6 +2246,24 @@ public class JSONObjectTest {
                 "Missing value at 9 [character 10 line 1]",
                 e.getMessage());
         }
+        try {
+            // key contains }
+            String str = "{foo}: 2}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Expected a ':' after a key at 5 [character 6 line 1]",
+                e.getMessage());
+        }
+        try {
+            // key contains ]
+            String str = "{foo]: 2}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Expected a ':' after a key at 5 [character 6 line 1]",
+                e.getMessage());
+        }
         try {
             // \0 after ,
             String str = "{\"myKey\":true, \0\"myOtherKey\":false}";

From 61bb60e7525a851b222e3129b90a008bd6025877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Ol=C4=99dzki?= <grzegon@poczta.onet.pl>
Date: Sat, 30 Sep 2023 21:36:11 +0200
Subject: [PATCH 143/212] Removing excessive synchronization

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

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index cc9531e..b0c912d 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1646,9 +1646,7 @@ public class JSONArray implements Iterable<Object> {
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            return this.write(sw, indentFactor, 0).toString();
-        }
+        return this.write(sw, indentFactor, 0).toString();
     }
 
     /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index c6ac47a..3d9594c 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2191,13 +2191,11 @@ public class JSONObject {
     @SuppressWarnings("resource")
     public static String quote(String string) {
         StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            try {
-                return quote(string, sw).toString();
-            } catch (IOException ignored) {
-                // will never happen - we are writing to a string writer
-                return "";
-            }
+        try {
+            return quote(string, sw).toString();
+        } catch (IOException ignored) {
+            // will never happen - we are writing to a string writer
+            return "";
         }
     }
 
@@ -2584,9 +2582,7 @@ public class JSONObject {
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
         StringWriter w = new StringWriter();
-        synchronized (w.getBuffer()) {
-            return this.write(w, indentFactor, 0).toString();
-        }
+        return this.write(w, indentFactor, 0).toString();
     }
 
     /**

From ff921db783a315a90797312f0d1fca469d97db90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Ol=C4=99dzki?= <grzegon@poczta.onet.pl>
Date: Sat, 30 Sep 2023 21:53:36 +0200
Subject: [PATCH 144/212] Junit 4.13.2

---
 build.gradle | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a3708a..fbc2ff1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
 }
diff --git a/pom.xml b/pom.xml
index 720529c..29592fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From fe45fa9cfbaf1a4b4df223ff3357a0d73d3a2932 Mon Sep 17 00:00:00 2001
From: Allon Mureinik <allon@synopsys.com>
Date: Thu, 5 Oct 2023 15:29:51 +0300
Subject: [PATCH 145/212] Fix XMLTest on Windows

XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig fails
when run on Windows due to mismatching linebreaks (that aren't
important for the test's functionality) between the actual and
expected strings.

For the actual strings, linebreaks are canonized to the platform's
native linebreak using `replaceAll("\\n|\\r\\n",
System.getProperty("line.separator")`. However, the expected result is
read from a file, and is left with the linebreaks that were originally
used to create it.

The solution is to perform the same canonization on both strings.

Closes #781
---
 src/test/java/org/json/junit/XMLTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index e940032..6e7b1a9 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1239,7 +1239,8 @@ public class XMLTest {
                     for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
                         expected.append(buffer, 0, numRead);
                     }
-                    assertEquals(expected.toString(), actualString.replaceAll("\\n|\\r\\n", System.getProperty("line.separator")));
+                    assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.getProperty("line.separator")),
+                            actualString.replaceAll("\\n|\\r\\n", System.getProperty("line.separator")));
                 } finally {
                     if (xmlStream != null) {
                         xmlStream.close();

From 4c8cac22a89069209439809243ac4eddf6b0dd47 Mon Sep 17 00:00:00 2001
From: Allon Mureinik <allon@synopsys.com>
Date: Thu, 5 Oct 2023 19:47:33 +0300
Subject: [PATCH 146/212] Use System.lineSeparator()

Use the built-in System.lineSeparator() instead of implementing it
ourselves with System.getProperty("line.separator") in order to clean
up the code and make it easier to maintain.
---
 src/test/java/org/json/junit/XMLTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 6e7b1a9..712b8ee 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1239,8 +1239,8 @@ public class XMLTest {
                     for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
                         expected.append(buffer, 0, numRead);
                     }
-                    assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.getProperty("line.separator")),
-                            actualString.replaceAll("\\n|\\r\\n", System.getProperty("line.separator")));
+                    assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.lineSeparator()),
+                            actualString.replaceAll("\\n|\\r\\n", System.lineSeparator()));
                 } finally {
                     if (xmlStream != null) {
                         xmlStream.close();

From 1a38879c9099078a1cc63a80312da318235ad0f6 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Fri, 6 Oct 2023 21:34:00 +0530
Subject: [PATCH 147/212] #653 - optLong vs getLong inconsistencies For
 exponential decimal conversion, number is not touched. Leading zeros removed
 from numeric number strings before converting to number.

---
 src/main/java/org/json/JSONObject.java        | 36 +++++++++++++++++--
 .../org/json/junit/JSONObjectNumberTest.java  |  6 +++-
 .../java/org/json/junit/JSONObjectTest.java   | 35 +++++++++++++++++-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index acef67d..5eb3322 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2379,12 +2379,13 @@ public class JSONObject {
      * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
      * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
      *
-     * @param val value to convert
+     * @param input value to convert
      * @return Number representation of the value.
      * @throws NumberFormatException thrown if the value is not a valid number. A public
      *      caller should catch this and wrap it in a {@link JSONException} if applicable.
      */
-    protected static Number stringToNumber(final String val) throws NumberFormatException {
+    protected static Number stringToNumber(final String input) throws NumberFormatException {
+        String val = input;
         char initial = val.charAt(0);
         if ((initial >= '0' && initial <= '9') || initial == '-') {
             // decimal representation
@@ -2411,6 +2412,8 @@ public class JSONObject {
                     }
                 }
             }
+            val = removeLeadingZerosOfNumber(input);
+            initial = val.charAt(0);
             // block items like 00 01 etc. Java number parsers treat these as Octal.
             if(initial == '0' && val.length() > 1) {
                 char at1 = val.charAt(1);
@@ -2886,4 +2889,33 @@ 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){
+        char[] chars = value.toCharArray();
+        int leftMostUnsignedIndex = 0;
+        if (chars[0] == '-'){
+            leftMostUnsignedIndex = 1;
+        }
+        int firstNonZeroCharIndex = -1;
+        for (int i=leftMostUnsignedIndex;i<value.length();i++){
+            if (chars[i] != '0'){
+                firstNonZeroCharIndex = i;
+                break;
+            }
+        }
+        if (firstNonZeroCharIndex == -1){
+            return value;
+        }
+        StringBuilder result = new StringBuilder();
+        if (leftMostUnsignedIndex == 1){
+            result.append('-');
+        }
+        result.append(value.substring(firstNonZeroCharIndex));
+        return result.toString();
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
index 43173a2..14e68d6 100644
--- a/src/test/java/org/json/junit/JSONObjectNumberTest.java
+++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java
@@ -23,7 +23,10 @@ public class JSONObjectNumberTest {
     @Parameters(name = "{index}: {0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
-            {"{value:50}", 1},
+            {"{value:0050}", 1},
+            {"{value:0050.0000}", 1},
+            {"{value:-0050}", -1},
+            {"{value:-0050.0000}", -1},
             {"{value:50.0}", 1},
             {"{value:5e1}", 1},
             {"{value:5E1}", 1},
@@ -32,6 +35,7 @@ public class JSONObjectNumberTest {
             {"{value:-50}", -1},
             {"{value:-50.0}", -1},
             {"{value:-5e1}", -1},
+            {"{value:-0005e1}", -1},
             {"{value:-5E1}", -1},
             {"{value:-5e1}", -1},
             {"{value:'-50'}", -1}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 01889d5..b635521 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1063,12 +1063,16 @@ public class JSONObjectTest {
                 "\"tooManyZeros\":00,"+
                 "\"negativeInfinite\":-Infinity,"+
                 "\"negativeNaN\":-NaN,"+
+                "\"negativeNaNWithLeadingZeros\":-00NaN,"+
                 "\"negativeFraction\":-.01,"+
                 "\"tooManyZerosFraction\":00.001,"+
                 "\"negativeHexFloat\":-0x1.fffp1,"+
                 "\"hexFloat\":0x1.0P-1074,"+
                 "\"floatIdentifier\":0.1f,"+
-                "\"doubleIdentifier\":0.1d"+
+                "\"doubleIdentifier\":0.1d,"+
+                "\"integerWithLeadingZeros\":000900,"+
+                "\"integerWithAllZeros\":00000,"+
+                "\"compositeWithLeadingZeros\":00800.90d"+
             "}";
         JSONObject jsonObject = new JSONObject(str);
         Object obj;
@@ -1085,10 +1089,17 @@ public class JSONObjectTest {
         obj = jsonObject.get("negativeNaN");
         assertTrue( "negativeNaN currently evaluates to string",
                 obj.equals("-NaN"));
+        obj = jsonObject.get("negativeNaNWithLeadingZeros");
+        assertTrue( "negativeNaNWithLeadingZeros currently evaluates to string",
+                obj.equals("-00NaN"));
         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.get( "tooManyZerosFraction" ).equals(BigDecimal.valueOf(0.001)));
+        assertTrue( "tooManyZerosFraction currently evaluates to double 0.001",
+                jsonObject.getLong( "tooManyZerosFraction" )==0);
+        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",
@@ -1097,6 +1108,28 @@ public class JSONObjectTest {
                 jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
         assertTrue("doubleIdentifier currently evaluates to double 0.1",
                 jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
+        assertTrue("Integer does not evaluate to 900",
+                jsonObject.get("integerWithLeadingZeros").equals(900));
+        assertTrue("Integer does not evaluate to 900",
+                jsonObject.getInt("integerWithLeadingZeros")==900);
+        assertTrue("Integer does not evaluate to 900",
+                jsonObject.optInt("integerWithLeadingZeros")==900);
+        assertTrue("Integer does not evaluate to 0",
+                jsonObject.get("integerWithAllZeros").equals("00000"));
+        assertTrue("Integer does not evaluate to 0",
+                jsonObject.getInt("integerWithAllZeros")==0);
+        assertTrue("Integer does not evaluate to 0",
+                jsonObject.optInt("integerWithAllZeros")==0);
+        assertTrue("Double does not evaluate to 800.90",
+                jsonObject.get("compositeWithLeadingZeros").equals(800.90));
+        assertTrue("Double does not evaluate to 800.90",
+                jsonObject.getDouble("compositeWithLeadingZeros")==800.9d);
+        assertTrue("Integer does not evaluate to 800",
+                jsonObject.optInt("compositeWithLeadingZeros")==800);
+        assertTrue("Long does not evaluate to 800.90",
+                jsonObject.getLong("compositeWithLeadingZeros")==800);
+        assertTrue("Long does not evaluate to 800.90",
+                jsonObject.optLong("compositeWithLeadingZeros")==800);
         Util.checkJSONObjectMaps(jsonObject);
     }
 

From 0e4a94d91db64ae9eafed0ff7db5fff87770f0a4 Mon Sep 17 00:00:00 2001
From: Madjosz <28844868+Madjosz@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:17:13 +0200
Subject: [PATCH 148/212] fix failing test XML test on Windows machines

---
 src/test/java/org/json/junit/XMLTest.java | 36 +++++++----------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index e940032..22d6131 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1223,32 +1223,18 @@ public class XMLTest {
 
     @Test
     public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
-        try {
-            InputStream jsonStream = null;
-            try {
-                jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json");
-                final JSONObject object = new JSONObject(new JSONTokener(jsonStream));
-                String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS,2);
-                InputStream xmlStream = null;
-                try {
-                    xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml");
-                    int bufferSize = 1024;
-                    char[] buffer = new char[bufferSize];
-                    StringBuilder expected = new StringBuilder();
-                    Reader in = new InputStreamReader(xmlStream, "UTF-8");
-                    for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
-                        expected.append(buffer, 0, numRead);
-                    }
-                    assertEquals(expected.toString(), actualString.replaceAll("\\n|\\r\\n", System.getProperty("line.separator")));
-                } finally {
-                    if (xmlStream != null) {
-                        xmlStream.close();
-                    }
-                }
-            } finally {
-                if (jsonStream != null) {
-                    jsonStream.close();
+        try (InputStream jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json")) {
+            final JSONObject object = new JSONObject(new JSONTokener(jsonStream));
+            String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS, 2);
+            try (InputStream xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml")) {
+                int bufferSize = 1024;
+                char[] buffer = new char[bufferSize];
+                StringBuilder expected = new StringBuilder();
+                Reader in = new InputStreamReader(xmlStream, "UTF-8");
+                for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
+                    expected.append(buffer, 0, numRead);
                 }
+                assertEquals(expected.toString(), actualString);
             }
         } catch (IOException e) {
             fail("file writer error: " +e.getMessage());

From c93014cb5379bb93f2155e48ee0a4382b4d05ae1 Mon Sep 17 00:00:00 2001
From: Madjosz <28844868+Madjosz@users.noreply.github.com>
Date: Wed, 4 Oct 2023 12:00:47 +0200
Subject: [PATCH 149/212] add validity check for JSONObject constructors

* fixes #713
* document JSONException in JavaDoc
* remove unused Comparable<T> boundary to reuse GenericBean in test
---
 src/main/java/org/json/JSONObject.java        |  6 +++++
 .../java/org/json/junit/JSONObjectTest.java   | 26 +++++++++++++++++--
 .../java/org/json/junit/data/GenericBean.java |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index acef67d..08ccdab 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -283,6 +283,7 @@ public class JSONObject {
         	    }
                 final Object value = e.getValue();
                 if (value != null) {
+                    testValidity(value);
                     this.map.put(String.valueOf(e.getKey()), wrap(value));
                 }
             }
@@ -346,6 +347,8 @@ public class JSONObject {
      * @param bean
      *            An object that has getter methods that should be used to make
      *            a JSONObject.
+     * @throws JSONException
+     *            If a getter returned a non-finite number.
      */
     public JSONObject(Object bean) {
         this();
@@ -1691,6 +1694,8 @@ public class JSONObject {
      *
      * @param bean
      *            the bean
+     * @throws JSONException
+     *            If a getter returned a non-finite number.
      */
     private void populateMap(Object bean) {
         populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()));
@@ -1726,6 +1731,7 @@ public class JSONObject {
 
                             objectsRecord.add(result);
 
+                            testValidity(result);
                             this.map.put(key, wrap(result, objectsRecord));
 
                             objectsRecord.remove(result);
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 01889d5..0503dbb 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -9,6 +9,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 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;
 import static org.mockito.Mockito.mock;
@@ -1972,7 +1973,7 @@ public class JSONObjectTest {
     @Test
     public void jsonObjectToStringSuppressWarningOnCastToMap() {
         JSONObject jsonObject = new JSONObject();
-        Map<String, String> map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         map.put("abc", "def");
         jsonObject.put("key", map);
 
@@ -3283,7 +3284,7 @@ public class JSONObjectTest {
     @SuppressWarnings("boxing")
     @Test
     public void testGenericBean() {
-        GenericBean<Integer> bean = new GenericBean(42);
+        GenericBean<Integer> bean = new GenericBean<>(42);
         final JSONObject jo = new JSONObject(bean);
         assertEquals(jo.keySet().toString(), 8, jo.length());
         assertEquals(42, jo.get("genericValue"));
@@ -3627,4 +3628,25 @@ public class JSONObjectTest {
                 .put("b", 2);
         assertFalse(jo1.similar(jo3));
     }
+
+    private static final Number[] NON_FINITE_NUMBERS = { Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NaN,
+            Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NaN };
+
+    @Test
+    public void issue713MapConstructorWithNonFiniteNumbers() {
+        for (Number nonFinite : NON_FINITE_NUMBERS) {
+            Map<String, Number> map = new HashMap<>();
+            map.put("a", nonFinite);
+
+            assertThrows(JSONException.class, () -> new JSONObject(map));
+        }
+    }
+
+    @Test
+    public void issue713BeanConstructorWithNonFiniteNumbers() {
+        for (Number nonFinite : NON_FINITE_NUMBERS) {
+            GenericBean<Number> bean = new GenericBean<>(nonFinite);
+            assertThrows(JSONException.class, () -> new JSONObject(bean));
+        }
+    }
 }
diff --git a/src/test/java/org/json/junit/data/GenericBean.java b/src/test/java/org/json/junit/data/GenericBean.java
index da6370d..dd46b88 100644
--- a/src/test/java/org/json/junit/data/GenericBean.java
+++ b/src/test/java/org/json/junit/data/GenericBean.java
@@ -9,7 +9,7 @@ import java.io.StringReader;
  * @param <T>
  *            generic number value
  */
-public class GenericBean<T extends Number & Comparable<T>> implements MyBean {
+public class GenericBean<T extends Number> implements MyBean {
     /**
      * @param genericValue
      *            value to initiate with

From 0cdc38ac24169f9515d929f9813c83bfbf55da83 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Thu, 12 Oct 2023 00:53:36 +0530
Subject: [PATCH 150/212] #653 - review comments updated.

---
 src/main/java/org/json/JSONObject.java        |  66 +++++++-----
 .../org/json/junit/JSONObjectDecimalTest.java | 100 ++++++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   |  49 +++++++--
 .../org/json/junit/JsonNumberZeroTest.java    |  55 ++++++++++
 4 files changed, 236 insertions(+), 34 deletions(-)
 create mode 100644 src/test/java/org/json/junit/JSONObjectDecimalTest.java
 create mode 100644 src/test/java/org/json/junit/JsonNumberZeroTest.java

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 0a730f4..7e8cbbe 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2392,8 +2392,14 @@ public class JSONObject {
      */
     protected static Number stringToNumber(final String input) throws NumberFormatException {
         String val = input;
+        if (val.startsWith(".")){
+            val = "0"+val;
+        }
+        if (val.startsWith("-.")){
+            val = "-0."+val.substring(2);
+        }
         char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
+        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
             // decimal representation
             if (isDecimalNotation(val)) {
                 // Use a BigDecimal all the time so we keep the original
@@ -2424,13 +2430,13 @@ public class JSONObject {
             if(initial == '0' && val.length() > 1) {
                 char at1 = val.charAt(1);
                 if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             } else if (initial == '-' && val.length() > 2) {
                 char at1 = val.charAt(1);
                 char at2 = val.charAt(2);
                 if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             }
             // integer representation.
@@ -2450,7 +2456,7 @@ public class JSONObject {
             }
             return bi;
         }
-        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+        throw new NumberFormatException("val ["+input+"] is not a valid number.");
     }
 
     /**
@@ -2486,8 +2492,7 @@ public class JSONObject {
          * produced, then the value will just be a string.
          */
 
-        char initial = string.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
+        if (potentialNumber(string)) {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -2496,6 +2501,28 @@ public class JSONObject {
         return string;
     }
 
+
+    private static boolean potentialNumber(String value){
+        if (value == null || value.isEmpty()){
+            return false;
+        }
+        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
+    }
+
+    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
+    }
+
+    private static boolean digitAtIndex(String value, int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
+    }
+
     /**
      * Throw an exception if the object is a NaN or infinite number.
      *
@@ -2902,26 +2929,15 @@ public class JSONObject {
      * @return number without leading zeros
      */
     private static String removeLeadingZerosOfNumber(String value){
-        char[] chars = value.toCharArray();
-        int leftMostUnsignedIndex = 0;
-        if (chars[0] == '-'){
-            leftMostUnsignedIndex = 1;
-        }
-        int firstNonZeroCharIndex = -1;
-        for (int i=leftMostUnsignedIndex;i<value.length();i++){
-            if (chars[i] != '0'){
-                firstNonZeroCharIndex = i;
-                break;
+        if (value.equals("-")){return value;}
+        boolean negativeFirstChar = (value.charAt(0) == '-');
+        int counter = negativeFirstChar ? 1:0;
+        while (counter < value.length()){
+            if (value.charAt(counter) != '0'){
+                return String.format("%s%s", negativeFirstChar?'-':"",value.substring(counter));
             }
+            ++counter;
         }
-        if (firstNonZeroCharIndex == -1){
-            return value;
-        }
-        StringBuilder result = new StringBuilder();
-        if (leftMostUnsignedIndex == 1){
-            result.append('-');
-        }
-        result.append(value.substring(firstNonZeroCharIndex));
-        return result.toString();
+        return String.format("%s%s", negativeFirstChar?'-':"",'0');
     }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectDecimalTest.java b/src/test/java/org/json/junit/JSONObjectDecimalTest.java
new file mode 100644
index 0000000..3302f0a
--- /dev/null
+++ b/src/test/java/org/json/junit/JSONObjectDecimalTest.java
@@ -0,0 +1,100 @@
+package org.json.junit;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.Assert.assertEquals;
+
+public class JSONObjectDecimalTest {
+
+    @Test
+    public void shouldParseDecimalNumberThatStartsWithDecimalPoint(){
+        JSONObject jsonObject = new JSONObject("{value:0.50}");
+        assertEquals("Float not recognized", 0.5f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0.5f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0.5f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0.5d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", 0.5d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0.5d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(.5).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+
+
+    @Test
+    public void shouldParseNegativeDecimalNumberThatStartsWithDecimalPoint(){
+        JSONObject jsonObject = new JSONObject("{value:-.50}");
+        assertEquals("Float not recognized", -0.5f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0.5f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0.5f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0.5d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", -0.5d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0.5d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-.5).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+    @Test
+    public void shouldParseDecimalNumberThatHasZeroBeforeWithDecimalPoint(){
+        JSONObject jsonObject = new JSONObject("{value:00.050}");
+        assertEquals("Float not recognized", 0.05f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0.05f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0.05f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0.05d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", 0.05d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0.05d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(.05).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+    @Test
+    public void shouldParseNegativeDecimalNumberThatHasZeroBeforeWithDecimalPoint(){
+        JSONObject jsonObject = new JSONObject("{value:-00.050}");
+        assertEquals("Float not recognized", -0.05f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0.05f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0.05f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0.05d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", -0.05d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0.05d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-.05).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+
+}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 3662a82..5adb6ce 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4,6 +4,7 @@ package org.json.junit;
 Public Domain.
 */
 
+import static java.lang.Double.NaN;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -782,7 +783,7 @@ public class JSONObjectTest {
         jsonObject.accumulate("myArray", -23.45e7);
         // include an unsupported object for coverage
         try {
-            jsonObject.accumulate("myArray", Double.NaN);
+            jsonObject.accumulate("myArray", NaN);
             fail("Expected exception");
         } catch (JSONException ignored) {}
 
@@ -814,7 +815,7 @@ public class JSONObjectTest {
         jsonObject.append("myArray", -23.45e7);
         // include an unsupported object for coverage
         try {
-            jsonObject.append("myArray", Double.NaN);
+            jsonObject.append("myArray", NaN);
             fail("Expected exception");
         } catch (JSONException ignored) {}
 
@@ -839,7 +840,7 @@ public class JSONObjectTest {
     public void jsonObjectDoubleToString() {
         String [] expectedStrs = {"1", "1", "-23.4", "-2.345E68", "null", "null" };
         Double [] doubles = { 1.0, 00001.00000, -23.4, -23.45e67, 
-                Double.NaN, Double.NEGATIVE_INFINITY }; 
+                NaN, Double.NEGATIVE_INFINITY };
         for (int i = 0; i < expectedStrs.length; ++i) {
             String actualStr = JSONObject.doubleToString(doubles[i]);
             assertTrue("value expected ["+expectedStrs[i]+
@@ -894,11 +895,11 @@ public class JSONObjectTest {
         assertTrue("opt doubleKey should be double", 
                 jsonObject.optDouble("doubleKey") == -23.45e7);
         assertTrue("opt doubleKey with Default should be double", 
-                jsonObject.optDouble("doubleStrKey", Double.NaN) == 1);
+                jsonObject.optDouble("doubleStrKey", NaN) == 1);
         assertTrue("opt doubleKey should be Double",
                 Double.valueOf(-23.45e7).equals(jsonObject.optDoubleObject("doubleKey")));
         assertTrue("opt doubleKey with Default should be Double",
-                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", Double.NaN)));
+                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", NaN)));
         assertTrue("opt negZeroKey should be a Double", 
                 jsonObject.opt("negZeroKey") instanceof Double);
         assertTrue("get negZeroKey should be a Double", 
@@ -1071,9 +1072,14 @@ public class JSONObjectTest {
                 "\"hexFloat\":0x1.0P-1074,"+
                 "\"floatIdentifier\":0.1f,"+
                 "\"doubleIdentifier\":0.1d,"+
+                "\"doubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":0000000.1d,"+
+                "\"negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":-0000000.1d,"+
+                "\"doubleIdentifierWithMultipleLeadingZerosAfterDecimal\":0000000.0001d,"+
+                "\"negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal\":-0000000.0001d,"+
                 "\"integerWithLeadingZeros\":000900,"+
                 "\"integerWithAllZeros\":00000,"+
-                "\"compositeWithLeadingZeros\":00800.90d"+
+                "\"compositeWithLeadingZeros\":00800.90d,"+
+                "\"decimalPositiveWithoutNumberBeforeDecimalPoint\":.90,"+
             "}";
         JSONObject jsonObject = new JSONObject(str);
         Object obj;
@@ -1083,7 +1089,7 @@ public class JSONObjectTest {
         assertTrue("hexNumber currently evaluates to string",
                 obj.equals("-0x123"));
         assertTrue( "tooManyZeros currently evaluates to string",
-                jsonObject.get( "tooManyZeros" ).equals("00"));
+                jsonObject.get( "tooManyZeros" ).equals(0));
         obj = jsonObject.get("negativeInfinite");
         assertTrue( "negativeInfinite currently evaluates to string",
                 obj.equals("-Infinity"));
@@ -1109,6 +1115,16 @@ public class JSONObjectTest {
                 jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
         assertTrue("doubleIdentifier currently evaluates to double 0.1",
                 jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
+        assertTrue("doubleIdentifierWithMultipleLeadingZerosBeforeDecimal currently evaluates to double 0.1",
+                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosBeforeDecimal").equals(Double.valueOf(0.1)));
+        assertTrue("negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal currently evaluates to double -0.1",
+                jsonObject.get("negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal").equals(Double.valueOf(-0.1)));
+        assertTrue("doubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double 0.0001",
+                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(0.0001)));
+        assertTrue("doubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double 0.0001",
+                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(0.0001)));
+        assertTrue("negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double -0.0001",
+                jsonObject.get("negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(-0.0001)));
         assertTrue("Integer does not evaluate to 900",
                 jsonObject.get("integerWithLeadingZeros").equals(900));
         assertTrue("Integer does not evaluate to 900",
@@ -1116,7 +1132,7 @@ public class JSONObjectTest {
         assertTrue("Integer does not evaluate to 900",
                 jsonObject.optInt("integerWithLeadingZeros")==900);
         assertTrue("Integer does not evaluate to 0",
-                jsonObject.get("integerWithAllZeros").equals("00000"));
+                jsonObject.get("integerWithAllZeros").equals(0));
         assertTrue("Integer does not evaluate to 0",
                 jsonObject.getInt("integerWithAllZeros")==0);
         assertTrue("Integer does not evaluate to 0",
@@ -1131,6 +1147,21 @@ public class JSONObjectTest {
                 jsonObject.getLong("compositeWithLeadingZeros")==800);
         assertTrue("Long does not evaluate to 800.90",
                 jsonObject.optLong("compositeWithLeadingZeros")==800);
+        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
+                0.9d,jsonObject.getDouble("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
+        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
+                0.9d,jsonObject.optDouble("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
+        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
+                0.0d,jsonObject.optLong("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
+
+        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
+                0.0001d,jsonObject.getDouble("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
+        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
+                0.0001d,jsonObject.optDouble("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
+        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
+                0.0d, jsonObject.getLong("doubleIdentifierWithMultipleLeadingZerosAfterDecimal") , 0.0d);
+        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
+                0.0d,jsonObject.optLong("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
         Util.checkJSONObjectMaps(jsonObject);
     }
 
@@ -2361,7 +2392,7 @@ public class JSONObjectTest {
         }
         try {
             // test validity of invalid double 
-            JSONObject.testValidity(Double.NaN);
+            JSONObject.testValidity(NaN);
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertTrue("", true);
diff --git a/src/test/java/org/json/junit/JsonNumberZeroTest.java b/src/test/java/org/json/junit/JsonNumberZeroTest.java
new file mode 100644
index 0000000..bfa4ca9
--- /dev/null
+++ b/src/test/java/org/json/junit/JsonNumberZeroTest.java
@@ -0,0 +1,55 @@
+package org.json.junit;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.Assert.assertEquals;
+
+public class JsonNumberZeroTest {
+
+    @Test
+    public void shouldParseNegativeZeroValueWithMultipleZeroDigit(){
+        JSONObject jsonObject = new JSONObject("{value:-0000}");
+        assertEquals("Float not recognized", -0f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", -0f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", -0.0d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", -0.0d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-0).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+    @Test
+    public void shouldParseZeroValueWithMultipleZeroDigit(){
+        JSONObject jsonObject = new JSONObject("{value:0000}");
+        assertEquals("Float not recognized", 0f, jsonObject.getFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0f, jsonObject.optFloat("value"), 0.0f);
+        assertEquals("Float not recognized", 0f, jsonObject.optFloatObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0d, jsonObject.optDouble("value"), 0.0f);
+        assertEquals("Double not recognized", 0.0d, jsonObject.optDoubleObject("value"), 0.0f);
+        assertEquals("Double not recognized", 0.0d, jsonObject.getDouble("value"), 0.0f);
+        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
+        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
+        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
+        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
+        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-0).compareTo(jsonObject.getBigDecimal("value")));
+        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
+    }
+
+}

From 56cb5f84c4befe039f32baf5af9541c265f095a1 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Thu, 12 Oct 2023 11:03:13 +0530
Subject: [PATCH 151/212] #653 - review comments updated.

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 7e8cbbe..fbf225e 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2416,17 +2416,16 @@ public class JSONObject {
                     try {
                         Double d = Double.valueOf(val);
                         if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
                         }
                         return d;
                     } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
                     }
                 }
             }
             val = removeLeadingZerosOfNumber(input);
             initial = val.charAt(0);
-            // block items like 00 01 etc. Java number parsers treat these as Octal.
             if(initial == '0' && val.length() > 1) {
                 char at1 = val.charAt(1);
                 if(at1 >= '0' && at1 <= '9') {
@@ -2934,10 +2933,12 @@ public class JSONObject {
         int counter = negativeFirstChar ? 1:0;
         while (counter < value.length()){
             if (value.charAt(counter) != '0'){
-                return String.format("%s%s", negativeFirstChar?'-':"",value.substring(counter));
+                if (negativeFirstChar) {return "-".concat(value.substring(counter));}
+                return value.substring(counter);
             }
             ++counter;
         }
-        return String.format("%s%s", negativeFirstChar?'-':"",'0');
+        if (negativeFirstChar) {return "-0";}
+        return "0";
     }
 }

From e4aa7f1308722b1283fc828dcb2326915a5d29da Mon Sep 17 00:00:00 2001
From: simonh5 <simonh5@illinois.edu>
Date: Thu, 12 Oct 2023 21:09:27 -0500
Subject: [PATCH 152/212] fix: change from JSONAssert to checking the
 similarity of JSONObjects

---
 src/test/java/org/json/junit/JSONMLTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 9b5e5b6..4d36498 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -8,7 +8,6 @@ import static org.junit.Assert.*;
 
 import org.json.*;
 import org.junit.Test;
-import org.skyscreamer.jsonassert.JSONAssert;
 
 /**
  * Tests for org.json.JSONML.java
@@ -763,8 +762,7 @@ public class JSONMLTest {
         final String xml = JSONML.toString(originalObject);
         final JSONObject revertedObject = JSONML.toJSONObject(xml, false);
         final String newJson = revertedObject.toString();
-        assertTrue("JSON Objects are not similar",originalObject.similar(revertedObject));
-        JSONAssert.assertEquals("original JSON does not equal the new JSON", originalJson, newJson, false);
+        assertTrue("original JSON does not equal the new JSON", originalObject.similar(revertedObject));
     }
 
 // these tests do not pass for the following reasons:

From af5f780d5bda393ae0f609ca2504a16a808e86de Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Fri, 13 Oct 2023 15:30:31 -0500
Subject: [PATCH 153/212] update the docs for release 20231013

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

diff --git a/README.md b/README.md
index e999230..9f01342 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230618/json-20230618.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20231013/json-20231013.jar)**
 
 
 # Overview
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index ae43983..2b8aaa2 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20231013    First release with minimum Java version 1.8. Recent commits, including fixes for CVE-2023-5072.
+
 20230618    Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.
 
 20230227    Fix for CVE-2022-45688 and recent commits
diff --git a/pom.xml b/pom.xml
index 29592fc..59cb44f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20230618</version>
+    <version>20231013</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>
@@ -15,7 +15,7 @@
         It also includes the capability to convert between JSON and XML, HTTP
         headers, Cookies, and CDL.
 
-        This is a reference implementation. There is a large number of JSON packages
+        This is a reference implementation. There are a large number of JSON packages
         in Java. Perhaps someday the Java community will standardize on one. Until
         then, choose carefully.
     </description>

From b180dbedbc99bb177e5b277f1bff2a1b79cebda6 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Fri, 13 Oct 2023 16:04:14 -0500
Subject: [PATCH 154/212] Reverting #761

---
 pom.xml | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59cb44f..77bbdac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,35 +159,17 @@
                     <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <version>1.0.0.Final</version>
-                <executions>
-                    <execution>
-                        <id>add-module-infos</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                        <configuration>
-                            <jvmVersion>9</jvmVersion>
-                            <module>
-                                <moduleInfo>
-                                    <name>org.json</name>
-                                    <exports>
-                                        org.json;
-                                    </exports>
-                                </moduleInfo>
-                            </module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.3.0</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.json</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
     </build>

From 29a7f4622d887a90e15d719f88fad770b523ed69 Mon Sep 17 00:00:00 2001
From: simonh5 <simonh5@illinois.edu>
Date: Fri, 13 Oct 2023 20:58:50 -0500
Subject: [PATCH 155/212] remove JSONAssert

---
 build.gradle                                     |  1 -
 pom.xml                                          |  7 -------
 src/test/java/org/json/junit/JSONMLTest.java     |  3 ++-
 src/test/java/org/json/junit/JSONObjectTest.java | 12 +++++++-----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5a5be37..8a3708a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
-    testImplementation 'org.skyscreamer:jsonassert:1.5.1'
 }
 
 subprojects {
diff --git a/pom.xml b/pom.xml
index 8bbcc3c..720529c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,13 +72,6 @@
             <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.skyscreamer/jsonassert -->
-        <dependency>
-            <groupId>org.skyscreamer</groupId>
-            <artifactId>jsonassert</artifactId>
-            <version>1.5.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 4d36498..154af64 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -762,7 +762,8 @@ public class JSONMLTest {
         final String xml = JSONML.toString(originalObject);
         final JSONObject revertedObject = JSONML.toJSONObject(xml, false);
         final String newJson = revertedObject.toString();
-        assertTrue("original JSON does not equal the new JSON", originalObject.similar(revertedObject));
+        assertTrue("JSON Objects are not similar", originalObject.similar(revertedObject));
+        assertTrue("JSON Strings are not similar", new JSONObject(originalJson).similar(new JSONObject(newJson)));
     }
 
 // these tests do not pass for the following reasons:
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 4eefea8..ac9a287 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -57,7 +57,6 @@ import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
-import org.skyscreamer.jsonassert.JSONAssert;
 
 /**
  * JSONObject, along with JSONArray, are the central classes of the reference app.
@@ -2026,8 +2025,10 @@ public class JSONObjectTest {
                 "\"key3\":\"val3\""+
              "}";
         JSONObject jsonObject = new JSONObject(jsonObjectStr);
-        JSONAssert.assertEquals("jsonObject valueToString() incorrect",
-                                JSONObject.valueToString(jsonObject), jsonObject.toString(), false);
+        assertTrue("jsonObject valueToString() incorrect",
+            new JSONObject(JSONObject.valueToString(jsonObject))
+                .similar(new JSONObject(jsonObject.toString()))
+            );
         String jsonArrayStr = 
             "[1,2,3]";
         JSONArray jsonArray = new JSONArray(jsonArrayStr);
@@ -2037,8 +2038,9 @@ public class JSONObjectTest {
         map.put("key1", "val1");
         map.put("key2", "val2");
         map.put("key3", "val3");
-        JSONAssert.assertEquals("map valueToString() incorrect",
-                jsonObject.toString(), JSONObject.valueToString(map), false);
+        assertTrue("map valueToString() incorrect",
+         new JSONObject(jsonObject.toString())
+         .similar(new JSONObject(JSONObject.valueToString(map))));
         Collection<Integer> collection = new ArrayList<Integer>();
         collection.add(Integer.valueOf(1));
         collection.add(Integer.valueOf(2));

From 7b2677ac5a8fdf586ceb4bfe2d6d8ec4194cdd69 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Sat, 14 Oct 2023 10:05:36 +0530
Subject: [PATCH 156/212] #790 - Update XML with changes for string to number
 conversion. Moved the code logic to a common utility to de-duplicate.

---
 src/main/java/org/json/JSONArray.java         |   4 +-
 src/main/java/org/json/JSONObject.java        |  97 +---------
 .../java/org/json/NumberConversionUtil.java   | 142 +++++++++++++++
 src/main/java/org/json/XML.java               |  80 +--------
 src/test/java/org/json/junit/JSONMLTest.java  |   2 +-
 .../json/junit/NumberConversionUtilTest.java  | 169 ++++++++++++++++++
 .../org/json/junit/XMLConfigurationTest.java  |   2 +-
 src/test/java/org/json/junit/XMLTest.java     |   2 +-
 8 files changed, 322 insertions(+), 176 deletions(-)
 create mode 100644 src/main/java/org/json/NumberConversionUtil.java
 create mode 100644 src/test/java/org/json/junit/NumberConversionUtilTest.java

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index b0c912d..ed7982f 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -331,7 +331,7 @@ public class JSONArray implements Iterable<Object> {
             if (object instanceof Number) {
                 return (Number)object;
             }
-            return JSONObject.stringToNumber(object.toString());
+            return NumberConversionUtil.stringToNumber(object.toString());
         } catch (Exception e) {
             throw wrongValueFormatException(index, "number", object, e);
         }
@@ -1078,7 +1078,7 @@ public class JSONArray implements Iterable<Object> {
         
         if (val instanceof String) {
             try {
-                return JSONObject.stringToNumber((String) val);
+                return NumberConversionUtil.stringToNumber((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index fbf225e..9b2e3e0 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -28,6 +28,8 @@ import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import static org.json.NumberConversionUtil.stringToNumber;
+
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
  * form is a string wrapped in curly braces with colons between the names and
@@ -2380,83 +2382,7 @@ public class JSONObject {
                 || val.indexOf('E') > -1 || "-0".equals(val);
     }
 
-    /**
-     * Converts a string to a number using the narrowest possible type. Possible
-     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
-     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
-     *
-     * @param input value to convert
-     * @return Number representation of the value.
-     * @throws NumberFormatException thrown if the value is not a valid number. A public
-     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
-     */
-    protected static Number stringToNumber(final String input) throws NumberFormatException {
-        String val = input;
-        if (val.startsWith(".")){
-            val = "0"+val;
-        }
-        if (val.startsWith("-.")){
-            val = "-0."+val.substring(2);
-        }
-        char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                    }
-                }
-            }
-            val = removeLeadingZerosOfNumber(input);
-            initial = val.charAt(0);
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
 
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-    }
 
     /**
      * Try to convert a string into a number, boolean, or null. If the string
@@ -2922,23 +2848,4 @@ public class JSONObject {
         );
     }
 
-    /**
-     * 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";
-    }
 }
diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
new file mode 100644
index 0000000..08da6bd
--- /dev/null
+++ b/src/main/java/org/json/NumberConversionUtil.java
@@ -0,0 +1,142 @@
+package org.json;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class NumberConversionUtil {
+
+    /**
+     * Converts a string to a number using the narrowest possible type. Possible
+     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
+     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
+     *
+     * @param input value to convert
+     * @return Number representation of the value.
+     * @throws NumberFormatException thrown if the value is not a valid number. A public
+     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
+     */
+    public static Number stringToNumber(final String input) throws NumberFormatException {
+        String val = input;
+        if (val.startsWith(".")){
+            val = "0"+val;
+        }
+        if (val.startsWith("-.")){
+            val = "-0."+val.substring(2);
+        }
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                    }
+                }
+            }
+            val = removeLeadingZerosOfNumber(input);
+            initial = val.charAt(0);
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
+
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+    }
+
+    /**
+     * Checks if the value could be considered a number in decimal number system.
+     * @param value
+     * @return
+     */
+    public static boolean potentialNumber(String value){
+        if (value == null || value.isEmpty()){
+            return false;
+        }
+        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
+    }
+
+    /**
+     * Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
+     *
+     * @param val value to test
+     * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
+     */
+    private static boolean isDecimalNotation(final String val) {
+        return val.indexOf('.') > -1 || val.indexOf('e') > -1
+                || val.indexOf('E') > -1 || "-0".equals(val);
+    }
+
+    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
+    }
+
+    private static boolean digitAtIndex(String value, int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
+    }
+
+    /**
+     * 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";
+    }
+}
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 925f056..78a3a59 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -6,10 +6,11 @@ Public Domain.
 
 import java.io.Reader;
 import java.io.StringReader;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Iterator;
 
+import static org.json.NumberConversionUtil.potentialNumber;
+import static org.json.NumberConversionUtil.stringToNumber;
+
 
 /**
  * This provides static methods to convert an XML text into a JSONObject, and to
@@ -486,8 +487,7 @@ public class XML {
          * produced, then the value will just be a string.
          */
 
-        char initial = string.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
+        if (potentialNumber(string)) {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -496,78 +496,6 @@ public class XML {
         return string;
     }
 
-    /**
-     * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
-     */
-    private static Number stringToNumber(final String val) throws NumberFormatException {
-        char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                    }
-                }
-            }
-            // block items like 00 01 etc. Java number parsers treat these as Octal.
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
-
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+val+"] is not a valid number.");
-    }
-
-    /**
-     * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain Android support.
-     */
-    private static boolean isDecimalNotation(final String val) {
-        return val.indexOf('.') > -1 || val.indexOf('e') > -1
-                || val.indexOf('E') > -1 || "-0".equals(val);
-    }
-
-
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject. Some information may be lost in this transformation because
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 35c0af2..ae71aed 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -709,7 +709,7 @@ public class JSONMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",1],[\"id\",\"00\"],[\"id\",0],[\"item\",{\"id\":\"01\"}],[\"title\",true]]";
+        final String expectedJsonString = "[\"root\",[\"id\",1],[\"id\",1],[\"id\",0],[\"id\",0],[\"item\",{\"id\":1}],[\"title\",true]]";
         final JSONArray actualJsonOutput = JSONML.toJSONArray(originalXml, false);
         assertEquals(expectedJsonString, actualJsonOutput.toString());
     }
diff --git a/src/test/java/org/json/junit/NumberConversionUtilTest.java b/src/test/java/org/json/junit/NumberConversionUtilTest.java
new file mode 100644
index 0000000..4ac7c83
--- /dev/null
+++ b/src/test/java/org/json/junit/NumberConversionUtilTest.java
@@ -0,0 +1,169 @@
+package org.json.junit;
+
+import org.json.NumberConversionUtil;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.Assert.*;
+
+public class NumberConversionUtilTest {
+
+    @Test
+    public void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("00.10d");
+        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("0.10d");
+        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("0.010d");
+        assertEquals("Do not match",  0.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("00200.10d");
+        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("200.10d");
+        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("200.010d");
+        assertEquals("Do not match",  200.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+
+    @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("-00.10d");
+        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("-0.10d");
+        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("-0.010d");
+        assertEquals("Do not match",  -0.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("-00200.10d");
+        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("-200.10d");
+        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("-200.010d");
+        assertEquals("Do not match",  -200.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNumbersWithExponents(){
+        Number number = NumberConversionUtil.stringToNumber("23.45e7");
+        assertEquals("Do not match",  23.45e7d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  23.45e7f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  2.345E8, number.longValue(),0);
+        assertEquals("Do not match",  2.345E8, number.intValue(),0);
+    }
+
+
+    @Test
+    public void shouldParseNegativeNumbersWithExponents(){
+        Number number = NumberConversionUtil.stringToNumber("-23.45e7");
+        assertEquals("Do not match",  -23.45e7d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -23.45e7f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -2.345E8, number.longValue(),0);
+        assertEquals("Do not match",  -2.345E8, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseBigDecimal(){
+        Number number = NumberConversionUtil.stringToNumber("19007199254740993.35481234487103587486413587843213584");
+        assertTrue(number instanceof BigDecimal);
+    }
+
+    @Test
+    public void shouldParseBigInteger(){
+        Number number = NumberConversionUtil.stringToNumber("1900719925474099335481234487103587486413587843213584");
+        assertTrue(number instanceof BigInteger);
+    }
+
+    @Test
+    public void shouldIdentifyPotentialNumber(){
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112.123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112e123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112.123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112e23"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("--112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("-a112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("a112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("e112.123"));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 21a2b59..2eaaf99 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -733,7 +733,7 @@ public class XMLConfigurationTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, 
                 new XMLParserConfiguration().withKeepStrings(false));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 22d6131..9702d3d 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -791,7 +791,7 @@ public class XMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
+        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, false);
 
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expectedJson);

From 4dfd779b1c84e66e03e9ff13b46b238fd9dc72ea Mon Sep 17 00:00:00 2001
From: simonh5 <simonh5@illinois.edu>
Date: Sat, 14 Oct 2023 17:21:06 -0500
Subject: [PATCH 157/212] fix: flakiness in
 org.json.junit.XMLTest#testIndentComplicatedJsonObjectWithArrayAndWithConfig

---
 src/test/java/org/json/junit/XMLTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 22d6131..2399b81 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1234,7 +1234,7 @@ public class XMLTest {
                 for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
                     expected.append(buffer, 0, numRead);
                 }
-                assertEquals(expected.toString(), actualString);
+                assertTrue(XML.toJSONObject(expected.toString()).similar(XML.toJSONObject(actualString)));
             }
         } catch (IOException e) {
             fail("file writer error: " +e.getMessage());

From 8540bb80c07eabe021ecbefce242cb83b6fa4c32 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Sun, 15 Oct 2023 20:14:44 -0400
Subject: [PATCH 158/212] Validate that the `mvn package` step completes

---
 .github/workflows/pipeline.yml | 4 +++-
 pom.xml                        | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 5e1dd42..797b9a2 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -1,5 +1,5 @@
 # This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+# For more information see: https://docs.github.com/en/actions/learn-github-actions or https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 
 name: Java CI with Maven
 
@@ -47,3 +47,5 @@ jobs:
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
+      - name: Package Jar ${{ matrix.java }}
+        run: mvn clean package -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true
diff --git a/pom.xml b/pom.xml
index 77bbdac..2b3c8b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

From 134074aeaa8ae47c9782e1e84e19682bd93599ee Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Sun, 15 Oct 2023 20:19:58 -0400
Subject: [PATCH 159/212] Revert "Reverting #761"

This reverts commit b180dbedbc99bb177e5b277f1bff2a1b79cebda6.
---
 pom.xml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b3c8b2..6812073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,17 +158,35 @@
                     <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.Final</version>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfo>
+                                    <name>org.json</name>
+                                    <exports>
+                                        org.json;
+                                    </exports>
+                                </moduleInfo>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.3.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.json</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
         </plugins>
     </build>

From 9a9efac2af7068940173bf20efce9419e5206efa Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 13:16:27 -0400
Subject: [PATCH 160/212] Correct moditect configuration to work on java8

---
 .gitignore |  2 ++
 pom.xml    | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7794c4c..b78af4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # ignore eclipse project files
 .project
 .classpath
+# ignore vscode files
+.vscode
 # ignore Intellij Idea project files
 .idea
 *.iml
diff --git a/pom.xml b/pom.xml
index 6812073..80c111d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,12 +172,11 @@
                         <configuration>
                             <jvmVersion>9</jvmVersion>
                             <module>
-                                <moduleInfo>
-                                    <name>org.json</name>
-                                    <exports>
-                                        org.json;
-                                    </exports>
-                                </moduleInfo>
+                                <moduleInfoSource>
+                                    module org.json {
+                                        exports org.json;
+                                    }
+                                </moduleInfoSource>
                             </module>
                         </configuration>
                     </execution>

From 2b41cf44b52b25cae7c189b54f9bab87ff47eda6 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 13:24:40 -0400
Subject: [PATCH 161/212] include jar in job artifacts

---
 .github/workflows/pipeline.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 797b9a2..59a7658 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -37,15 +37,21 @@ jobs:
           mvn site -DgenerateReports=false -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: Test Results ${{ matrix.java }}
           path: target/surefire-reports/
       - name: Upload Test Report ${{ matrix.java }}
         if: ${{ always() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: Test Report ${{ matrix.java }}
           path: target/site/
       - name: Package Jar ${{ matrix.java }}
         run: mvn clean package -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true
+      - name: Upload Package Results ${{ matrix.java }}
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: Package Jar ${{ matrix.java }}
+          path: target/*.jar

From be115059e9455d5f434027204b6fe02d4c6b07a9 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 13:19:16 -0400
Subject: [PATCH 162/212] Correct supported java versions

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

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

From 3894483560216341ea4c9b58ac6c06ab19f6dc4d Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 15:30:55 -0400
Subject: [PATCH 163/212] Add build badges to README

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

diff --git a/README.md b/README.md
index cd856ab..32b59bb 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ JSON in Java [package org.json]
 ===============================
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/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/20231013/json-20231013.jar)**
 

From 7c4f98c42c5d1ee27d6ce73c9bd0e4e5e3f4aea2 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 17:30:57 -0400
Subject: [PATCH 164/212] Add new deployment pipeline.

This should only trigger when a release is published
---
 .github/workflows/deployment.yml | 40 ++++++++++++++++++++++++++++++++
 pom.xml                          |  7 ++++++
 2 files changed, 47 insertions(+)
 create mode 100644 .github/workflows/deployment.yml

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
new file mode 100644
index 0000000..d69b478
--- /dev/null
+++ b/.github/workflows/deployment.yml
@@ -0,0 +1,40 @@
+# For more information see: https://docs.github.com/en/actions/learn-github-actions or https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+name: Deployment workflow
+
+on:
+    release:
+      types: [published]
+  
+jobs:
+    publish:
+      runs-on: ubuntu-latest
+      permissions:
+        contents: read
+        packages: write
+      steps:
+        - uses: actions/checkout@v4
+        - name: Set up Java for publishing to Maven Central Repository
+          uses: actions/setup-java@v3
+          with:
+            # Use lowest supported LTS Java version
+            java-version: '8'
+            distribution: 'temurin'
+            server-id: ossrh
+            server-username: MAVEN_USERNAME
+            server-password: MAVEN_PASSWORD
+        - name: Publish to the Maven Central Repository
+          run: mvn --batch-mode deploy
+          env:
+            MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+            MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        # - name: Set up Java for publishing to GitHub Packages
+        #   uses: actions/setup-java@v3
+        #   with:
+        #     # Use lowest supported LTS Java version
+        #     java-version: '8'
+        #     distribution: 'temurin'
+        # - name: Publish to GitHub Packages
+        #   run: mvn --batch-mode deploy
+        #   env:
+        #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pom.xml b/pom.xml
index 77bbdac..fb983f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <distributionManagement>
+        <repository>
+            <id>ossrh</id>
+            <name>Central Repository OSSRH</name>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
 
     <dependencies>
         <dependency>

From a86786a5f5c40701b053a6f1b88cd1af3bcaa053 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 18:03:39 -0400
Subject: [PATCH 165/212] Add snapshot repository

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

diff --git a/pom.xml b/pom.xml
index fb983f0..fae575b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,10 @@
             <name>Central Repository OSSRH</name>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <dependencies>

From ed183e61427589dea729c42be519ce75437b1dc0 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 18:22:08 -0400
Subject: [PATCH 166/212] remove deprecated parent pom per Sonatype docs

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

diff --git a/pom.xml b/pom.xml
index fae575b..7b77542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,12 +21,6 @@
     </description>
     <url>https://github.com/douglascrockford/JSON-java</url>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
     <scm>
         <url>https://github.com/douglascrockford/JSON-java.git</url>
         <connection>scm:git:git://github.com/douglascrockford/JSON-java.git</connection>

From e8f125fb6ea827448408698b1a50a61984cea6b3 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 16 Oct 2023 18:22:22 -0400
Subject: [PATCH 167/212] update workflow to use GPG

---
 .github/workflows/deployment.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index d69b478..54457d9 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -1,4 +1,8 @@
-# For more information see: https://docs.github.com/en/actions/learn-github-actions or https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+# For more information see:
+#  * https://docs.github.com/en/actions/learn-github-actions
+#  * https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+#  * https://github.com/actions/setup-java/blob/v3.13.0/docs/advanced-usage.md#Publishing-using-Apache-Maven
+#
 
 name: Deployment workflow
 
@@ -20,14 +24,18 @@ jobs:
             # Use lowest supported LTS Java version
             java-version: '8'
             distribution: 'temurin'
-            server-id: ossrh
-            server-username: MAVEN_USERNAME
-            server-password: MAVEN_PASSWORD
+            server-id: ossrh  # Value of the distributionManagement/repository/id field of the pom.xml
+            server-username: MAVEN_USERNAME # env variable for username in deploy
+            server-password: MAVEN_PASSWORD # env variable for token in deploy
+            gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+            gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+    
         - name: Publish to the Maven Central Repository
           run: mvn --batch-mode deploy
           env:
             MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
             MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+            MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
         # - name: Set up Java for publishing to GitHub Packages
         #   uses: actions/setup-java@v3
         #   with:

From f074bed732dbccccf7e4dd2b4414790249358ffd Mon Sep 17 00:00:00 2001
From: theKnightsOfRohan <shadowsovereign100@gmail.com>
Date: Mon, 16 Oct 2023 17:48:03 -0700
Subject: [PATCH 168/212] fix(ParserConfiguration): add <T> params to docs

---
 src/main/java/org/json/ParserConfiguration.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/ParserConfiguration.java
index 519e209..36fa508 100644
--- a/src/main/java/org/json/ParserConfiguration.java
+++ b/src/main/java/org/json/ParserConfiguration.java
@@ -71,7 +71,8 @@ public class ParserConfiguration {
      *
      * @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.
      */
     public <T extends ParserConfiguration> T withKeepStrings(final boolean newVal) {
@@ -96,6 +97,8 @@ public class ParserConfiguration {
      * 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
+     * 
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
     public <T extends ParserConfiguration> T withMaxNestingDepth(int maxNestingDepth) {

From 1d0775cce7a4679fbbb0d8a5bb61dbe21a12f40e Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Thu, 19 Oct 2023 10:28:11 +0530
Subject: [PATCH 169/212] Revert changes with feature and refactor together.

---
 src/main/java/org/json/JSONArray.java         |   4 +-
 src/main/java/org/json/JSONObject.java        |  97 +++++++++-
 .../java/org/json/NumberConversionUtil.java   | 142 ---------------
 src/main/java/org/json/XML.java               |  80 ++++++++-
 src/test/java/org/json/junit/JSONMLTest.java  |   2 +-
 .../json/junit/NumberConversionUtilTest.java  | 169 ------------------
 .../org/json/junit/XMLConfigurationTest.java  |   2 +-
 src/test/java/org/json/junit/XMLTest.java     |   2 +-
 8 files changed, 176 insertions(+), 322 deletions(-)
 delete mode 100644 src/main/java/org/json/NumberConversionUtil.java
 delete mode 100644 src/test/java/org/json/junit/NumberConversionUtilTest.java

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index ed7982f..b0c912d 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -331,7 +331,7 @@ public class JSONArray implements Iterable<Object> {
             if (object instanceof Number) {
                 return (Number)object;
             }
-            return NumberConversionUtil.stringToNumber(object.toString());
+            return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
             throw wrongValueFormatException(index, "number", object, e);
         }
@@ -1078,7 +1078,7 @@ public class JSONArray implements Iterable<Object> {
         
         if (val instanceof String) {
             try {
-                return NumberConversionUtil.stringToNumber((String) val);
+                return JSONObject.stringToNumber((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 9b2e3e0..fbf225e 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -28,8 +28,6 @@ import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import static org.json.NumberConversionUtil.stringToNumber;
-
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
  * form is a string wrapped in curly braces with colons between the names and
@@ -2382,7 +2380,83 @@ public class JSONObject {
                 || val.indexOf('E') > -1 || "-0".equals(val);
     }
 
+    /**
+     * Converts a string to a number using the narrowest possible type. Possible
+     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
+     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
+     *
+     * @param input value to convert
+     * @return Number representation of the value.
+     * @throws NumberFormatException thrown if the value is not a valid number. A public
+     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
+     */
+    protected static Number stringToNumber(final String input) throws NumberFormatException {
+        String val = input;
+        if (val.startsWith(".")){
+            val = "0"+val;
+        }
+        if (val.startsWith("-.")){
+            val = "-0."+val.substring(2);
+        }
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                    }
+                }
+            }
+            val = removeLeadingZerosOfNumber(input);
+            initial = val.charAt(0);
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
 
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+    }
 
     /**
      * Try to convert a string into a number, boolean, or null. If the string
@@ -2848,4 +2922,23 @@ public class JSONObject {
         );
     }
 
+    /**
+     * 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";
+    }
 }
diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
deleted file mode 100644
index 08da6bd..0000000
--- a/src/main/java/org/json/NumberConversionUtil.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.json;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class NumberConversionUtil {
-
-    /**
-     * Converts a string to a number using the narrowest possible type. Possible
-     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
-     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
-     *
-     * @param input value to convert
-     * @return Number representation of the value.
-     * @throws NumberFormatException thrown if the value is not a valid number. A public
-     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
-     */
-    public static Number stringToNumber(final String input) throws NumberFormatException {
-        String val = input;
-        if (val.startsWith(".")){
-            val = "0"+val;
-        }
-        if (val.startsWith("-.")){
-            val = "-0."+val.substring(2);
-        }
-        char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                    }
-                }
-            }
-            val = removeLeadingZerosOfNumber(input);
-            initial = val.charAt(0);
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
-
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-    }
-
-    /**
-     * Checks if the value could be considered a number in decimal number system.
-     * @param value
-     * @return
-     */
-    public static boolean potentialNumber(String value){
-        if (value == null || value.isEmpty()){
-            return false;
-        }
-        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
-    }
-
-    /**
-     * Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
-     *
-     * @param val value to test
-     * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
-     */
-    private static boolean isDecimalNotation(final String val) {
-        return val.indexOf('.') > -1 || val.indexOf('e') > -1
-                || val.indexOf('E') > -1 || "-0".equals(val);
-    }
-
-    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
-    }
-
-    private static boolean digitAtIndex(String value, int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
-    }
-
-    /**
-     * 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";
-    }
-}
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 78a3a59..925f056 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -6,11 +6,10 @@ Public Domain.
 
 import java.io.Reader;
 import java.io.StringReader;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.Iterator;
 
-import static org.json.NumberConversionUtil.potentialNumber;
-import static org.json.NumberConversionUtil.stringToNumber;
-
 
 /**
  * This provides static methods to convert an XML text into a JSONObject, and to
@@ -487,7 +486,8 @@ public class XML {
          * produced, then the value will just be a string.
          */
 
-        if (potentialNumber(string)) {
+        char initial = string.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -496,6 +496,78 @@ public class XML {
         return string;
     }
 
+    /**
+     * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
+     */
+    private static Number stringToNumber(final String val) throws NumberFormatException {
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    }
+                }
+            }
+            // block items like 00 01 etc. Java number parsers treat these as Octal.
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
+
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+    }
+
+    /**
+     * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain Android support.
+     */
+    private static boolean isDecimalNotation(final String val) {
+        return val.indexOf('.') > -1 || val.indexOf('e') > -1
+                || val.indexOf('E') > -1 || "-0".equals(val);
+    }
+
+
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject. Some information may be lost in this transformation because
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index ae71aed..35c0af2 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -709,7 +709,7 @@ public class JSONMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final String expectedJsonString = "[\"root\",[\"id\",1],[\"id\",1],[\"id\",0],[\"id\",0],[\"item\",{\"id\":1}],[\"title\",true]]";
+        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",1],[\"id\",\"00\"],[\"id\",0],[\"item\",{\"id\":\"01\"}],[\"title\",true]]";
         final JSONArray actualJsonOutput = JSONML.toJSONArray(originalXml, false);
         assertEquals(expectedJsonString, actualJsonOutput.toString());
     }
diff --git a/src/test/java/org/json/junit/NumberConversionUtilTest.java b/src/test/java/org/json/junit/NumberConversionUtilTest.java
deleted file mode 100644
index 4ac7c83..0000000
--- a/src/test/java/org/json/junit/NumberConversionUtilTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.json.junit;
-
-import org.json.NumberConversionUtil;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.junit.Assert.*;
-
-public class NumberConversionUtilTest {
-
-    @Test
-    public void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("00.10d");
-        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("0.10d");
-        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-
-     @Test
-    public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("0.010d");
-        assertEquals("Do not match",  0.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("00200.10d");
-        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("200.10d");
-        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-
-     @Test
-    public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("200.010d");
-        assertEquals("Do not match",  200.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("-00.10d");
-        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("-0.10d");
-        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-
-     @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("-0.010d");
-        assertEquals("Do not match",  -0.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("-00200.10d");
-        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("-200.10d");
-        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-
-     @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("-200.010d");
-        assertEquals("Do not match",  -200.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNumbersWithExponents(){
-        Number number = NumberConversionUtil.stringToNumber("23.45e7");
-        assertEquals("Do not match",  23.45e7d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  23.45e7f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  2.345E8, number.longValue(),0);
-        assertEquals("Do not match",  2.345E8, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeNumbersWithExponents(){
-        Number number = NumberConversionUtil.stringToNumber("-23.45e7");
-        assertEquals("Do not match",  -23.45e7d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -23.45e7f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -2.345E8, number.longValue(),0);
-        assertEquals("Do not match",  -2.345E8, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseBigDecimal(){
-        Number number = NumberConversionUtil.stringToNumber("19007199254740993.35481234487103587486413587843213584");
-        assertTrue(number instanceof BigDecimal);
-    }
-
-    @Test
-    public void shouldParseBigInteger(){
-        Number number = NumberConversionUtil.stringToNumber("1900719925474099335481234487103587486413587843213584");
-        assertTrue(number instanceof BigInteger);
-    }
-
-    @Test
-    public void shouldIdentifyPotentialNumber(){
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112.123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112e123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112.123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112e23"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("--112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("-a112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("a112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("e112.123"));
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 2eaaf99..21a2b59 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -733,7 +733,7 @@ public class XMLConfigurationTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, 
                 new XMLParserConfiguration().withKeepStrings(false));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 9702d3d..22d6131 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -791,7 +791,7 @@ public class XMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
+        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, false);
 
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expectedJson);

From 2374766018f10318605fa4b6991c398923093c1f Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Thu, 19 Oct 2023 14:07:53 +0530
Subject: [PATCH 170/212] #790 - Update XML with changes for string to number
 conversion. For now the code remains duplicated in JSON and XML parsers. Unit
 test cases updated to comply with number expectations.

---
 src/main/java/org/json/XML.java               | 60 ++++++++++++++++---
 src/test/java/org/json/junit/JSONMLTest.java  |  2 +-
 .../org/json/junit/XMLConfigurationTest.java  |  2 +-
 src/test/java/org/json/junit/XMLTest.java     |  2 +-
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 925f056..5331923 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -486,8 +486,7 @@ public class XML {
          * produced, then the value will just be a string.
          */
 
-        char initial = string.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
+        if (potentialNumber(string)) {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -496,10 +495,38 @@ public class XML {
         return string;
     }
 
+    private static boolean potentialNumber(String value){
+        if (value == null || value.isEmpty()){
+            return false;
+        }
+        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
+    }
+
+    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
+    }
+
+    private static boolean digitAtIndex(String value, int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
+    }
+
     /**
      * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
      */
-    private static Number stringToNumber(final String val) throws NumberFormatException {
+    private static Number stringToNumber(final String input) throws NumberFormatException {
+        String val = input;
+        if (val.startsWith(".")){
+            val = "0"+val;
+        }
+        if (val.startsWith("-.")){
+            val = "-0."+val.substring(2);
+        }
         char initial = val.charAt(0);
         if ((initial >= '0' && initial <= '9') || initial == '-') {
             // decimal representation
@@ -518,25 +545,25 @@ public class XML {
                     try {
                         Double d = Double.valueOf(val);
                         if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
                         }
                         return d;
                     } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
                     }
                 }
             }
-            // block items like 00 01 etc. Java number parsers treat these as Octal.
+            val = removeLeadingZerosOfNumber(input);
             if(initial == '0' && val.length() > 1) {
                 char at1 = val.charAt(1);
                 if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             } else if (initial == '-' && val.length() > 2) {
                 char at1 = val.charAt(1);
                 char at2 = val.charAt(2);
                 if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             }
             // integer representation.
@@ -556,7 +583,7 @@ public class XML {
             }
             return bi;
         }
-        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+        throw new NumberFormatException("val ["+input+"] is not a valid number.");
     }
 
     /**
@@ -973,4 +1000,19 @@ public class XML {
         }
         return sb.toString();
     }
+
+    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";
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 35c0af2..ae71aed 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -709,7 +709,7 @@ public class JSONMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",1],[\"id\",\"00\"],[\"id\",0],[\"item\",{\"id\":\"01\"}],[\"title\",true]]";
+        final String expectedJsonString = "[\"root\",[\"id\",1],[\"id\",1],[\"id\",0],[\"id\",0],[\"item\",{\"id\":1}],[\"title\",true]]";
         final JSONArray actualJsonOutput = JSONML.toJSONArray(originalXml, false);
         assertEquals(expectedJsonString, actualJsonOutput.toString());
     }
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 21a2b59..2eaaf99 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -733,7 +733,7 @@ public class XMLConfigurationTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, 
                 new XMLParserConfiguration().withKeepStrings(false));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 22d6131..9702d3d 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -791,7 +791,7 @@ public class XMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
+        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, false);
 
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expectedJson);

From de745e9c810c2d121437aee492624d928e6f71a0 Mon Sep 17 00:00:00 2001
From: Yeikel <email@yeikel.com>
Date: Mon, 16 Oct 2023 12:38:42 -0400
Subject: [PATCH 171/212] ci: test with Java 21

---
 .github/workflows/pipeline.yml | 2 +-
 README.md                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 5e1dd42..8b4c87e 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
     name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
diff --git a/README.md b/README.md
index 9f01342..a351a48 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Project goals include:
 * No external dependencies
 * Fast execution and low memory footprint
 * Maintain backward compatibility
-* Designed and tested to use on Java versions 1.6 - 1.11
+* Designed and tested to use on Java versions 1.8 - 21
 
 The files in this package implement JSON encoders and decoders. The package can also convert between JSON and XML, HTTP headers, Cookies, and CDL.
 

From 6007165c17f349b81787657d104c967ef5dcc9ae Mon Sep 17 00:00:00 2001
From: Yeikel <email@yeikel.com>
Date: Sat, 21 Oct 2023 00:10:42 -0400
Subject: [PATCH 172/212] docs: use syntax highlighting

use syntax highlighting to improve the format of the readme
---
 README.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 5f1f5b0..1db1f54 100644
--- a/README.md
+++ b/README.md
@@ -44,24 +44,24 @@ The org.json package can be built from the command line, Maven, and Gradle. The
 **Building from the command line**
 
 *Build the class files from the package root directory src/main/java*
-````
+```shell
 javac org/json/*.java
-````
+```
 
 *Create the jar file in the current directory*
-````
+```shell
 jar cf json-java.jar org/json/*.class
-````
+```
 
 *Compile a program that uses the jar (see example code below)*
-````
+```shell
 javac -cp .;json-java.jar Test.java (Windows)
 javac -cp .:json-java.jar Test.java (Unix Systems)
-````
+```
 
 *Test file contents*
 
-````
+```java
 import org.json.JSONObject;
 public class Test {
     public static void main(String args[]){
@@ -69,31 +69,31 @@ public class Test {
        System.out.println(jo.toString());
     }
 }
-````
+```
 
 *Execute the Test file*
-```` 
+```shell 
 java -cp .;json-java.jar Test (Windows)
 java -cp .:json-java.jar Test (Unix Systems)
-````
+```
 
 *Expected output*
 
-````
+```json
 {"abc":"def"}
-````
+```
 
  
 **Tools to build the package and execute the unit tests**
 
 Execute the test suite with Maven:
-```
+```shell
 mvn clean test
 ```
 
 Execute the test suite with Gradlew:
 
-```
+```shell
 gradlew clean build test
 ```
 

From 98b79ae7bf182397dded8a669c2432d618d03a07 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Mon, 23 Oct 2023 19:16:25 +0530
Subject: [PATCH 173/212] #813 - moved number conversion related common changes
 to utility static method.

---
 src/main/java/org/json/JSONArray.java         |   4 +-
 src/main/java/org/json/JSONObject.java        | 120 +-----------
 .../java/org/json/NumberConversionUtil.java   | 142 ++++++++++++++
 src/main/java/org/json/XML.java               | 112 +----------
 .../json/junit/NumberConversionUtilTest.java  | 175 ++++++++++++++++++
 5 files changed, 326 insertions(+), 227 deletions(-)
 create mode 100644 src/main/java/org/json/NumberConversionUtil.java
 create mode 100644 src/test/java/org/json/junit/NumberConversionUtilTest.java

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index b0c912d..ed7982f 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -331,7 +331,7 @@ public class JSONArray implements Iterable<Object> {
             if (object instanceof Number) {
                 return (Number)object;
             }
-            return JSONObject.stringToNumber(object.toString());
+            return NumberConversionUtil.stringToNumber(object.toString());
         } catch (Exception e) {
             throw wrongValueFormatException(index, "number", object, e);
         }
@@ -1078,7 +1078,7 @@ public class JSONArray implements Iterable<Object> {
         
         if (val instanceof String) {
             try {
-                return JSONObject.stringToNumber((String) val);
+                return NumberConversionUtil.stringToNumber((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index fbf225e..7f4885e 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -28,6 +28,9 @@ import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import static org.json.NumberConversionUtil.potentialNumber;
+import static org.json.NumberConversionUtil.stringToNumber;
+
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
  * form is a string wrapped in curly braces with colons between the names and
@@ -2380,84 +2383,6 @@ public class JSONObject {
                 || val.indexOf('E') > -1 || "-0".equals(val);
     }
 
-    /**
-     * Converts a string to a number using the narrowest possible type. Possible
-     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
-     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
-     *
-     * @param input value to convert
-     * @return Number representation of the value.
-     * @throws NumberFormatException thrown if the value is not a valid number. A public
-     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
-     */
-    protected static Number stringToNumber(final String input) throws NumberFormatException {
-        String val = input;
-        if (val.startsWith(".")){
-            val = "0"+val;
-        }
-        if (val.startsWith("-.")){
-            val = "-0."+val.substring(2);
-        }
-        char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                    }
-                }
-            }
-            val = removeLeadingZerosOfNumber(input);
-            initial = val.charAt(0);
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
-
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-    }
-
     /**
      * Try to convert a string into a number, boolean, or null. If the string
      * can't be converted, return the string.
@@ -2501,26 +2426,7 @@ public class JSONObject {
     }
 
 
-    private static boolean potentialNumber(String value){
-        if (value == null || value.isEmpty()){
-            return false;
-        }
-        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
-    }
 
-    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
-    }
-
-    private static boolean digitAtIndex(String value, int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
-    }
 
     /**
      * Throw an exception if the object is a NaN or infinite number.
@@ -2922,23 +2828,5 @@ public class JSONObject {
         );
     }
 
-    /**
-     * 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";
-    }
+
 }
diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
new file mode 100644
index 0000000..08da6bd
--- /dev/null
+++ b/src/main/java/org/json/NumberConversionUtil.java
@@ -0,0 +1,142 @@
+package org.json;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class NumberConversionUtil {
+
+    /**
+     * Converts a string to a number using the narrowest possible type. Possible
+     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
+     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
+     *
+     * @param input value to convert
+     * @return Number representation of the value.
+     * @throws NumberFormatException thrown if the value is not a valid number. A public
+     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
+     */
+    public static Number stringToNumber(final String input) throws NumberFormatException {
+        String val = input;
+        if (val.startsWith(".")){
+            val = "0"+val;
+        }
+        if (val.startsWith("-.")){
+            val = "-0."+val.substring(2);
+        }
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                    }
+                }
+            }
+            val = removeLeadingZerosOfNumber(input);
+            initial = val.charAt(0);
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
+
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+input+"] is not a valid number.");
+    }
+
+    /**
+     * Checks if the value could be considered a number in decimal number system.
+     * @param value
+     * @return
+     */
+    public static boolean potentialNumber(String value){
+        if (value == null || value.isEmpty()){
+            return false;
+        }
+        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
+    }
+
+    /**
+     * Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
+     *
+     * @param val value to test
+     * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
+     */
+    private static boolean isDecimalNotation(final String val) {
+        return val.indexOf('.') > -1 || val.indexOf('e') > -1
+                || val.indexOf('E') > -1 || "-0".equals(val);
+    }
+
+    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
+    }
+
+    private static boolean digitAtIndex(String value, int index){
+        if (index >= value.length()){
+            return false;
+        }
+        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
+    }
+
+    /**
+     * 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";
+    }
+}
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 5331923..5105a9e 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -10,6 +10,9 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Iterator;
 
+import static org.json.NumberConversionUtil.potentialNumber;
+import static org.json.NumberConversionUtil.stringToNumber;
+
 
 /**
  * This provides static methods to convert an XML text into a JSONObject, and to
@@ -495,104 +498,9 @@ public class XML {
         return string;
     }
 
-    private static boolean potentialNumber(String value){
-        if (value == null || value.isEmpty()){
-            return false;
-        }
-        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
-    }
 
-    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
-    }
 
-    private static boolean digitAtIndex(String value, int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
-    }
 
-    /**
-     * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
-     */
-    private static Number stringToNumber(final String input) throws NumberFormatException {
-        String val = input;
-        if (val.startsWith(".")){
-            val = "0"+val;
-        }
-        if (val.startsWith("-.")){
-            val = "-0."+val.substring(2);
-        }
-        char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-') {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                    }
-                }
-            }
-            val = removeLeadingZerosOfNumber(input);
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
-
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-    }
-
-    /**
-     * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain Android support.
-     */
-    private static boolean isDecimalNotation(final String val) {
-        return val.indexOf('.') > -1 || val.indexOf('e') > -1
-                || val.indexOf('E') > -1 || "-0".equals(val);
-    }
 
 
     /**
@@ -1001,18 +909,4 @@ public class XML {
         return sb.toString();
     }
 
-    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";
-    }
 }
diff --git a/src/test/java/org/json/junit/NumberConversionUtilTest.java b/src/test/java/org/json/junit/NumberConversionUtilTest.java
new file mode 100644
index 0000000..bf2586d
--- /dev/null
+++ b/src/test/java/org/json/junit/NumberConversionUtilTest.java
@@ -0,0 +1,175 @@
+package org.json.junit;
+
+import org.json.NumberConversionUtil;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.Assert.*;
+
+public class NumberConversionUtilTest {
+
+    @Test
+    public void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("00.10d");
+        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("0.10d");
+        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("0.010d");
+        assertEquals("Do not match",  0.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  0.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  0, number.longValue(),0);
+        assertEquals("Do not match",  0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("00200.10d");
+        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("200.10d");
+        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("200.010d");
+        assertEquals("Do not match",  200.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  200.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  200, number.longValue(),0);
+        assertEquals("Do not match",  200, number.intValue(),0);
+    }
+
+
+    @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("-00.10d");
+        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("-0.10d");
+        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("-0.010d");
+        assertEquals("Do not match",  -0.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -0.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -0, number.longValue(),0);
+        assertEquals("Do not match",  -0, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
+        Number number = NumberConversionUtil.stringToNumber("-00200.10d");
+        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
+        Number number = NumberConversionUtil.stringToNumber("-200.10d");
+        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+
+     @Test
+    public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
+        Number number = NumberConversionUtil.stringToNumber("-200.010d");
+        assertEquals("Do not match",  -200.010d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -200.010f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -200, number.longValue(),0);
+        assertEquals("Do not match",  -200, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseNumbersWithExponents(){
+        Number number = NumberConversionUtil.stringToNumber("23.45e7");
+        assertEquals("Do not match",  23.45e7d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  23.45e7f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  2.345E8, number.longValue(),0);
+        assertEquals("Do not match",  2.345E8, number.intValue(),0);
+    }
+
+
+    @Test
+    public void shouldParseNegativeNumbersWithExponents(){
+        Number number = NumberConversionUtil.stringToNumber("-23.45e7");
+        assertEquals("Do not match",  -23.45e7d, number.doubleValue(),0.0d);
+        assertEquals("Do not match",  -23.45e7f, number.floatValue(),0.0f);
+        assertEquals("Do not match",  -2.345E8, number.longValue(),0);
+        assertEquals("Do not match",  -2.345E8, number.intValue(),0);
+    }
+
+    @Test
+    public void shouldParseBigDecimal(){
+        Number number = NumberConversionUtil.stringToNumber("19007199254740993.35481234487103587486413587843213584");
+        assertTrue(number instanceof BigDecimal);
+    }
+
+    @Test
+    public void shouldParseBigInteger(){
+        Number number = NumberConversionUtil.stringToNumber("1900719925474099335481234487103587486413587843213584");
+        assertTrue(number instanceof BigInteger);
+    }
+
+    @Test
+    public void shouldIdentifyPotentialNumber(){
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112.123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112e123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112.123"));
+        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112e23"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("--112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("-a112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("a112.123"));
+        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("e112.123"));
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void shouldExpectExceptionWhenNumberIsNotFormatted(){
+        NumberConversionUtil.stringToNumber("112.aa123");
+    }
+
+
+}
\ No newline at end of file

From 5539722c693d4b19ec61fce4d584af5f0e37c86d Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Mon, 23 Oct 2023 23:03:35 +0530
Subject: [PATCH 174/212] #813 - address PR review comment - brought down
 visibility.

---
 src/main/java/org/json/NumberConversionUtil.java            | 6 +++---
 .../java/org/json/{junit => }/NumberConversionUtilTest.java | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename src/test/java/org/json/{junit => }/NumberConversionUtilTest.java (99%)

diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
index 08da6bd..d53c5e2 100644
--- a/src/main/java/org/json/NumberConversionUtil.java
+++ b/src/main/java/org/json/NumberConversionUtil.java
@@ -3,7 +3,7 @@ package org.json;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-public class NumberConversionUtil {
+class NumberConversionUtil {
 
     /**
      * Converts a string to a number using the narrowest possible type. Possible
@@ -15,7 +15,7 @@ public class NumberConversionUtil {
      * @throws NumberFormatException thrown if the value is not a valid number. A public
      *      caller should catch this and wrap it in a {@link JSONException} if applicable.
      */
-    public static Number stringToNumber(final String input) throws NumberFormatException {
+    static Number stringToNumber(final String input) throws NumberFormatException {
         String val = input;
         if (val.startsWith(".")){
             val = "0"+val;
@@ -88,7 +88,7 @@ public class NumberConversionUtil {
      * @param value
      * @return
      */
-    public static boolean potentialNumber(String value){
+    static boolean potentialNumber(String value){
         if (value == null || value.isEmpty()){
             return false;
         }
diff --git a/src/test/java/org/json/junit/NumberConversionUtilTest.java b/src/test/java/org/json/NumberConversionUtilTest.java
similarity index 99%
rename from src/test/java/org/json/junit/NumberConversionUtilTest.java
rename to src/test/java/org/json/NumberConversionUtilTest.java
index bf2586d..0fedceb 100644
--- a/src/test/java/org/json/junit/NumberConversionUtilTest.java
+++ b/src/test/java/org/json/NumberConversionUtilTest.java
@@ -1,6 +1,5 @@
-package org.json.junit;
+package org.json;
 
-import org.json.NumberConversionUtil;
 import org.junit.Test;
 
 import java.math.BigDecimal;

From 1ab11d08024f9d815772811c3ebdd110ad228ce8 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 23 Oct 2023 14:50:21 -0400
Subject: [PATCH 175/212] ensure java 6 compatable

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

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index a66ae7b..39d23e2 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -10,6 +10,34 @@ on:
     branches: [ master ]
 
 jobs:
+  # old-school build and jar method. No tests run or compiled.
+  build-1_6: 
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # build for java 1.6, however don't run any tests
+        java: [ 1.6 ]
+    name: Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Compile Java ${{ matrix.java }}
+        run: |
+          mkdir -p target/classes
+          javac -version
+          javac -d target/classes/ src/main/java/org/json/*.java
+      - name: Create java ${{ matrix.java }} JAR
+        run: |
+          jar cvf target/org.json.jar -C target/classes .
+      - name: Upload JAR ${{ matrix.java }}
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: Create java ${{ matrix.java }} JAR
+          path: target/*.jar
   build:
     runs-on: ubuntu-latest
     strategy:

From a2a8240d0d83836c509dd59d060d7d08b0429a3c Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 23 Oct 2023 16:18:23 -0400
Subject: [PATCH 176/212] upload jar files to GitHub release

---
 .github/workflows/deployment.yml | 104 ++++++++++++++++++++-----------
 .github/workflows/pipeline.yml   |   4 +-
 2 files changed, 72 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 54457d9..809c4a0 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -11,38 +11,72 @@ on:
       types: [published]
   
 jobs:
-    publish:
-      runs-on: ubuntu-latest
-      permissions:
-        contents: read
-        packages: write
-      steps:
-        - uses: actions/checkout@v4
-        - name: Set up Java for publishing to Maven Central Repository
-          uses: actions/setup-java@v3
-          with:
-            # Use lowest supported LTS Java version
-            java-version: '8'
-            distribution: 'temurin'
-            server-id: ossrh  # Value of the distributionManagement/repository/id field of the pom.xml
-            server-username: MAVEN_USERNAME # env variable for username in deploy
-            server-password: MAVEN_PASSWORD # env variable for token in deploy
-            gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
-            gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-    
-        - name: Publish to the Maven Central Repository
-          run: mvn --batch-mode deploy
-          env:
-            MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-            MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-            MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-        # - name: Set up Java for publishing to GitHub Packages
-        #   uses: actions/setup-java@v3
-        #   with:
-        #     # Use lowest supported LTS Java version
-        #     java-version: '8'
-        #     distribution: 'temurin'
-        # - name: Publish to GitHub Packages
-        #   run: mvn --batch-mode deploy
-        #   env:
-        #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # old-school build and jar method. No tests run or compiled.
+  publish-1_6: 
+    name: Publish Java 1.6 to GitHub Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.6
+      - name: Compile Java 1.6
+        run: |
+          mkdir -p target/classes
+          javac -version
+          javac -d target/classes/ src/main/java/org/json/*.java
+      - name: Create JAR 1.6
+        run: |
+          jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes .
+      - name: Add 1.6 Jar To Release
+        uses: softprops/action-gh-release@v1
+        with:
+          append_body: true
+          files: |
+            target/*.jar
+  publish:
+    name: Publish Java 8 to Maven Central and GitHub Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java for publishing to Maven Central Repository
+        uses: actions/setup-java@v3
+        with:
+          # Use lowest supported LTS Java version
+          java-version: '8'
+          distribution: 'temurin'
+          server-id: ossrh  # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME # env variable for username in deploy
+          server-password: MAVEN_PASSWORD # env variable for token in deploy
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+  
+      - name: Publish to the Maven Central Repository
+        run: mvn --batch-mode deploy
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          
+      - name: Add Jar To Release
+        uses: softprops/action-gh-release@v1
+        with:
+          append_body: true
+          files: |
+            target/*.jar
+      # - name: Set up Java for publishing to GitHub Packages
+      #   uses: actions/setup-java@v3
+      #   with:
+      #     # Use lowest supported LTS Java version
+      #     java-version: '8'
+      #     distribution: 'temurin'
+      # - name: Publish to GitHub Packages
+      #   run: mvn --batch-mode deploy
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 39d23e2..b5b5f3f 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -19,7 +19,7 @@ jobs:
         java: [ 1.6 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup java
         uses: actions/setup-java@v1
         with:
@@ -41,6 +41,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
+      max-parallel: 2
       matrix:
         # build against supported Java LTS versions:
         java: [ 8, 11, 17, 21 ]

From ea842b437cf552de8394bd843e40cf12f92a0c94 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 23 Oct 2023 17:11:55 -0400
Subject: [PATCH 177/212] remove unneeded matrix build typ for java 1.6

---
 .github/workflows/deployment.yml |  2 +-
 .github/workflows/pipeline.yml   | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 809c4a0..e870644 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           mkdir -p target/classes
           javac -version
-          javac -d target/classes/ src/main/java/org/json/*.java
+          javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
       - name: Create JAR 1.6
         run: |
           jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes .
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index b5b5f3f..63540cc 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -12,31 +12,27 @@ on:
 jobs:
   # old-school build and jar method. No tests run or compiled.
   build-1_6: 
+    name: Java 1.6
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # build for java 1.6, however don't run any tests
-        java: [ 1.6 ]
-    name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup java
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
-      - name: Compile Java ${{ matrix.java }}
+          java-version: 1.6
+      - name: Compile Java 1.6
         run: |
           mkdir -p target/classes
           javac -version
-          javac -d target/classes/ src/main/java/org/json/*.java
-      - name: Create java ${{ matrix.java }} JAR
+          javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
+      - name: Create java 1.6 JAR
         run: |
           jar cvf target/org.json.jar -C target/classes .
-      - name: Upload JAR ${{ matrix.java }}
+      - name: Upload JAR 1.6
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
         with:
-          name: Create java ${{ matrix.java }} JAR
+          name: Create java 1.6 JAR
           path: target/*.jar
   build:
     runs-on: ubuntu-latest
@@ -56,15 +52,15 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Compile Java ${{ matrix.java }}
-        run: mvn clean compile -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true
+        run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true
       - name: Run Tests ${{ matrix.java }}
         run: |
-          mvn test -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
+          mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Build Test Report ${{ matrix.java }}
         if: ${{ always() }}
         run: |
-          mvn surefire-report:report-only -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
-          mvn site -DgenerateReports=false -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
+          mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
+          mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
       - name: Upload Test Results ${{ matrix.java }}
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
@@ -78,7 +74,7 @@ jobs:
           name: Test Report ${{ matrix.java }}
           path: target/site/
       - name: Package Jar ${{ matrix.java }}
-        run: mvn clean package -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true
+        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

From c6ec2f0e4cadf6c9efbcfa1245f3182ef50be292 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Wed, 25 Oct 2023 23:23:00 +0530
Subject: [PATCH 178/212] #748 - close XML tag explicitly for empty tags with
 configuration.

---
 src/main/java/org/json/XML.java               | 25 ++++++++++++++-----
 .../java/org/json/XMLParserConfiguration.java | 22 ++++++++++++++--
 .../org/json/junit/XMLConfigurationTest.java  | 11 ++++++++
 src/test/java/org/json/junit/XMLTest.java     | 20 +++++++++++++++
 4 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 5331923..efdfd9f 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -877,12 +877,25 @@ public class XML {
                         }
                     }
                 } else if ("".equals(value)) {
-                    sb.append(indent(indent));
-                    sb.append('<');
-                    sb.append(key);
-                    sb.append("/>");
-                    if(indentFactor > 0){
-                        sb.append("\n");
+                    if (config.isCloseEmptyTag()){
+                        sb.append(indent(indent));
+                        sb.append('<');
+                        sb.append(key);
+                        sb.append(">");
+                        sb.append("</");
+                        sb.append(key);
+                        sb.append(">");
+                        if (indentFactor > 0) {
+                            sb.append("\n");
+                        }
+                    }else {
+                        sb.append(indent(indent));
+                        sb.append('<');
+                        sb.append(key);
+                        sb.append("/>");
+                        if (indentFactor > 0) {
+                            sb.append("\n");
+                        }
                     }
 
                     // Emit a new tag <k>
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 566146d..5d7ecfa 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -43,6 +43,13 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     private boolean convertNilAttributeToNull;
 
+    /**
+     * When creating an XML from JSON Object, an empty tag by default will self-close.
+     * If it has to be closed explicitly, with empty content between start and end tag,
+     * this flag is to be turned on.
+     */
+    private boolean closeEmptyTag;
+
     /**
      * This will allow type conversion for values in XML if xsi:type attribute is defined
      */
@@ -145,12 +152,13 @@ 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 int maxNestingDepth, final boolean closeEmptyTag) {
         super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
         this.forceList = Collections.unmodifiableSet(forceList);
+        this.closeEmptyTag = closeEmptyTag;
     }
 
     /**
@@ -169,7 +177,8 @@ public class XMLParserConfiguration extends ParserConfiguration {
                 this.convertNilAttributeToNull,
                 this.xsiTypeMap,
                 this.forceList,
-                this.maxNestingDepth
+                this.maxNestingDepth,
+                this.closeEmptyTag
         );
     }
 
@@ -303,4 +312,13 @@ public class XMLParserConfiguration extends ParserConfiguration {
     public XMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
         return super.withMaxNestingDepth(maxNestingDepth);
     }
+
+    public XMLParserConfiguration withCloseEmptyTag(boolean closeEmptyTag){
+        this.closeEmptyTag = closeEmptyTag;
+        return this;
+    }
+
+    public boolean isCloseEmptyTag() {
+        return this.closeEmptyTag;
+    }
 }
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 2eaaf99..153d4ed 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -557,6 +557,17 @@ public class XMLConfigurationTest {
         assertEquals(actualXML, resultXML);
     }
 
+    @Test
+    public void shouldHandleEmptyNodeValue()
+    {
+        JSONObject inputJSON = new JSONObject();
+        inputJSON.put("Emptyness", "");
+        String expectedXmlWithoutExplicitEndTag = "<Emptyness/>";
+        String expectedXmlWithExplicitEndTag = "<Emptyness></Emptyness>";
+        assertEquals(expectedXmlWithoutExplicitEndTag, XML.toString(inputJSON, null, new XMLParserConfiguration().withCloseEmptyTag(false)));
+        assertEquals(expectedXmlWithExplicitEndTag, XML.toString(inputJSON, null, new XMLParserConfiguration().withCloseEmptyTag(true)));
+    }
+
     /**
      * Investigate exactly how the "content" keyword works
      */
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 63135eb..d8aedb3 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1177,6 +1177,26 @@ public class XMLTest {
 
 
     }
+
+    @Test
+    public void shouldCreateExplicitEndTagWithEmptyValueWhenConfigured(){
+        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));
+        assertEquals(expectedXmlString, xmlForm);
+    }
+
+    @Test
+    public void shouldNotCreateExplicitEndTagWithEmptyValueWhenNotConfigured(){
+        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));
+        assertEquals(expectedXmlString, xmlForm);
+    }
+
+
     @Test
     public void testIndentSimpleJsonObject(){
         String str = "{    \"employee\": {  \n" +

From c05d7058ff7bfd0a1520cd8bcf94eebd2b9a11be Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Fri, 27 Oct 2023 17:17:20 +0530
Subject: [PATCH 179/212] #748 - javadoc updated for methods.

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

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 5d7ecfa..e85ce53 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -149,6 +149,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
      *                   xsi:type="integer" as integer,  xsi:type="string" as string
      * @param forceList  <code>new HashSet<String>()</code> to parse the provided tags' values as arrays
      * @param maxNestingDepth <code>int</code> to limit the nesting depth
+     * @param closeEmptyTag <code>boolean</code> to turn on explicit end tag for tag with empty value
      */
     private XMLParserConfiguration (final boolean keepStrings, final String cDataTagName,
             final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList,
@@ -313,6 +314,11 @@ public class XMLParserConfiguration extends ParserConfiguration {
         return super.withMaxNestingDepth(maxNestingDepth);
     }
 
+    /**
+     * To enable explicit end tag with empty value.
+     * @param closeEmptyTag
+     * @return same instance of configuration with empty tag config updated
+     */
     public XMLParserConfiguration withCloseEmptyTag(boolean closeEmptyTag){
         this.closeEmptyTag = closeEmptyTag;
         return this;

From 1ceb70b525c9a0e6bd3c36cd8ce219ad42ec7985 Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Sat, 28 Oct 2023 07:09:37 +0530
Subject: [PATCH 180/212] #813 - PR comments - alignments

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

diff --git a/src/test/java/org/json/NumberConversionUtilTest.java b/src/test/java/org/json/NumberConversionUtilTest.java
index 0fedceb..c6f0725 100644
--- a/src/test/java/org/json/NumberConversionUtilTest.java
+++ b/src/test/java/org/json/NumberConversionUtilTest.java
@@ -28,7 +28,7 @@ public class NumberConversionUtilTest {
     }
 
 
-     @Test
+    @Test
     public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
         Number number = NumberConversionUtil.stringToNumber("0.010d");
         assertEquals("Do not match",  0.010d, number.doubleValue(),0.0d);
@@ -56,7 +56,7 @@ public class NumberConversionUtilTest {
     }
 
 
-     @Test
+    @Test
     public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
         Number number = NumberConversionUtil.stringToNumber("200.010d");
         assertEquals("Do not match",  200.010d, number.doubleValue(),0.0d);
@@ -85,7 +85,7 @@ public class NumberConversionUtilTest {
     }
 
 
-     @Test
+    @Test
     public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
         Number number = NumberConversionUtil.stringToNumber("-0.010d");
         assertEquals("Do not match",  -0.010d, number.doubleValue(),0.0d);
@@ -113,7 +113,7 @@ public class NumberConversionUtilTest {
     }
 
 
-     @Test
+    @Test
     public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
         Number number = NumberConversionUtil.stringToNumber("-200.010d");
         assertEquals("Do not match",  -200.010d, number.doubleValue(),0.0d);

From 8ec822c5756acbf78ae83ba2c4800ebf25b5336e Mon Sep 17 00:00:00 2001
From: rudrajyoti biswas <rudrajyoti.biswas@outlook.com>
Date: Sat, 28 Oct 2023 07:36:31 +0530
Subject: [PATCH 181/212] #748 - PR comments - follow convention of
 configuration builder.

---
 .../java/org/json/XMLParserConfiguration.java |  5 +--
 .../org/json/junit/XMLConfigurationTest.java  | 31 ++++++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index e85ce53..2e4907f 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -320,8 +320,9 @@ public class XMLParserConfiguration extends ParserConfiguration {
      * @return same instance of configuration with empty tag config updated
      */
     public XMLParserConfiguration withCloseEmptyTag(boolean closeEmptyTag){
-        this.closeEmptyTag = closeEmptyTag;
-        return this;
+        XMLParserConfiguration clonedConfiguration = this.clone();
+        clonedConfiguration.closeEmptyTag = closeEmptyTag;
+        return clonedConfiguration;
     }
 
     public boolean isCloseEmptyTag() {
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index 153d4ed..ffdc20c 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -4,11 +4,6 @@ package org.json.junit;
 Public Domain.
 */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -27,6 +22,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import static org.junit.Assert.*;
+
 
 /**
  * Tests for JSON-Java XML.java with XMLParserConfiguration.java
@@ -564,8 +561,28 @@ public class XMLConfigurationTest {
         inputJSON.put("Emptyness", "");
         String expectedXmlWithoutExplicitEndTag = "<Emptyness/>";
         String expectedXmlWithExplicitEndTag = "<Emptyness></Emptyness>";
-        assertEquals(expectedXmlWithoutExplicitEndTag, XML.toString(inputJSON, null, new XMLParserConfiguration().withCloseEmptyTag(false)));
-        assertEquals(expectedXmlWithExplicitEndTag, XML.toString(inputJSON, null, new XMLParserConfiguration().withCloseEmptyTag(true)));
+        assertEquals(expectedXmlWithoutExplicitEndTag, XML.toString(inputJSON, null,
+                new XMLParserConfiguration().withCloseEmptyTag(false)));
+        assertEquals(expectedXmlWithExplicitEndTag, XML.toString(inputJSON, null,
+                new XMLParserConfiguration().withCloseEmptyTag(true)));
+    }
+
+    @Test
+    public void shouldKeepConfigurationIntactAndUpdateCloseEmptyTagChoice()
+    {
+        XMLParserConfiguration keepStrings = XMLParserConfiguration.KEEP_STRINGS;
+        XMLParserConfiguration keepStringsAndCloseEmptyTag = keepStrings.withCloseEmptyTag(true);
+        XMLParserConfiguration keepDigits = keepStringsAndCloseEmptyTag.withKeepStrings(false);
+        XMLParserConfiguration keepDigitsAndNoCloseEmptyTag = keepDigits.withCloseEmptyTag(false);
+        assertTrue(keepStrings.isKeepStrings());
+        assertFalse(keepStrings.isCloseEmptyTag());
+        assertTrue(keepStringsAndCloseEmptyTag.isKeepStrings());
+        assertTrue(keepStringsAndCloseEmptyTag.isCloseEmptyTag());
+        assertFalse(keepDigits.isKeepStrings());
+        assertTrue(keepDigits.isCloseEmptyTag());
+        assertFalse(keepDigitsAndNoCloseEmptyTag.isKeepStrings());
+        assertFalse(keepDigitsAndNoCloseEmptyTag.isCloseEmptyTag());
+
     }
 
     /**

From a3742acf74947b9ccd45bc6190111f619cb95cb6 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Mon, 6 Nov 2023 17:48:18 -0500
Subject: [PATCH 182/212] Fixes #821 add ignore annotation to tests that may
 fail due to differences in machine resources and can't be controlled via the
 tests

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

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index e877070..7b0d52e 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -32,6 +32,7 @@ import org.json.JSONPointerException;
 import org.json.JSONString;
 import org.json.JSONTokener;
 import org.json.junit.data.MyJsonString;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -1384,6 +1385,7 @@ public class JSONArrayTest {
     /**
     * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
     */
+    @Ignore("This test relies on system constraints and may not always pass. See: https://github.com/stleary/JSON-java/issues/821")
     @Test(expected = JSONException.class)
     public void issue654StackOverflowInputWellFormed() {
         //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
@@ -1391,7 +1393,7 @@ public class JSONArrayTest {
         JSONTokener tokener = new JSONTokener(resourceAsStream);
         JSONArray json_input = new JSONArray(tokener);
         assertNotNull(json_input);
-        fail("Excepected Exception.");
+        fail("Excepected Exception due to stack overflow.");
         Util.checkJSONArrayMaps(json_input);
     }
 
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 42b41b3..d9adbca 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -55,6 +55,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.Ignore;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -3665,6 +3666,7 @@ public class JSONObjectTest {
     /**
     * Tests for stack overflow. See https://github.com/stleary/JSON-java/issues/654
     */
+    @Ignore("This test relies on system constraints and may not always pass. See: https://github.com/stleary/JSON-java/issues/821")
     @Test(expected = JSONException.class)
     public void issue654StackOverflowInputWellFormed() {
         //String input = new String(java.util.Base64.getDecoder().decode(base64Bytes));
@@ -3672,7 +3674,7 @@ public class JSONObjectTest {
         JSONTokener tokener = new JSONTokener(resourceAsStream);
         JSONObject json_input = new JSONObject(tokener);
         assertNotNull(json_input);
-        fail("Excepected Exception.");
+        fail("Excepected Exception due to stack overflow.");
     }
 
     @Test

From 1a61af8255e559f7b3766e5a858d7286800e4746 Mon Sep 17 00:00:00 2001
From: Saiharshith Karuneegar Ramesh <sai.harshith108@gmail.com>
Date: Mon, 13 Nov 2023 13:25:30 -0600
Subject: [PATCH 183/212] Fixed flaky tests in XMLTest.java

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

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index d8aedb3..823a065 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1184,7 +1184,9 @@ public class XMLTest {
         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));
-        assertEquals(expectedXmlString, xmlForm);
+        JSONObject actualJsonObject = XML.toJSONObject(xmlForm);
+        JSONObject expectedJsonObject = XML.toJSONObject(expectedXmlString);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
     }
 
     @Test
@@ -1193,7 +1195,9 @@ public class XMLTest {
         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));
-        assertEquals(expectedXmlString, xmlForm);
+        JSONObject actualJsonObject = XML.toJSONObject(xmlForm);
+        JSONObject expectedJsonObject = XML.toJSONObject(expectedXmlString);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
     }
 
 

From b5f9febfe90d9667f47b22d72c4ff7693735b2dc Mon Sep 17 00:00:00 2001
From: HappyHacker123 <chaicho@foxmail.com>
Date: Fri, 17 Nov 2023 21:31:06 +0800
Subject: [PATCH 184/212] Upgrade json-path's version to 2.4 to avoid
 dependency conflict.

---
 build.gradle | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index fbc2ff1..30a8578 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ repositories {
 
 dependencies {
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
+    testImplementation 'com.jayway.jsonpath:json-path:2.4.0'
     testImplementation 'org.mockito:mockito-core:4.2.0'
 }
 
diff --git a/pom.xml b/pom.xml
index ba0efd1..927a989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.1.0</version>
+            <version>2.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 097a401f3f38f7ac8ec6b4cc28fca1b6486f6d48 Mon Sep 17 00:00:00 2001
From: Aditya Purohit <adityapurohit27@gmail.com>
Date: Sun, 19 Nov 2023 09:11:32 -0400
Subject: [PATCH 185/212] refactor: rename variable boolean 'b' to
 'isEndOfPair' in CookieList.toString()

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

diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index 8ad8b58..03e54b9 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -46,19 +46,19 @@ public class CookieList {
      * @throws JSONException if a called function fails
      */
     public static String toString(JSONObject jo) throws JSONException {
-        boolean             b = false;
+        boolean             isEndOfPair = false;
         final StringBuilder sb = new StringBuilder();
         // Don't use the new entrySet API to maintain Android support
         for (final String key : jo.keySet()) {
             final Object value = jo.opt(key);
             if (!JSONObject.NULL.equals(value)) {
-                if (b) {
+                if (isEndOfPair) {
                     sb.append(';');
                 }
                 sb.append(Cookie.escape(key));
                 sb.append("=");
                 sb.append(Cookie.escape(value.toString()));
-                b = true;
+                isEndOfPair = true;
             }
         }
         return sb.toString();

From 75419e3f257af9c365b0ef3e5f4428a335564f8d Mon Sep 17 00:00:00 2001
From: Aditya Purohit <adityapurohit27@gmail.com>
Date: Sun, 19 Nov 2023 09:21:05 -0400
Subject: [PATCH 186/212] refactor: introduce explaining variable
 'indentationSuffix' in XML.toString()

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

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 04c8bcd..a94c3fc 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -847,14 +847,14 @@ public class XML {
 
 
         string = (object == null) ? "null" : escape(object.toString());
-
+        String indentationSuffix = (indentFactor > 0) ? "\n" : "";
         if(tagName == null){
-            return indent(indent) + "\"" + string + "\"" + ((indentFactor > 0) ? "\n" : "");
+            return indent(indent) + "\"" + string + "\"" + indentationSuffix;
         } else if(string.length() == 0){
-            return indent(indent) + "<" + tagName + "/>" + ((indentFactor > 0) ? "\n" : "");
+            return indent(indent) + "<" + tagName + "/>" + indentationSuffix;
         } else {
             return indent(indent) + "<" + tagName
-                    + ">" + string + "</" + tagName + ">" + ((indentFactor > 0) ? "\n" : "");
+                    + ">" + string + "</" + tagName + ">" + indentationSuffix;
         }
     }
 

From 7f1cb8bf62015016d4b02879b00cc7477b62c570 Mon Sep 17 00:00:00 2001
From: Aditya Purohit <adityapurohit27@gmail.com>
Date: Sun, 19 Nov 2023 09:51:44 -0400
Subject: [PATCH 187/212] refactor: decompose condition of digit checks by
 using extra method 'isNumericChar(...)' in NumberConversionUtil.

---
 src/main/java/org/json/NumberConversionUtil.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
index d53c5e2..30ca74d 100644
--- a/src/main/java/org/json/NumberConversionUtil.java
+++ b/src/main/java/org/json/NumberConversionUtil.java
@@ -24,7 +24,7 @@ class NumberConversionUtil {
             val = "-0."+val.substring(2);
         }
         char initial = val.charAt(0);
-        if ((initial >= '0' && initial <= '9') || initial == '-' ) {
+        if ( isNumericChar(initial) || initial == '-' ) {
             // decimal representation
             if (isDecimalNotation(val)) {
                 // Use a BigDecimal all the time so we keep the original
@@ -53,13 +53,13 @@ class NumberConversionUtil {
             initial = val.charAt(0);
             if(initial == '0' && val.length() > 1) {
                 char at1 = val.charAt(1);
-                if(at1 >= '0' && at1 <= '9') {
+                if(isNumericChar(at1)) {
                     throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             } else if (initial == '-' && val.length() > 2) {
                 char at1 = val.charAt(1);
                 char at2 = val.charAt(2);
-                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                if(at1 == '0' && isNumericChar(at2)) {
                     throw new NumberFormatException("val ["+input+"] is not a valid number.");
                 }
             }
@@ -83,6 +83,16 @@ class NumberConversionUtil {
         throw new NumberFormatException("val ["+input+"] is not a valid number.");
     }
 
+    /**
+     * Checks if the character is a numeric digit ('0' to '9').
+     *
+     * @param c The character to be checked.
+     * @return true if the character is a numeric digit, false otherwise.
+     */
+    private static boolean isNumericChar(char c) {
+        return (c >= '0' && c <= '9');
+    }
+
     /**
      * Checks if the value could be considered a number in decimal number system.
      * @param value

From 30f5b2de79b15cac0e5c905445567f01c3560a17 Mon Sep 17 00:00:00 2001
From: Keaton Taylor <keatay@amazon.com>
Date: Mon, 20 Nov 2023 12:11:47 +0200
Subject: [PATCH 188/212] Add a config flag to disable whitespace trimming

---
 src/main/java/org/json/XML.java               | 47 +++++++++++-
 .../java/org/json/XMLParserConfiguration.java | 27 ++++++-
 src/main/java/org/json/XMLTokener.java        | 17 ++++-
 .../org/json/junit/XMLConfigurationTest.java  |  2 +-
 src/test/java/org/json/junit/XMLTest.java     | 74 +++++++++++++++++++
 5 files changed, 160 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 04c8bcd..e50f7ff 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -431,6 +431,9 @@ public class XML {
                                             && jsonObject.opt(config.getcDataTagName()) != null) {
                                         context.accumulate(tagName, jsonObject.opt(config.getcDataTagName()));
                                     } else {
+                                        if (!config.shouldTrimWhiteSpace()) {
+                                            removeEmpty(jsonObject, config);
+                                        }
                                         context.accumulate(tagName, jsonObject);
                                     }
                                 }
@@ -445,6 +448,48 @@ public class XML {
             }
         }
     }
+    /**
+     * This method removes any JSON entry which has the key set by XMLParserConfiguration.cDataTagName
+     * and contains whitespace as this is caused by whitespace between tags. See test XMLTest.testNestedWithWhitespaceTrimmingDisabled.
+     * @param jsonObject JSONObject which may require deletion
+     * @param config The XMLParserConfiguration which includes the cDataTagName
+     */
+    private static void removeEmpty(final JSONObject jsonObject, final XMLParserConfiguration config) {
+        if (jsonObject.has(config.getcDataTagName()))  {
+            final Object s = jsonObject.get(config.getcDataTagName());
+            if (s instanceof String) {
+                if (isStringAllWhiteSpace(s.toString())) {
+                    jsonObject.remove(config.getcDataTagName());
+                }
+            }
+            else if (s instanceof JSONArray) {
+                final JSONArray sArray = (JSONArray) s;
+                for (int k = sArray.length()-1; k >= 0; k--){
+                    final Object eachString = sArray.get(k);
+                    if (eachString instanceof String) {
+                        String s1 = (String) eachString;
+                        if (isStringAllWhiteSpace(s1)) {
+                            sArray.remove(k);
+                        }
+                    }
+                }
+                if (sArray.isEmpty()) {
+                    jsonObject.remove(config.getcDataTagName());
+                }
+            }
+        }
+    }
+
+    private static boolean isStringAllWhiteSpace(final String s) {
+        for (int k = 0; k<s.length(); k++){
+            final char eachChar = s.charAt(k);
+            if (!Character.isWhitespace(eachChar)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 
     /**
      * This method tries to convert the given string value to the target object
@@ -594,7 +639,7 @@ public class XML {
      */
     public static JSONObject toJSONObject(Reader reader, XMLParserConfiguration config) throws JSONException {
         JSONObject jo = new JSONObject();
-        XMLTokener x = new XMLTokener(reader);
+        XMLTokener x = new XMLTokener(reader, config);
         while (x.more()) {
             x.skipPast("<");
             if(x.more()) {
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 2e4907f..5f5a412 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -61,9 +61,11 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     private Set<String> forceList;
 
+    private boolean shouldTrimWhiteSpace;
+
     /**
      * Default parser configuration. Does not keep strings (tries to implicitly convert
-     * values), and the CDATA Tag Name is "content".
+     * values), and the CDATA Tag Name is "content". Trims whitespace.
      */
     public XMLParserConfiguration () {
         super();
@@ -71,6 +73,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
         this.convertNilAttributeToNull = false;
         this.xsiTypeMap = Collections.emptyMap();
         this.forceList = Collections.emptySet();
+        this.shouldTrimWhiteSpace = true;
     }
 
     /**
@@ -153,13 +156,14 @@ 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) {
+            final int maxNestingDepth, final boolean closeEmptyTag, final boolean shouldTrimWhiteSpace) {
         super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
         this.forceList = Collections.unmodifiableSet(forceList);
         this.closeEmptyTag = closeEmptyTag;
+        this.shouldTrimWhiteSpace = shouldTrimWhiteSpace;
     }
 
     /**
@@ -179,7 +183,8 @@ public class XMLParserConfiguration extends ParserConfiguration {
                 this.xsiTypeMap,
                 this.forceList,
                 this.maxNestingDepth,
-                this.closeEmptyTag
+                this.closeEmptyTag,
+                this.shouldTrimWhiteSpace
         );
     }
 
@@ -325,7 +330,23 @@ public class XMLParserConfiguration extends ParserConfiguration {
         return clonedConfiguration;
     }
 
+    /**
+     * Sets whether whitespace should be trimmed inside of tags. *NOTE* Do not use this if
+     * you expect your XML tags to have names that are the same as cDataTagName as this is unsupported.
+     * cDataTagName should be set to a distinct value in these cases.
+     * @param shouldTrimWhiteSpace boolean to set trimming on or off. Off is default.
+     * @return same instance of configuration with empty tag config updated
+     */
+    public XMLParserConfiguration withShouldTrimWhitespace(boolean shouldTrimWhiteSpace){
+        XMLParserConfiguration clonedConfiguration = this.clone();
+        clonedConfiguration.shouldTrimWhiteSpace = shouldTrimWhiteSpace;
+        return clonedConfiguration;
+    }
+
     public boolean isCloseEmptyTag() {
         return this.closeEmptyTag;
     }
+    public boolean shouldTrimWhiteSpace() {
+        return this.shouldTrimWhiteSpace;
+    }
 }
diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
index 957498c..eb77e64 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/XMLTokener.java
@@ -20,6 +20,8 @@ public class XMLTokener extends JSONTokener {
     */
    public static final java.util.HashMap<String, Character> entity;
 
+   private static XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
+
    static {
        entity = new java.util.HashMap<String, Character>(8);
        entity.put("amp",  XML.AMP);
@@ -45,6 +47,15 @@ public class XMLTokener extends JSONTokener {
         super(s);
     }
 
+    public XMLTokener(Reader r, XMLParserConfiguration configuration) {
+        super(r);
+        XMLTokener.configuration = configuration;
+    }
+    public XMLTokener(String s, XMLParserConfiguration configuration) {
+        super(s);
+        XMLTokener.configuration = configuration;
+    }
+
     /**
      * Get the text in the CDATA block.
      * @return The string up to the <code>]]&gt;</code>.
@@ -83,7 +94,7 @@ public class XMLTokener extends JSONTokener {
         StringBuilder sb;
         do {
             c = next();
-        } while (Character.isWhitespace(c));
+        } while (Character.isWhitespace(c) && configuration.shouldTrimWhiteSpace());
         if (c == 0) {
             return null;
         }
@@ -97,7 +108,9 @@ public class XMLTokener extends JSONTokener {
             }
             if (c == '<') {
                 back();
-                return sb.toString().trim();
+                if (configuration.shouldTrimWhiteSpace()) {
+                    return sb.toString().trim();
+                } else return sb.toString();
             }
             if (c == '&') {
                 sb.append(nextEntity(c));
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index ffdc20c..ba8418c 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -1181,4 +1181,4 @@ public class XMLConfigurationTest {
             assertTrue("Error: " +e.getMessage(), false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index d8aedb3..d305ff4 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1319,6 +1319,80 @@ public class XMLTest {
                 "parameter of the XMLParserConfiguration used");
         }
     }
+    @Test
+    public void testWithWhitespaceTrimmingDisabled() {
+        String originalXml = "<testXml> Test Whitespace String \t </testXml>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false));
+        String expectedJsonString = "{\"testXml\":\" Test Whitespace String \t \"}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+    @Test
+    public void testNestedWithWhitespaceTrimmingDisabled() {
+        String originalXml =
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+                        "<addresses>\n"+
+                        "   <address>\n"+
+                        "      <name> Sherlock Holmes </name>\n"+
+                        "   </address>\n"+
+                        "</addresses>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false));
+        String expectedJsonString = "{\"addresses\":{\"address\":{\"name\":\" Sherlock Holmes \"}}}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+    @Test
+    public void shouldTrimWhitespaceDoesNotSupportTagsEqualingCDataTagName() {
+    // When using withShouldTrimWhitespace = true, input containing tags with same name as cDataTagName is unsupported and should not be used in conjunction
+        String originalXml =
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+                        "<addresses>\n"+
+                        "   <address>\n"+
+                        "      <content> Sherlock Holmes </content>\n"+
+                        "   </address>\n"+
+                        "</addresses>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(false).withcDataTagName("content"));
+        String expectedJsonString = "{\"addresses\":{\"address\":[[\"\\n      \",\" Sherlock Holmes \",\"\\n   \"]]}}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+    @Test
+    public void shouldTrimWhitespaceEnabledDropsTagsEqualingCDataTagNameButValueRemains() {
+        String originalXml =
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+                        "<addresses>\n"+
+                        "   <address>\n"+
+                        "      <content> Sherlock Holmes </content>\n"+
+                        "   </address>\n"+
+                        "</addresses>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(true).withcDataTagName("content"));
+        String expectedJsonString = "{\"addresses\":{\"address\":\"Sherlock Holmes\"}}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+    @Test
+    public void testWithWhitespaceTrimmingEnabled() {
+        String originalXml = "<testXml> Test Whitespace String \t </testXml>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration().withShouldTrimWhitespace(true));
+        String expectedJsonString = "{\"testXml\":\"Test Whitespace String\"}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+    @Test
+    public void testWithWhitespaceTrimmingEnabledByDefault() {
+        String originalXml = "<testXml> Test Whitespace String \t </testXml>";
+
+        JSONObject actualJson = XML.toJSONObject(originalXml, new XMLParserConfiguration());
+        String expectedJsonString = "{\"testXml\":\"Test Whitespace String\"}";
+        JSONObject expectedJson = new JSONObject(expectedJsonString);
+        Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
+    }
+
 }
 
 

From 09f35372d4e00256cba20efd812243fb56d8bef6 Mon Sep 17 00:00:00 2001
From: Keaton Taylor <keatay@amazon.com>
Date: Wed, 22 Nov 2023 11:14:50 +0200
Subject: [PATCH 189/212] Update clone() method so that default constructor
 does not need to be changed

---
 src/main/java/org/json/XMLParserConfiguration.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 5f5a412..9682d03 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -156,14 +156,13 @@ 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, final boolean shouldTrimWhiteSpace) {
+            final int maxNestingDepth, final boolean closeEmptyTag) {
         super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
         this.forceList = Collections.unmodifiableSet(forceList);
         this.closeEmptyTag = closeEmptyTag;
-        this.shouldTrimWhiteSpace = shouldTrimWhiteSpace;
     }
 
     /**
@@ -176,16 +175,17 @@ public class XMLParserConfiguration extends ParserConfiguration {
         // item, a new map instance should be created and if possible each value in the
         // 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 XMLParserConfiguration(
+        final XMLParserConfiguration config = new XMLParserConfiguration(
                 this.keepStrings,
                 this.cDataTagName,
                 this.convertNilAttributeToNull,
                 this.xsiTypeMap,
                 this.forceList,
                 this.maxNestingDepth,
-                this.closeEmptyTag,
-                this.shouldTrimWhiteSpace
+                this.closeEmptyTag
         );
+        config.shouldTrimWhiteSpace = this.shouldTrimWhiteSpace;
+        return config;
     }
 
     /**

From aba82d9cc474c13ee981737432af98c19bb6f5b2 Mon Sep 17 00:00:00 2001
From: Aditya Purohit <adityapurohit27@gmail.com>
Date: Tue, 28 Nov 2023 02:56:10 +0000
Subject: [PATCH 190/212] isNumericChar() - switch comparison order

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

diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
index 30ca74d..c2f16d7 100644
--- a/src/main/java/org/json/NumberConversionUtil.java
+++ b/src/main/java/org/json/NumberConversionUtil.java
@@ -90,7 +90,7 @@ class NumberConversionUtil {
      * @return true if the character is a numeric digit, false otherwise.
      */
     private static boolean isNumericChar(char c) {
-        return (c >= '0' && c <= '9');
+        return (c <= '9' && c >= '0');
     }
 
     /**

From 7cbeb35498798dad51c7d8bd0e904858b1b91074 Mon Sep 17 00:00:00 2001
From: LaFriska <harold.gao205@gmail.com>
Date: Tue, 28 Nov 2023 17:39:46 -0500
Subject: [PATCH 191/212] deleted redundant .toString() call in README test
 method Sysout

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

diff --git a/README.md b/README.md
index 1db1f54..9806f2a 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ import org.json.JSONObject;
 public class Test {
     public static void main(String args[]){
        JSONObject jo = new JSONObject("{ \"abc\" : \"def\" }");
-       System.out.println(jo.toString());
+       System.out.println(jo);
     }
 }
 ```

From e430db40aa316a8525974aa64f9aee107b4a5a28 Mon Sep 17 00:00:00 2001
From: Keaton Taylor <keatay@amazon.com>
Date: Thu, 30 Nov 2023 10:05:08 +0200
Subject: [PATCH 192/212] Update XMLParserConfiguration to not be static and
 add a comment about the use of shouldTrimWhiteSpace

---
 src/main/java/org/json/XMLParserConfiguration.java | 7 +++++++
 src/main/java/org/json/XMLTokener.java             | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 9682d03..b87a308 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -61,6 +61,13 @@ public class XMLParserConfiguration extends ParserConfiguration {
      */
     private Set<String> forceList;
 
+
+    /**
+     * Flag to indicate whether white space should be trimmed when parsing XML.
+     * The default behaviour is to trim white space. When this is set to false, inputting XML
+     * with tags that are the same as the value of cDataTagName is unsupported. It is recommended to set cDataTagName
+     * to a distinct value in this case.
+     */
     private boolean shouldTrimWhiteSpace;
 
     /**
diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
index eb77e64..4b03f97 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/XMLTokener.java
@@ -20,7 +20,7 @@ public class XMLTokener extends JSONTokener {
     */
    public static final java.util.HashMap<String, Character> entity;
 
-   private static XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
+   private XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
 
    static {
        entity = new java.util.HashMap<String, Character>(8);
@@ -49,11 +49,11 @@ public class XMLTokener extends JSONTokener {
 
     public XMLTokener(Reader r, XMLParserConfiguration configuration) {
         super(r);
-        XMLTokener.configuration = configuration;
+        this.configuration = configuration;
     }
     public XMLTokener(String s, XMLParserConfiguration configuration) {
         super(s);
-        XMLTokener.configuration = configuration;
+        this.configuration = configuration;
     }
 
     /**

From 4d6de8c00a99370578e3c591fa0d38801c3adeef Mon Sep 17 00:00:00 2001
From: Keaton Taylor <keatay@amazon.com>
Date: Wed, 13 Dec 2023 14:04:05 +0200
Subject: [PATCH 193/212] Remove unused constructor and add comment above other
 constructor

---
 src/main/java/org/json/XMLTokener.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
index 4b03f97..bc18b31 100644
--- a/src/main/java/org/json/XMLTokener.java
+++ b/src/main/java/org/json/XMLTokener.java
@@ -20,7 +20,7 @@ public class XMLTokener extends JSONTokener {
     */
    public static final java.util.HashMap<String, Character> entity;
 
-   private XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;;
+   private XMLParserConfiguration configuration = XMLParserConfiguration.ORIGINAL;
 
    static {
        entity = new java.util.HashMap<String, Character>(8);
@@ -47,14 +47,15 @@ public class XMLTokener extends JSONTokener {
         super(s);
     }
 
+    /**
+     * Construct an XMLTokener from a Reader and an XMLParserConfiguration.
+     * @param r A source reader.
+     * @param configuration the configuration that can be used to set certain flags
+     */
     public XMLTokener(Reader r, XMLParserConfiguration configuration) {
         super(r);
         this.configuration = configuration;
     }
-    public XMLTokener(String s, XMLParserConfiguration configuration) {
-        super(s);
-        this.configuration = configuration;
-    }
 
     /**
      * Get the text in the CDATA block.

From 6d811607ddf4922a49fb37e3a813e2a59ca809a7 Mon Sep 17 00:00:00 2001
From: sk02241994 <skaradkar57@gmail.com>
Date: Fri, 3 Nov 2023 19:54:23 +0530
Subject: [PATCH 194/212] Resolving issue #743 - Recursive depth issue found in
 JSONObject - Recursive depth issue found in JSONArray

---
 src/main/java/org/json/JSONArray.java         | 29 ++++++++++++++-----
 src/main/java/org/json/JSONObject.java        | 26 +++++++++++++++--
 .../java/org/json/junit/JSONArrayTest.java    | 21 ++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 17 +++++++++++
 4 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index ed7982f..eec7852 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -149,11 +149,18 @@ public class JSONArray implements Iterable<Object> {
      *            A Collection.
      */
     public JSONArray(Collection<?> collection) {
+      this(collection, 0);
+    }
+
+    protected JSONArray(Collection<?> collection, int recursionDepth) {
+        if (recursionDepth > JSONObject.RECURSION_DEPTH_LIMIT) {
+          throw new JSONException("JSONArray has reached recursion depth limit of " + JSONObject.RECURSION_DEPTH_LIMIT);
+        }
         if (collection == null) {
             this.myArrayList = new ArrayList<Object>();
         } else {
             this.myArrayList = new ArrayList<Object>(collection.size());
-            this.addAll(collection, true);
+            this.addAll(collection, true, recursionDepth);
         }
     }
 
@@ -205,7 +212,7 @@ public class JSONArray implements Iterable<Object> {
             throw new JSONException(
                     "JSONArray initial value should be a string or collection or array.");
         }
-        this.addAll(array, true);
+        this.addAll(array, true, 0);
     }
 
     /**
@@ -1779,13 +1786,15 @@ public class JSONArray implements Iterable<Object> {
      * @param wrap
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
+     * @param recursionDepth
+     *            variable to keep the count of how nested the object creation is happening.
      *            
      */
-    private void addAll(Collection<?> collection, boolean wrap) {
+    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth) {
         this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size());
         if (wrap) {
             for (Object o: collection){
-                this.put(JSONObject.wrap(o));
+                this.put(JSONObject.wrap(o, recursionDepth + 1));
             }
         } else {
             for (Object o: collection){
@@ -1815,6 +1824,10 @@ public class JSONArray implements Iterable<Object> {
         }
     }
     
+    private void addAll(Object array, boolean wrap) throws JSONException {
+      this.addAll(array, wrap, 0);
+    }
+
     /**
      * Add an array's elements to the JSONArray.
      *
@@ -1825,19 +1838,21 @@ public class JSONArray implements Iterable<Object> {
      * @param wrap
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
+     * @param recursionDepth
+     *            Variable to keep the count of how nested the object creation is happening.
      *
      * @throws JSONException
      *            If not an array or if an array value is non-finite number.
      * @throws NullPointerException
      *            Thrown if the array parameter is null.
      */
-    private void addAll(Object array, boolean wrap) throws JSONException {
+    private void addAll(Object array, boolean wrap, int recursionDepth) throws JSONException {
         if (array.getClass().isArray()) {
             int length = Array.getLength(array);
             this.myArrayList.ensureCapacity(this.myArrayList.size() + length);
             if (wrap) {
                 for (int i = 0; i < length; i += 1) {
-                    this.put(JSONObject.wrap(Array.get(array, i)));
+                    this.put(JSONObject.wrap(Array.get(array, i), recursionDepth + 1));
                 }
             } else {
                 for (int i = 0; i < length; i += 1) {
@@ -1850,7 +1865,7 @@ public class JSONArray implements Iterable<Object> {
             // JSONArray
             this.myArrayList.addAll(((JSONArray)array).myArrayList);
         } else if (array instanceof Collection) {
-            this.addAll((Collection<?>)array, wrap);
+            this.addAll((Collection<?>)array, wrap, recursionDepth);
         } else if (array instanceof Iterable) {
             this.addAll((Iterable<?>)array, wrap);
         } else {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 7f4885e..72c0ebd 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -147,6 +147,7 @@ public class JSONObject {
      * The map where the JSONObject's properties are kept.
      */
     private final Map<String, Object> map;
+    public static final int RECURSION_DEPTH_LIMIT = 1000;
 
     public Class<? extends Map> getMapType() {
         return map.getClass();
@@ -276,6 +277,17 @@ public class JSONObject {
      *            If a key in the map is <code>null</code>
      */
     public JSONObject(Map<?, ?> m) {
+      this(m, 0);
+    }
+
+    /**
+     * Construct a JSONObject from a map with recursion depth.
+     *
+     */
+    protected JSONObject(Map<?, ?> m, int recursionDepth) {
+        if (recursionDepth > RECURSION_DEPTH_LIMIT) {
+          throw new JSONException("JSONObject has reached recursion depth limit of " + RECURSION_DEPTH_LIMIT);
+        }
         if (m == null) {
             this.map = new HashMap<String, Object>();
         } else {
@@ -287,7 +299,7 @@ public class JSONObject {
                 final Object value = e.getValue();
                 if (value != null) {
                     testValidity(value);
-                    this.map.put(String.valueOf(e.getKey()), wrap(value));
+                    this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1));
                 }
             }
         }
@@ -2566,7 +2578,15 @@ public class JSONObject {
         return wrap(object, null);
     }
 
+    public static Object wrap(Object object, int recursionDepth) {
+      return wrap(object, null, recursionDepth);
+    }
+
     private static Object wrap(Object object, Set<Object> objectsRecord) {
+      return wrap(object, objectsRecord, 0);
+    }
+
+    private static Object wrap(Object object, Set<Object> objectsRecord, int recursionDepth) {
         try {
             if (NULL.equals(object)) {
                 return NULL;
@@ -2584,14 +2604,14 @@ public class JSONObject {
 
             if (object instanceof Collection) {
                 Collection<?> coll = (Collection<?>) object;
-                return new JSONArray(coll);
+                return new JSONArray(coll, recursionDepth);
             }
             if (object.getClass().isArray()) {
                 return new JSONArray(object);
             }
             if (object instanceof Map) {
                 Map<?, ?> map = (Map<?, ?>) object;
-                return new JSONObject(map);
+                return new JSONObject(map, recursionDepth);
             }
             Package objectPackage = object.getClass().getPackage();
             String objectPackageName = objectPackage != null ? objectPackage
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 7b0d52e..44a1d7b 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -1417,4 +1417,25 @@ public class JSONArrayTest {
                 .put(2);
         assertFalse(ja1.similar(ja3));
     }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepth() {
+      HashMap<String, Object> map = new HashMap<>();
+      map.put("t", map);
+      new JSONArray().put(map);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepthAtPosition() {
+      HashMap<String, Object> map = new HashMap<>();
+      map.put("t", map);
+      new JSONArray().put(0, map);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepthArray() {
+      ArrayList<Object> array = new ArrayList<>();
+      array.add(array);
+      new JSONArray(array);
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index d9adbca..dff4503 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3718,4 +3718,21 @@ public class JSONObjectTest {
             assertThrows(JSONException.class, () -> new JSONObject(bean));
         }
     }
+
+    @Test(expected = JSONException.class)
+    public void issue743SerializationMap() {
+      HashMap<String, Object> map = new HashMap<>();
+      map.put("t", map);
+      JSONObject object = new JSONObject(map);
+      String jsonString = object.toString();
+    }
+
+    @Test(expected = JSONException.class)
+    public void testCircularReferenceMultipleLevel() {
+      HashMap<String, Object> inside = new HashMap<>();
+      HashMap<String, Object> jsonObject = new HashMap<>();
+      inside.put("inside", jsonObject);
+      jsonObject.put("test", inside);
+      new JSONObject(jsonObject);
+    }
 }

From dcac3bc18e2acbdf617f3debab234bae857fe5b8 Mon Sep 17 00:00:00 2001
From: sk02241994 <skaradkar57@gmail.com>
Date: Tue, 28 Nov 2023 10:29:30 +0530
Subject: [PATCH 195/212] Adding test case for nested json with depth of 999,
 1000, 1001

---
 .../java/org/json/junit/JSONArrayTest.java    | 52 +++++++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 37 +++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 44a1d7b..5f50fc7 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -1438,4 +1438,56 @@ public class JSONArrayTest {
       array.add(array);
       new JSONArray(array);
     }
+
+    @Test
+    public void testRecursiveDepthAtPosition999Object() {
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(999);
+        new JSONArray().put(0, map);
+    }
+
+    @Test
+    public void testRecursiveDepthAtPosition1000Object() {
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(1000);
+        new JSONArray().put(0, map);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepthAtPosition1001Object() {
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(1001);
+        new JSONArray().put(0, map);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepthArrayLimitedMaps() {
+        ArrayList<Object> array = new ArrayList<>();
+        array.add(array);
+        new JSONArray(array);
+    }
+
+    @Test
+    public void testRecursiveDepthArrayFor999Levels() {
+        ArrayList<Object> array = buildNestedArray(999);
+        new JSONArray(array);
+    }
+
+    @Test
+    public void testRecursiveDepthArrayFor1000Levels() {
+        ArrayList<Object> array = buildNestedArray(1000);
+        new JSONArray(array);
+    }
+
+    @Test(expected = JSONException.class)
+    public void testRecursiveDepthArrayFor1001Levels() {
+        ArrayList<Object> array = buildNestedArray(1001);
+        new JSONArray(array);
+    }
+
+    public static ArrayList<Object> buildNestedArray(int maxDepth) {
+        if (maxDepth <= 0) {
+            return new ArrayList<>();
+        }
+        ArrayList<Object> nestedArray = new ArrayList<>();
+        nestedArray.add(buildNestedArray(maxDepth - 1));
+        return nestedArray;
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index dff4503..e157fd5 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3735,4 +3735,41 @@ public class JSONObjectTest {
       jsonObject.put("test", inside);
       new JSONObject(jsonObject);
     }
+
+    @Test
+    public void issue743SerializationMapWith999Objects() {
+        HashMap<String, Object> map  = buildNestedMap(999);
+        JSONObject object = new JSONObject(map);
+        String jsonString = object.toString();
+    }
+
+    @Test
+    public void issue743SerializationMapWith1000Objects() {
+      HashMap<String, Object> map  = buildNestedMap(1000);
+      JSONObject object = new JSONObject(map);
+      String jsonString = object.toString();
+    }
+
+    @Test(expected = JSONException.class)
+    public void issue743SerializationMapWith1001Objects() {
+        HashMap<String, Object> map  = buildNestedMap(1001);
+        JSONObject object = new JSONObject(map);
+        String jsonString = object.toString();
+    }
+
+    /**
+     * Method to build nested map of max maxDepth
+     *
+     * @param maxDepth
+     * @return
+     */
+    public static HashMap<String, Object> buildNestedMap(int maxDepth) {
+        if (maxDepth <= 0) {
+            return new HashMap<>();
+        }
+        HashMap<String, Object> nestedMap = new HashMap<>();
+        nestedMap.put("t", buildNestedMap(maxDepth - 1));
+        return nestedMap;
+    }
+
 }

From abea194120cbfe684444a9012aac70fafaef5cfa Mon Sep 17 00:00:00 2001
From: sk02241994 <skaradkar57@gmail.com>
Date: Fri, 22 Dec 2023 15:44:33 +0530
Subject: [PATCH 196/212] Adding JSONParserConfiguration for configuring the
 depth of nested maps

---
 src/main/java/org/json/JSONArray.java         | 69 +++++++++++++++----
 src/main/java/org/json/JSONObject.java        | 27 ++++----
 .../org/json/JSONParserConfiguration.java     | 29 ++++++++
 .../java/org/json/junit/JSONArrayTest.java    | 16 +++--
 .../java/org/json/junit/JSONObjectTest.java   |  8 ++-
 5 files changed, 115 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/org/json/JSONParserConfiguration.java

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index eec7852..6e19a54 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -149,18 +149,22 @@ public class JSONArray implements Iterable<Object> {
      *            A Collection.
      */
     public JSONArray(Collection<?> collection) {
-      this(collection, 0);
+      this(collection, 0, new JSONParserConfiguration());
     }
 
-    protected JSONArray(Collection<?> collection, int recursionDepth) {
-        if (recursionDepth > JSONObject.RECURSION_DEPTH_LIMIT) {
-          throw new JSONException("JSONArray has reached recursion depth limit of " + JSONObject.RECURSION_DEPTH_LIMIT);
+    public JSONArray(Collection<?> collection, JSONParserConfiguration jsonParserConfiguration) {
+        this(collection, 0, jsonParserConfiguration);
+    }
+
+    protected JSONArray(Collection<?> collection, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+        if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
+          throw new JSONException("JSONArray has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
         }
         if (collection == null) {
             this.myArrayList = new ArrayList<Object>();
         } else {
             this.myArrayList = new ArrayList<Object>(collection.size());
-            this.addAll(collection, true, recursionDepth);
+            this.addAll(collection, true, recursionDepth, jsonParserConfiguration);
         }
     }
 
@@ -1345,7 +1349,27 @@ public class JSONArray implements Iterable<Object> {
      *             If a key in the map is <code>null</code>
      */
     public JSONArray put(int index, Map<?, ?> value) throws JSONException {
-        this.put(index, new JSONObject(value));
+        this.put(index, new JSONObject(value, new JSONParserConfiguration()));
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONObject that
+     * is produced from a Map.
+     *
+     * @param index
+     *          The subscript
+     * @param value
+     *          The Map value.
+     * @param jsonParserConfiguration
+     *          Configuration for recursive depth
+     * @return
+     * @throws JSONException
+     *          If the index is negative or if the value is an invalid
+     *          number.
+     */
+    public JSONArray put(int index, Map<?, ?> value, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        this.put(index, new JSONObject(value, jsonParserConfiguration));
         return this;
     }
 
@@ -1790,11 +1814,11 @@ public class JSONArray implements Iterable<Object> {
      *            variable to keep the count of how nested the object creation is happening.
      *            
      */
-    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth) {
+    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size());
         if (wrap) {
             for (Object o: collection){
-                this.put(JSONObject.wrap(o, recursionDepth + 1));
+                this.put(JSONObject.wrap(o, recursionDepth + 1, jsonParserConfiguration));
             }
         } else {
             for (Object o: collection){
@@ -1823,7 +1847,14 @@ public class JSONArray implements Iterable<Object> {
             }
         }
     }
-    
+
+    /**
+     * Add an array's elements to the JSONArray.
+     *
+     * @param array
+     * @param wrap
+     * @throws JSONException
+     */
     private void addAll(Object array, boolean wrap) throws JSONException {
       this.addAll(array, wrap, 0);
     }
@@ -1836,23 +1867,37 @@ public class JSONArray implements Iterable<Object> {
      *            JSONArray, Collection, or Iterable, an exception will be
      *            thrown.
      * @param wrap
+     * @param recursionDepth
+     */
+    private void addAll(Object array, boolean wrap, int recursionDepth) {
+        addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
+    }
+    /**
+     * Add an array's elements to the JSONArray.
+     *`
+     * @param array
+     *            Array. If the parameter passed is null, or not an array,
+     *            JSONArray, Collection, or Iterable, an exception will be
+     *            thrown.
+     * @param wrap
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
      * @param recursionDepth
      *            Variable to keep the count of how nested the object creation is happening.
-     *
+     * @param recursionDepth
+     *            Variable to pass parser custom configuration for json parsing.
      * @throws JSONException
      *            If not an array or if an array value is non-finite number.
      * @throws NullPointerException
      *            Thrown if the array parameter is null.
      */
-    private void addAll(Object array, boolean wrap, int recursionDepth) throws JSONException {
+    private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         if (array.getClass().isArray()) {
             int length = Array.getLength(array);
             this.myArrayList.ensureCapacity(this.myArrayList.size() + length);
             if (wrap) {
                 for (int i = 0; i < length; i += 1) {
-                    this.put(JSONObject.wrap(Array.get(array, i), recursionDepth + 1));
+                    this.put(JSONObject.wrap(Array.get(array, i), recursionDepth + 1, jsonParserConfiguration));
                 }
             } else {
                 for (int i = 0; i < length; i += 1) {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 72c0ebd..18721f7 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -147,7 +147,6 @@ public class JSONObject {
      * The map where the JSONObject's properties are kept.
      */
     private final Map<String, Object> map;
-    public static final int RECURSION_DEPTH_LIMIT = 1000;
 
     public Class<? extends Map> getMapType() {
         return map.getClass();
@@ -277,16 +276,20 @@ public class JSONObject {
      *            If a key in the map is <code>null</code>
      */
     public JSONObject(Map<?, ?> m) {
-      this(m, 0);
+      this(m, 0, new JSONParserConfiguration());
+    }
+
+    public JSONObject(Map<?, ?> m, JSONParserConfiguration jsonParserConfiguration) {
+        this(m, 0, jsonParserConfiguration);
     }
 
     /**
      * Construct a JSONObject from a map with recursion depth.
      *
      */
-    protected JSONObject(Map<?, ?> m, int recursionDepth) {
-        if (recursionDepth > RECURSION_DEPTH_LIMIT) {
-          throw new JSONException("JSONObject has reached recursion depth limit of " + RECURSION_DEPTH_LIMIT);
+    protected JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+        if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
+          throw new JSONException("JSONObject has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
         }
         if (m == null) {
             this.map = new HashMap<String, Object>();
@@ -299,7 +302,7 @@ public class JSONObject {
                 final Object value = e.getValue();
                 if (value != null) {
                     testValidity(value);
-                    this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1));
+                    this.map.put(String.valueOf(e.getKey()), wrap(value, recursionDepth + 1, jsonParserConfiguration));
                 }
             }
         }
@@ -2578,15 +2581,15 @@ public class JSONObject {
         return wrap(object, null);
     }
 
-    public static Object wrap(Object object, int recursionDepth) {
-      return wrap(object, null, recursionDepth);
+    public static Object wrap(Object object, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+      return wrap(object, null, recursionDepth, jsonParserConfiguration);
     }
 
     private static Object wrap(Object object, Set<Object> objectsRecord) {
-      return wrap(object, objectsRecord, 0);
+      return wrap(object, objectsRecord, 0, new JSONParserConfiguration());
     }
 
-    private static Object wrap(Object object, Set<Object> objectsRecord, int recursionDepth) {
+    private static Object wrap(Object object, Set<Object> objectsRecord, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         try {
             if (NULL.equals(object)) {
                 return NULL;
@@ -2604,14 +2607,14 @@ public class JSONObject {
 
             if (object instanceof Collection) {
                 Collection<?> coll = (Collection<?>) object;
-                return new JSONArray(coll, recursionDepth);
+                return new JSONArray(coll, recursionDepth, jsonParserConfiguration);
             }
             if (object.getClass().isArray()) {
                 return new JSONArray(object);
             }
             if (object instanceof Map) {
                 Map<?, ?> map = (Map<?, ?>) object;
-                return new JSONObject(map, recursionDepth);
+                return new JSONObject(map, recursionDepth, jsonParserConfiguration);
             }
             Package objectPackage = object.getClass().getPackage();
             String objectPackageName = objectPackage != null ? objectPackage
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
new file mode 100644
index 0000000..910d1cf
--- /dev/null
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -0,0 +1,29 @@
+package org.json;
+
+/**
+ * Configuration object for the JSON parser. The configuration is immutable.
+ */
+public class JSONParserConfiguration extends ParserConfiguration {
+
+  /**
+   * We can override the default maximum nesting depth if needed.
+   */
+  public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH;
+
+  /**
+   * Configuration with the default values.
+   */
+  public JSONParserConfiguration() {
+    this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+  }
+
+  public JSONParserConfiguration(int maxNestingDepth) {
+    this.maxNestingDepth = maxNestingDepth;
+  }
+
+  @Override
+  protected JSONParserConfiguration clone() {
+    return new JSONParserConfiguration(DEFAULT_MAXIMUM_NESTING_DEPTH);
+  }
+
+}
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 5f50fc7..349422d 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
 import org.json.JSONPointerException;
 import org.json.JSONString;
 import org.json.JSONTokener;
@@ -1440,15 +1441,15 @@ public class JSONArrayTest {
     }
 
     @Test
-    public void testRecursiveDepthAtPosition999Object() {
-        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(999);
+    public void testRecursiveDepthAtPositionDefaultObject() {
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         new JSONArray().put(0, map);
     }
 
     @Test
     public void testRecursiveDepthAtPosition1000Object() {
         HashMap<String, Object> map = JSONObjectTest.buildNestedMap(1000);
-        new JSONArray().put(0, map);
+        new JSONArray().put(0, map, new JSONParserConfiguration(1000));
     }
 
     @Test(expected = JSONException.class)
@@ -1465,15 +1466,16 @@ public class JSONArrayTest {
     }
 
     @Test
-    public void testRecursiveDepthArrayFor999Levels() {
-        ArrayList<Object> array = buildNestedArray(999);
-        new JSONArray(array);
+    public void testRecursiveDepthArrayForDefaultLevels() {
+        ArrayList<Object> array = buildNestedArray(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        new JSONArray(array, new JSONParserConfiguration());
     }
 
     @Test
     public void testRecursiveDepthArrayFor1000Levels() {
         ArrayList<Object> array = buildNestedArray(1000);
-        new JSONArray(array);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+        new JSONArray(array, parserConfiguration);
     }
 
     @Test(expected = JSONException.class)
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index e157fd5..1a911d8 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -32,6 +32,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONParserConfiguration;
 import org.json.JSONString;
 import org.json.JSONTokener;
 import org.json.XML;
@@ -3737,8 +3738,8 @@ public class JSONObjectTest {
     }
 
     @Test
-    public void issue743SerializationMapWith999Objects() {
-        HashMap<String, Object> map  = buildNestedMap(999);
+    public void issue743SerializationMapWith512Objects() {
+        HashMap<String, Object> map  = buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         JSONObject object = new JSONObject(map);
         String jsonString = object.toString();
     }
@@ -3746,7 +3747,8 @@ public class JSONObjectTest {
     @Test
     public void issue743SerializationMapWith1000Objects() {
       HashMap<String, Object> map  = buildNestedMap(1000);
-      JSONObject object = new JSONObject(map);
+      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+      JSONObject object = new JSONObject(map, parserConfiguration);
       String jsonString = object.toString();
     }
 

From ffd48afa42f014dfbd48f86c3cef96ccc4e6c7df Mon Sep 17 00:00:00 2001
From: sk02241994 <skaradkar57@gmail.com>
Date: Sat, 23 Dec 2023 10:53:54 +0530
Subject: [PATCH 197/212] Review comments

---
 .../java/org/json/JSONParserConfiguration.java | 18 +++++++-----------
 .../java/org/json/junit/JSONArrayTest.java     |  9 +++++----
 .../java/org/json/junit/JSONObjectTest.java    |  5 +++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 910d1cf..1ec1710 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -5,25 +5,21 @@ package org.json;
  */
 public class JSONParserConfiguration extends ParserConfiguration {
 
-  /**
-   * We can override the default maximum nesting depth if needed.
-   */
-  public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH;
-
   /**
    * Configuration with the default values.
    */
   public JSONParserConfiguration() {
-    this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
-  }
-
-  public JSONParserConfiguration(int maxNestingDepth) {
-    this.maxNestingDepth = maxNestingDepth;
+    super();
   }
 
   @Override
   protected JSONParserConfiguration clone() {
-    return new JSONParserConfiguration(DEFAULT_MAXIMUM_NESTING_DEPTH);
+    return new JSONParserConfiguration();
+  }
+
+  @Override
+  public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
+    return super.withMaxNestingDepth(maxNestingDepth);
   }
 
 }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 349422d..fd01379 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -32,6 +32,7 @@ import org.json.JSONParserConfiguration;
 import org.json.JSONPointerException;
 import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.ParserConfiguration;
 import org.json.junit.data.MyJsonString;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -1442,14 +1443,14 @@ public class JSONArrayTest {
 
     @Test
     public void testRecursiveDepthAtPositionDefaultObject() {
-        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         new JSONArray().put(0, map);
     }
 
     @Test
     public void testRecursiveDepthAtPosition1000Object() {
         HashMap<String, Object> map = JSONObjectTest.buildNestedMap(1000);
-        new JSONArray().put(0, map, new JSONParserConfiguration(1000));
+        new JSONArray().put(0, map, new JSONParserConfiguration().withMaxNestingDepth(1000));
     }
 
     @Test(expected = JSONException.class)
@@ -1467,14 +1468,14 @@ public class JSONArrayTest {
 
     @Test
     public void testRecursiveDepthArrayForDefaultLevels() {
-        ArrayList<Object> array = buildNestedArray(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        ArrayList<Object> array = buildNestedArray(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         new JSONArray(array, new JSONParserConfiguration());
     }
 
     @Test
     public void testRecursiveDepthArrayFor1000Levels() {
         ArrayList<Object> array = buildNestedArray(1000);
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
         new JSONArray(array, parserConfiguration);
     }
 
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 1a911d8..96f3673 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -35,6 +35,7 @@ import org.json.JSONPointerException;
 import org.json.JSONParserConfiguration;
 import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.ParserConfiguration;
 import org.json.XML;
 import org.json.junit.data.BrokenToString;
 import org.json.junit.data.ExceptionalBean;
@@ -3739,7 +3740,7 @@ public class JSONObjectTest {
 
     @Test
     public void issue743SerializationMapWith512Objects() {
-        HashMap<String, Object> map  = buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        HashMap<String, Object> map  = buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         JSONObject object = new JSONObject(map);
         String jsonString = object.toString();
     }
@@ -3747,7 +3748,7 @@ public class JSONObjectTest {
     @Test
     public void issue743SerializationMapWith1000Objects() {
       HashMap<String, Object> map  = buildNestedMap(1000);
-      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
       JSONObject object = new JSONObject(map, parserConfiguration);
       String jsonString = object.toString();
     }

From 7701f2183966dd4f1efad1b762b47a89009e60ad Mon Sep 17 00:00:00 2001
From: sk02241994 <skaradkar57@gmail.com>
Date: Sun, 24 Dec 2023 11:02:47 +0530
Subject: [PATCH 198/212] Adding comments

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

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 6e19a54..50146a8 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -152,11 +152,29 @@ public class JSONArray implements Iterable<Object> {
       this(collection, 0, new JSONParserConfiguration());
     }
 
+    /**
+     * Construct a JSONArray from a Collection.
+     *
+     * @param collection
+     *            A Collection.
+     * @param jsonParserConfiguration
+     *            Configuration object for the JSON parser
+     */
     public JSONArray(Collection<?> collection, JSONParserConfiguration jsonParserConfiguration) {
         this(collection, 0, jsonParserConfiguration);
     }
 
-    protected JSONArray(Collection<?> collection, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+    /**
+     * Construct a JSONArray from a collection with recursion depth.
+     *
+     * @param collection
+     *             A Collection.
+     * @param recursionDepth
+     *             Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
+     *             Configuration object for the JSON parser
+     */
+    JSONArray(Collection<?> collection, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
           throw new JSONException("JSONArray has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
         }
@@ -1362,7 +1380,7 @@ public class JSONArray implements Iterable<Object> {
      * @param value
      *          The Map value.
      * @param jsonParserConfiguration
-     *          Configuration for recursive depth
+     *          Configuration object for the JSON parser
      * @return
      * @throws JSONException
      *          If the index is negative or if the value is an invalid
@@ -1811,8 +1829,7 @@ public class JSONArray implements Iterable<Object> {
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
      * @param recursionDepth
-     *            variable to keep the count of how nested the object creation is happening.
-     *            
+     *            Variable for tracking the count of nested object creations.
      */
     private void addAll(Collection<?> collection, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size());
@@ -1852,8 +1869,14 @@ public class JSONArray implements Iterable<Object> {
      * Add an array's elements to the JSONArray.
      *
      * @param array
+     *          Array. If the parameter passed is null, or not an array,
+     *          JSONArray, Collection, or Iterable, an exception will be
+     *          thrown.
      * @param wrap
+     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
+     *          {@code false} to add the items directly
      * @throws JSONException
+     *          If not an array or if an array value is non-finite number.
      */
     private void addAll(Object array, boolean wrap) throws JSONException {
       this.addAll(array, wrap, 0);
@@ -1867,7 +1890,10 @@ public class JSONArray implements Iterable<Object> {
      *            JSONArray, Collection, or Iterable, an exception will be
      *            thrown.
      * @param wrap
+     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
+     *          {@code false} to add the items directly
      * @param recursionDepth
+     *          Variable for tracking the count of nested object creations.
      */
     private void addAll(Object array, boolean wrap, int recursionDepth) {
         addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
@@ -1883,8 +1909,8 @@ public class JSONArray implements Iterable<Object> {
      *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
      *            {@code false} to add the items directly
      * @param recursionDepth
-     *            Variable to keep the count of how nested the object creation is happening.
-     * @param recursionDepth
+     *            Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
      *            Variable to pass parser custom configuration for json parsing.
      * @throws JSONException
      *            If not an array or if an array value is non-finite number.
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 18721f7..4bd032b 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -279,6 +279,15 @@ public class JSONObject {
       this(m, 0, new JSONParserConfiguration());
     }
 
+    /**
+     * Construct a JSONObject from a Map with custom json parse configurations.
+     *
+     * @param m
+     *            A map object that can be used to initialize the contents of
+     *            the JSONObject.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     */
     public JSONObject(Map<?, ?> m, JSONParserConfiguration jsonParserConfiguration) {
         this(m, 0, jsonParserConfiguration);
     }
@@ -287,7 +296,7 @@ public class JSONObject {
      * Construct a JSONObject from a map with recursion depth.
      *
      */
-    protected JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+    private JSONObject(Map<?, ?> m, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
           throw new JSONException("JSONObject has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
         }
@@ -2581,7 +2590,23 @@ public class JSONObject {
         return wrap(object, null);
     }
 
-    public static Object wrap(Object object, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+    /**
+     * Wrap an object, if necessary. If the object is <code>null</code>, return the NULL
+     * object. If it is an array or collection, wrap it in a JSONArray. If it is
+     * a map, wrap it in a JSONObject. If it is a standard property (Double,
+     * String, et al) then it is already wrapped. Otherwise, if it comes from
+     * one of the java packages, turn it into a string. And if it doesn't, try
+     * to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     *
+     * @param object
+     *            The object to wrap
+     * @param recursionDepth
+     *            Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration
+     *            Variable to pass parser custom configuration for json parsing.
+     * @return The wrapped value
+     */
+    static Object wrap(Object object, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
       return wrap(object, null, recursionDepth, jsonParserConfiguration);
     }
 

From 23ac2e7bcaf6ec2c62d7e21d8d4254feaf56bbff Mon Sep 17 00:00:00 2001
From: Thomas Gress <thomas@gress.at>
Date: Fri, 29 Dec 2023 12:28:24 +0100
Subject: [PATCH 199/212] improved annotation search performance

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

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 4bd032b..039f136 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -1865,6 +1865,10 @@ public class JSONObject {
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return null;
+
         try {
             return getAnnotation(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),
@@ -1919,6 +1923,10 @@ public class JSONObject {
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return -1;
+
         try {
             int d = getAnnotationDepth(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),

From 5ddb8c3d351c155250891968dfc4a1e8442ae14f Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Sat, 30 Dec 2023 16:30:19 -0600
Subject: [PATCH 200/212] cleanup-and-merge-tests: fix warnings, set gradlew
 permissions, enable unchecked warnings in maven

---
 gradlew                                               | 0
 pom.xml                                               | 3 +++
 src/main/java/org/json/JSONArray.java                 | 5 +++--
 src/main/java/org/json/JSONMLParserConfiguration.java | 2 ++
 src/main/java/org/json/JSONParserConfiguration.java   | 1 +
 src/main/java/org/json/ParserConfiguration.java       | 2 ++
 src/main/java/org/json/XMLParserConfiguration.java    | 4 +++-
 src/test/java/org/json/junit/data/WeirdList.java      | 6 +++---
 8 files changed, 17 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 927a989..d01283c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,9 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <compilerArgs>
+                        <arg>-Xlint:unchecked</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 50146a8..38b0b31 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1359,7 +1359,8 @@ public class JSONArray implements Iterable<Object> {
      *            The subscript.
      * @param value
      *            The Map value.
-     * @return this.
+     * @return
+     *             reference to self
      * @throws JSONException
      *             If the index is negative or if the value is an invalid
      *             number.
@@ -1381,7 +1382,7 @@ public class JSONArray implements Iterable<Object> {
      *          The Map value.
      * @param jsonParserConfiguration
      *          Configuration object for the JSON parser
-     * @return
+     * @return reference to self
      * @throws JSONException
      *          If the index is negative or if the value is an invalid
      *          number.
diff --git a/src/main/java/org/json/JSONMLParserConfiguration.java b/src/main/java/org/json/JSONMLParserConfiguration.java
index b2514ab..43ba0db 100644
--- a/src/main/java/org/json/JSONMLParserConfiguration.java
+++ b/src/main/java/org/json/JSONMLParserConfiguration.java
@@ -55,11 +55,13 @@ public class JSONMLParserConfiguration extends ParserConfiguration {
         );
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public JSONMLParserConfiguration withKeepStrings(final boolean newVal) {
         return super.withKeepStrings(newVal);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public JSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
         return super.withMaxNestingDepth(maxNestingDepth);
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
index 1ec1710..f95e244 100644
--- a/src/main/java/org/json/JSONParserConfiguration.java
+++ b/src/main/java/org/json/JSONParserConfiguration.java
@@ -17,6 +17,7 @@ public class JSONParserConfiguration extends ParserConfiguration {
     return new JSONParserConfiguration();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
     return super.withMaxNestingDepth(maxNestingDepth);
diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/ParserConfiguration.java
index 36fa508..ede2fc5 100644
--- a/src/main/java/org/json/ParserConfiguration.java
+++ b/src/main/java/org/json/ParserConfiguration.java
@@ -75,6 +75,7 @@ public class ParserConfiguration {
      * 
      * @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();
         newConfig.keepStrings = newVal;
@@ -101,6 +102,7 @@ public class ParserConfiguration {
      * 
      * @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();
 
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 2e4907f..0ac7834 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -192,6 +192,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
      *
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
+    @SuppressWarnings("unchecked")
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
         return super.withKeepStrings(newVal);
@@ -309,6 +310,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
      * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
      * @return The existing configuration will not be modified. A new configuration is returned.
      */
+    @SuppressWarnings("unchecked")
     @Override
     public XMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
         return super.withMaxNestingDepth(maxNestingDepth);
@@ -316,7 +318,7 @@ public class XMLParserConfiguration extends ParserConfiguration {
 
     /**
      * To enable explicit end tag with empty value.
-     * @param closeEmptyTag
+     * @param closeEmptyTag new value for the closeEmptyTag property
      * @return same instance of configuration with empty tag config updated
      */
     public XMLParserConfiguration withCloseEmptyTag(boolean closeEmptyTag){
diff --git a/src/test/java/org/json/junit/data/WeirdList.java b/src/test/java/org/json/junit/data/WeirdList.java
index 834b81e..3560586 100644
--- a/src/test/java/org/json/junit/data/WeirdList.java
+++ b/src/test/java/org/json/junit/data/WeirdList.java
@@ -12,7 +12,7 @@ import java.util.List;
  */
 public class WeirdList {
     /** */
-    private final List<Integer> list = new ArrayList();
+    private final List<Integer> list = new ArrayList<>();
 
     /**
      * @param vals
@@ -25,14 +25,14 @@ public class WeirdList {
      * @return a copy of the list
      */
     public List<Integer> get() {
-        return new ArrayList(this.list);
+        return new ArrayList<>(this.list);
     }
 
     /**
      * @return a copy of the list
      */
     public List<Integer> getALL() {
-        return new ArrayList(this.list);
+        return new ArrayList<>(this.list);
     }
 
     /**

From 86bb0a1a02d49d2d1799153a45f7b8bcf2ed7015 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Sat, 30 Dec 2023 17:00:02 -0600
Subject: [PATCH 201/212] cleanup-and-merge-tests: pull in unit tests from #809

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

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 96f3673..053f17a 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3760,6 +3760,48 @@ public class JSONObjectTest {
         String jsonString = object.toString();
     }
 
+    @Test(expected = JSONException.class)
+    public void testCircleReferenceFirstLevel() {
+        Map<Object, Object> jsonObject = new HashMap<>();
+
+        jsonObject.put("test", jsonObject);
+
+        new JSONObject(jsonObject, new JSONParserConfiguration());
+    }
+
+    @Test(expected = StackOverflowError.class)
+    public void testCircleReferenceMultiplyLevel_notConfigured_expectedStackOverflow() {
+        Map<Object, Object> inside = new HashMap<>();
+
+        Map<Object, Object> jsonObject = new HashMap<>();
+        inside.put("test", jsonObject);
+        jsonObject.put("test", inside);
+
+        new JSONObject(jsonObject, new JSONParserConfiguration().withMaxNestingDepth(99999));
+    }
+
+    @Test(expected = JSONException.class)
+    public void testCircleReferenceMultiplyLevel_configured_expectedJSONException() {
+        Map<Object, Object> inside = new HashMap<>();
+
+        Map<Object, Object> jsonObject = new HashMap<>();
+        inside.put("test", jsonObject);
+        jsonObject.put("test", inside);
+
+        new JSONObject(jsonObject, new JSONParserConfiguration());
+    }
+
+    @Test
+    public void testDifferentKeySameInstanceNotACircleReference() {
+        Map<Object, Object> map1 = new HashMap<>();
+        Map<Object, Object> map2 = new HashMap<>();
+
+        map1.put("test1", map2);
+        map1.put("test2", map2);
+
+        new JSONObject(map1);
+    }
+
     /**
      * Method to build nested map of max maxDepth
      *

From 19dec1bb5fcff839d606edd5cf0d5d2059bce626 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Fri, 2 Feb 2024 13:11:37 -0600
Subject: [PATCH 202/212] Fixing JSONArrayTest
 testRecursiveDepthArrayFor1000Levels()

---
 .../java/org/json/junit/JSONArrayTest.java    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index fd01379..fcaa8ce 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -1474,9 +1474,23 @@ public class JSONArrayTest {
 
     @Test
     public void testRecursiveDepthArrayFor1000Levels() {
-        ArrayList<Object> array = buildNestedArray(1000);
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
-        new JSONArray(array, parserConfiguration);
+        try {
+            ArrayList<Object> array = buildNestedArray(1000);
+            JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
+            new JSONArray(array, parserConfiguration);
+        } catch (StackOverflowError e) {
+            String javaVersion = System.getProperty("java.version");
+            if (javaVersion.startsWith("11.")) {
+                System.out.println(
+                        "testRecursiveDepthArrayFor1000Levels() allowing intermittent stackoverflow, Java Version: "
+                                + javaVersion);
+            } else {
+                String errorStr = "testRecursiveDepthArrayFor1000Levels() unexpected stackoverflow, Java Version: "
+                        + javaVersion;
+                System.out.println(errorStr);
+                throw new RuntimeException(errorStr);
+            }
+        }
     }
 
     @Test(expected = JSONException.class)

From 4548696c8dc5d05a11c840ed224ab0dc3b037ed8 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 5 Feb 2024 20:22:23 -0600
Subject: [PATCH 203/212] Update README.md for release 20240205

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9806f2a..6d17373 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ JSON in Java [package org.json]
 [![Java CI with Maven](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/pipeline.yml)
 [![CodeQL](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stleary/JSON-java/actions/workflows/codeql-analysis.yml)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20231013/json-20231013.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20240205/json-20240205.jar)**
 
 
 # Overview
@@ -26,7 +26,7 @@ Project goals include:
 * No external dependencies
 * Fast execution and low memory footprint
 * Maintain backward compatibility
-* Designed and tested to use on Java versions 1.8 - 21
+* Designed and tested to use on Java versions 1.6 - 21
 
 
 The files in this package implement JSON encoders and decoders. The package can also convert between JSON and XML, HTTP headers, Cookies, and CDL.

From 9865dbbebebea5d7e7018907ead0ad508cc6c4f8 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 5 Feb 2024 20:23:59 -0600
Subject: [PATCH 204/212] Update pom.xml for release 20240205

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d01283c..7196978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20231013</version>
+    <version>20240205</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From 010e83b925642a654bd02a90fdddc26222e425f0 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Mon, 5 Feb 2024 20:44:18 -0600
Subject: [PATCH 205/212] Update RELEASES.md for release 20240205

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 2b8aaa2..3308e6e 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20240205    Recent commits.
+
 20231013    First release with minimum Java version 1.8. Recent commits, including fixes for CVE-2023-5072.
 
 20230618    Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.

From 99c84fdf3a7f4218734a3b2e4b1e36d5ecb60601 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Fri, 2 Feb 2024 09:07:48 +0200
Subject: [PATCH 206/212] Enhanced documentation for Java classes

---
 pom.xml                                            |  3 +++
 src/main/java/org/json/JSONObject.java             | 14 +++++++++++++-
 src/main/java/org/json/JSONPointer.java            |  6 ++++++
 src/main/java/org/json/JSONPointerException.java   | 11 +++++++++++
 src/main/java/org/json/JSONTokener.java            |  5 +++++
 src/main/java/org/json/ParserConfiguration.java    |  9 +++++++++
 src/main/java/org/json/XML.java                    |  3 +++
 src/main/java/org/json/XMLParserConfiguration.java | 11 +++++++++++
 src/main/java/org/json/XMLXsiTypeConverter.java    |  7 +++++++
 9 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7196978..1488f49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.5.0</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 039f136..4c08b0b 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -148,6 +148,11 @@ public class JSONObject {
      */
     private final Map<String, Object> map;
 
+    /**
+     * Retrieves the type of the underlying Map in this class.
+     *
+     * @return The class object representing the type of the underlying Map.
+     */
     public Class<? extends Map> getMapType() {
         return map.getClass();
     }
@@ -369,7 +374,6 @@ public class JSONObject {
      * &#64;JSONPropertyIgnore
      * public String getName() { return this.name; }
      * </pre>
-     * <p>
      *
      * @param bean
      *            An object that has getter methods that should be used to make
@@ -2232,6 +2236,14 @@ public class JSONObject {
         }
     }
 
+    /**
+     * Quotes a string and appends the result to a given Writer.
+     *
+     * @param string The input string to be quoted.
+     * @param w      The Writer to which the quoted string will be appended.
+     * @return The same Writer instance after appending the quoted string.
+     * @throws IOException If an I/O error occurs while writing to the Writer.
+     */
     public static Writer quote(String string, Writer w) throws IOException {
         if (string == null || string.isEmpty()) {
             w.write("\"\"");
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index 963fdec..91bd137 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -163,6 +163,12 @@ public class JSONPointer {
         //}
     }
 
+    /**
+     * Constructs a new JSONPointer instance with the provided list of reference tokens.
+     *
+     * @param refTokens A list of strings representing the reference tokens for the JSON Pointer.
+     *                  Each token identifies a step in the path to the targeted value.
+     */
     public JSONPointer(List<String> refTokens) {
         this.refTokens = new ArrayList<String>(refTokens);
     }
diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/org/json/JSONPointerException.java
index a0e128c..dc5a25a 100644
--- a/src/main/java/org/json/JSONPointerException.java
+++ b/src/main/java/org/json/JSONPointerException.java
@@ -14,10 +14,21 @@ Public Domain.
 public class JSONPointerException extends JSONException {
     private static final long serialVersionUID = 8872944667561856751L;
 
+    /**
+     * Constructs a new JSONPointerException with the specified error message.
+     *
+     * @param message The detail message describing the reason for the exception.
+     */
     public JSONPointerException(String message) {
         super(message);
     }
 
+    /**
+     * Constructs a new JSONPointerException with the specified error message and cause.
+     *
+     * @param message The detail message describing the reason for the exception.
+     * @param cause   The cause of the exception.
+     */
     public JSONPointerException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 4a83a69..0bc6dfb 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -525,6 +525,11 @@ public class JSONTokener {
                 this.line + "]";
     }
 
+    /**
+     * Closes the underlying reader, releasing any resources associated with it.
+     *
+     * @throws IOException If an I/O error occurs while closing the reader.
+     */
     public void close() throws IOException {
         if(reader!=null){
             reader.close();
diff --git a/src/main/java/org/json/ParserConfiguration.java b/src/main/java/org/json/ParserConfiguration.java
index ede2fc5..5cdc10d 100644
--- a/src/main/java/org/json/ParserConfiguration.java
+++ b/src/main/java/org/json/ParserConfiguration.java
@@ -29,11 +29,20 @@ public class ParserConfiguration {
      */
     protected int maxNestingDepth;
 
+    /**
+     * Constructs a new ParserConfiguration with default settings.
+     */
     public ParserConfiguration() {
         this.keepStrings = false;
         this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
     }
 
+    /**
+     * Constructs a new ParserConfiguration with the specified settings.
+     *
+     * @param keepStrings     A boolean indicating whether to preserve strings during parsing.
+     * @param maxNestingDepth An integer representing the maximum allowed nesting depth.
+     */
     protected ParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
         this.keepStrings = keepStrings;
         this.maxNestingDepth = maxNestingDepth;
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 9d42bb3..301c8ba 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -56,6 +56,9 @@ public class XML {
      */
     public static final String NULL_ATTR = "xsi:nil";
 
+    /**
+     * Represents the XML attribute name for specifying type information.
+     */
     public static final String TYPE_ATTR = "xsi:type";
 
     /**
diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java
index 5087aa1..bc4a800 100644
--- a/src/main/java/org/json/XMLParserConfiguration.java
+++ b/src/main/java/org/json/XMLParserConfiguration.java
@@ -352,9 +352,20 @@ public class XMLParserConfiguration extends ParserConfiguration {
         return clonedConfiguration;
     }
 
+    /**
+     * Checks if the parser should automatically close empty XML tags.
+     *
+     * @return {@code true} if empty XML tags should be automatically closed, {@code false} otherwise.
+     */
     public boolean isCloseEmptyTag() {
         return this.closeEmptyTag;
     }
+
+    /**
+     * Checks if the parser should trim white spaces from XML content.
+     *
+     * @return {@code true} if white spaces should be trimmed, {@code false} otherwise.
+     */
     public boolean shouldTrimWhiteSpace() {
         return this.shouldTrimWhiteSpace;
     }
diff --git a/src/main/java/org/json/XMLXsiTypeConverter.java b/src/main/java/org/json/XMLXsiTypeConverter.java
index 0011eff..ea6739d 100644
--- a/src/main/java/org/json/XMLXsiTypeConverter.java
+++ b/src/main/java/org/json/XMLXsiTypeConverter.java
@@ -42,5 +42,12 @@ Public Domain.
  * @param <T> return type of convert method
  */
 public interface XMLXsiTypeConverter<T> {
+
+    /**
+     * Converts an XML xsi:type attribute value to the specified type {@code T}.
+     *
+     * @param value The string representation of the XML xsi:type attribute value to be converted.
+     * @return An object of type {@code T} representing the converted value.
+     */
     T convert(String value);
 }

From 72214f1b43947bb8e148c02d128ae5e84839b7b0 Mon Sep 17 00:00:00 2001
From: mameri <michael.ameri@gmail.com>
Date: Fri, 9 Feb 2024 11:52:18 +0100
Subject: [PATCH 207/212] add ability for custom delimiters

---
 src/main/java/org/json/CDL.java           | 183 +++++++++++++++-------
 src/test/java/org/json/junit/CDLTest.java |  60 ++++---
 2 files changed, 164 insertions(+), 79 deletions(-)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index 848831d..251386b 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -5,15 +5,15 @@ Public Domain.
  */
 
 /**
- * This provides static methods to convert comma delimited text into a
- * JSONArray, and to convert a JSONArray into comma delimited text. Comma
+ * This provides static methods to convert comma (or otherwise) delimited text into a
+ * JSONArray, and to convert a JSONArray into comma (or otherwise) delimited text. Comma
  * delimited text is a very popular format for data interchange. It is
  * understood by most database, spreadsheet, and organizer programs.
  * <p>
  * Each row of text represents a row in a table or a data record. Each row
  * ends with a NEWLINE character. Each row contains one or more values.
  * Values are separated by commas. A value can contain any character except
- * for comma, unless is is wrapped in single quotes or double quotes.
+ * for comma, unless it is wrapped in single quotes or double quotes.
  * <p>
  * The first row usually contains the names of the columns.
  * <p>
@@ -29,50 +29,48 @@ public class CDL {
      * Get the next value. The value can be wrapped in quotes. The value can
      * be empty.
      * @param x A JSONTokener of the source text.
+     * @param delimiter used in the file
      * @return The value string, or null if empty.
      * @throws JSONException if the quoted string is badly formed.
      */
-    private static String getValue(JSONTokener x) throws JSONException {
+    private static String getValue(JSONTokener x, char delimiter) throws JSONException {
         char c;
         char q;
         StringBuilder sb;
         do {
             c = x.next();
         } while (c == ' ' || c == '\t');
-        switch (c) {
-        case 0:
-            return null;
-        case '"':
-        case '\'':
-            q = c;
-            sb = new StringBuilder();
-            for (;;) {
-                c = x.next();
-                if (c == q) {
-                    //Handle escaped double-quote
-                    char nextC = x.next();
-                    if(nextC != '\"') {
-                        // if our quote was the end of the file, don't step
-                        if(nextC > 0) {
-                            x.back();
-                        }
-                        break;
-                    }
-                }
-                if (c == 0 || c == '\n' || c == '\r') {
-                    throw x.syntaxError("Missing close quote '" + q + "'.");
-                }
-                sb.append(c);
-            }
-            return sb.toString();
-        case ',':
-            x.back();
-            return "";
-        default:
-            x.back();
-            return x.nextTo(',');
-        }
-    }
+		if (c == 0) {
+			return null;
+		} else if (c == '"' || c == '\'') {
+			q = c;
+			sb = new StringBuilder();
+			for (;;) {
+				c = x.next();
+				if (c == q) {
+					//Handle escaped double-quote
+					char nextC = x.next();
+					if (nextC != '\"') {
+						// if our quote was the end of the file, don't step
+						if (nextC > 0) {
+							x.back();
+						}
+						break;
+					}
+				}
+				if (c == 0 || c == '\n' || c == '\r') {
+					throw x.syntaxError("Missing close quote '" + q + "'.");
+				}
+				sb.append(c);
+			}
+			return sb.toString();
+		} else if (c == delimiter) {
+			x.back();
+			return "";
+		}
+		x.back();
+		return x.nextTo(delimiter);
+	}
 
     /**
      * Produce a JSONArray of strings from a row of comma delimited values.
@@ -81,17 +79,25 @@ public class CDL {
      * @throws JSONException if a called function fails
      */
     public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException {
+        return rowToJSONArray(x, ',');
+    }
+
+    /**
+     * Same as {@link #rowToJSONArray(JSONTokener)}, but with a custom delimiter.
+     * @see #rowToJSONArray(JSONTokener)
+     */
+    public static JSONArray rowToJSONArray(JSONTokener x, char delimiter) throws JSONException {
         JSONArray ja = new JSONArray();
         for (;;) {
-            String value = getValue(x);
+            String value = getValue(x,delimiter);
             char c = x.next();
             if (value == null ||
-                    (ja.length() == 0 && value.length() == 0 && c != ',')) {
+                    (ja.length() == 0 && value.length() == 0 && c != delimiter)) {
                 return null;
             }
             ja.put(value);
             for (;;) {
-                if (c == ',') {
+                if (c == delimiter) {
                     break;
                 }
                 if (c != ' ') {
@@ -116,9 +122,17 @@ public class CDL {
      * @return A JSONObject combining the names and values.
      * @throws JSONException if a called function fails
      */
-    public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x)
-            throws JSONException {
-        JSONArray ja = rowToJSONArray(x);
+    public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x) throws JSONException {
+        return rowToJSONObject(names, x, ',');
+    }
+
+    /**
+     * Same as {@link #rowToJSONObject(JSONArray, JSONTokener)}, but with a custom {@code delimiter}.
+     * 
+     * @see #rowToJSONObject(JSONArray, JSONTokener) 
+     */
+    public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x, char delimiter) throws JSONException {
+        JSONArray ja = rowToJSONArray(x, delimiter);
         return ja != null ? ja.toJSONObject(names) :  null;
     }
 
@@ -130,15 +144,23 @@ public class CDL {
      * @return A string ending in NEWLINE.
      */
     public static String rowToString(JSONArray ja) {
+        return rowToString(ja, ',');
+    }
+
+    /**
+     * Same as {@link #rowToString(JSONArray)}, but with a custom delimiter.
+     * @see  #rowToString(JSONArray)
+     */
+    public static String rowToString(JSONArray ja, char delimiter) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < ja.length(); i += 1) {
             if (i > 0) {
-                sb.append(',');
+                sb.append(delimiter);
             }
             Object object = ja.opt(i);
             if (object != null) {
                 String string = object.toString();
-                if (string.length() > 0 && (string.indexOf(',') >= 0 ||
+                if (string.length() > 0 && (string.indexOf(delimiter) >= 0 ||
                         string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 ||
                         string.indexOf(0) >= 0 || string.charAt(0) == '"')) {
                     sb.append('"');
@@ -167,7 +189,15 @@ public class CDL {
      * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(String string) throws JSONException {
-        return toJSONArray(new JSONTokener(string));
+        return toJSONArray(string, ',');
+    }
+
+    /**
+     * Same as {@link #toJSONArray(String)}, but with a custom delimiter.
+     * @see #toJSONArray(String)
+     */
+    public static JSONArray toJSONArray(String string, char delimiter) throws JSONException {
+        return toJSONArray(new JSONTokener(string), delimiter);
     }
 
     /**
@@ -178,7 +208,15 @@ public class CDL {
      * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(JSONTokener x) throws JSONException {
-        return toJSONArray(rowToJSONArray(x), x);
+        return toJSONArray(x, ',');
+    }
+
+    /**
+     * Same as {@link #toJSONArray(JSONTokener)}, but with a custom delimiter.
+     * @see #toJSONArray(JSONTokener)
+     */
+    public static JSONArray toJSONArray(JSONTokener x, char delimiter) throws JSONException {
+        return toJSONArray(rowToJSONArray(x, delimiter), x, delimiter);
     }
 
     /**
@@ -189,9 +227,16 @@ public class CDL {
      * @return A JSONArray of JSONObjects.
      * @throws JSONException if a called function fails
      */
-    public static JSONArray toJSONArray(JSONArray names, String string)
-            throws JSONException {
-        return toJSONArray(names, new JSONTokener(string));
+    public static JSONArray toJSONArray(JSONArray names, String string) throws JSONException {
+        return toJSONArray(names, string, ',');
+    }
+
+    /**
+     * Same as {@link #toJSONArray(JSONArray, String)}, but with a custom delimiter.
+     * @see #toJSONArray(JSONArray, String)
+     */
+    public static JSONArray toJSONArray(JSONArray names, String string, char delimiter) throws JSONException {
+        return toJSONArray(names, new JSONTokener(string), delimiter);
     }
 
     /**
@@ -202,14 +247,21 @@ public class CDL {
      * @return A JSONArray of JSONObjects.
      * @throws JSONException if a called function fails
      */
-    public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
-            throws JSONException {
+    public static JSONArray toJSONArray(JSONArray names, JSONTokener x) throws JSONException {
+        return toJSONArray(names, x, ',');
+    }
+
+    /**
+     * Same as {@link #toJSONArray(JSONArray, JSONTokener)}, but with a custom delimiter.
+     * @see #toJSONArray(JSONArray, JSONTokener)
+     */
+    public static JSONArray toJSONArray(JSONArray names, JSONTokener x, char delimiter) throws JSONException {
         if (names == null || names.length() == 0) {
             return null;
         }
         JSONArray ja = new JSONArray();
         for (;;) {
-            JSONObject jo = rowToJSONObject(names, x);
+            JSONObject jo = rowToJSONObject(names, x, delimiter);
             if (jo == null) {
                 break;
             }
@@ -231,11 +283,19 @@ public class CDL {
      * @throws JSONException if a called function fails
      */
     public static String toString(JSONArray ja) throws JSONException {
+        return toString(ja, ',');
+    }
+
+    /**
+     * Same as {@link #toString(JSONArray)}, but with a custom delimiter.
+     * @see #toString(JSONArray)
+     */
+    public static String toString(JSONArray ja, char delimiter) throws JSONException {
         JSONObject jo = ja.optJSONObject(0);
         if (jo != null) {
             JSONArray names = jo.names();
             if (names != null) {
-                return rowToString(names) + toString(names, ja);
+                return rowToString(names, delimiter) + toString(names, ja, delimiter);
             }
         }
         return null;
@@ -250,8 +310,15 @@ public class CDL {
      * @return A comma delimited text.
      * @throws JSONException if a called function fails
      */
-    public static String toString(JSONArray names, JSONArray ja)
-            throws JSONException {
+    public static String toString(JSONArray names, JSONArray ja) throws JSONException {
+        return toString(names, ja, ',');
+    }
+
+    /**
+     * Same as {@link #toString(JSONArray,JSONArray)}, but with a custom delimiter.
+     * @see #toString(JSONArray,JSONArray)
+     */
+    public static String toString(JSONArray names, JSONArray ja, char delimiter) throws JSONException {
         if (names == null || names.length() == 0) {
             return null;
         }
@@ -259,7 +326,7 @@ public class CDL {
         for (int i = 0; i < ja.length(); i += 1) {
             JSONObject jo = ja.optJSONObject(i);
             if (jo != null) {
-                sb.append(rowToString(jo.toJSONArray(names)));
+                sb.append(rowToString(jo.toJSONArray(names), delimiter));
             }
         }
         return sb.toString();
diff --git a/src/test/java/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
index f3364fb..cc3da29 100644
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
@@ -24,14 +24,13 @@ public class CDLTest {
      * String of lines where the column names are in the first row,
      * and all subsequent rows are values. All keys and values should be legal.
      */
-    String lines = new String(
-            "Col 1, Col 2,  \tCol 3, Col 4, Col 5, Col 6, Col 7\n" +
-            "val1, val2, val3, val4, val5, val6, val7\n" +
-            "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"
-    );
+    private static final String LINES = "Col 1, Col 2,  \tCol 3, Col 4, Col 5, Col 6, Col 7\n" +
+			"val1, val2, val3, val4, val5, val6, val7\n" +
+			"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";
+
 
     /**
      * CDL.toJSONArray() adds all values as strings, with no filtering or 
@@ -39,12 +38,11 @@ public class CDLTest {
      * values all must be quoted in the cases where the JSONObject parsing 
      * might normally convert the value into a non-string. 
      */
-    String expectedLines = new String(
-            "[{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.
@@ -194,8 +192,7 @@ public class CDLTest {
     public void emptyString() {
         String emptyStr = "";
         JSONArray jsonArray = CDL.toJSONArray(emptyStr);
-        assertTrue("CDL should return null when the input string is empty",
-                jsonArray == null);
+		assertNull("CDL should return null when the input string is empty", jsonArray);
     }
 
     /**
@@ -254,7 +251,7 @@ public class CDLTest {
         jsonObject.put("Col \r1", "V1");
         // \r will be filtered from value
         jsonObject.put("Col 2", "V2\r");
-        assertTrue("expected length should be 1",jsonArray.length() == 1);
+		assertEquals("expected length should be 1", 1, jsonArray.length());
         String cdlStr = CDL.toString(jsonArray);
         jsonObject = jsonArray.getJSONObject(0);
         assertTrue(cdlStr.contains("\"Col 1\""));
@@ -268,8 +265,15 @@ public class CDLTest {
      */
     @Test
     public void textToJSONArray() {
-        JSONArray jsonArray = CDL.toJSONArray(this.lines);
-        JSONArray expectedJsonArray = new JSONArray(this.expectedLines);
+        JSONArray jsonArray = CDL.toJSONArray(LINES);
+        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
+        Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
+    }
+    @Test
+    public void textToJSONArrayPipeDelimited() {
+        char delimiter = '|';
+        JSONArray jsonArray = CDL.toJSONArray(LINES.replaceAll(",", String.valueOf(delimiter)), delimiter);
+        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
         Util.compareActualVsExpectedJsonArrays(jsonArray, expectedJsonArray);
     }
 
@@ -293,10 +297,24 @@ public class CDLTest {
      */
     @Test
     public void textToJSONArrayAndBackToString() {
-        JSONArray jsonArray = CDL.toJSONArray(this.lines);
+        JSONArray jsonArray = CDL.toJSONArray(LINES);
         String jsonStr = CDL.toString(jsonArray);
         JSONArray finalJsonArray = CDL.toJSONArray(jsonStr);
-        JSONArray expectedJsonArray = new JSONArray(this.expectedLines);
+        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
+        Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
+    }
+
+    /**
+     * Create a JSONArray from a string of lines,
+     * then convert to string and then back to JSONArray
+     * with a custom delimiter
+     */
+    @Test
+    public void textToJSONArrayAndBackToStringCustomDelimiter() {
+        JSONArray jsonArray = CDL.toJSONArray(LINES, ',');
+        String jsonStr = CDL.toString(jsonArray, ';');
+        JSONArray finalJsonArray = CDL.toJSONArray(jsonStr, ';');
+        JSONArray expectedJsonArray = new JSONArray(EXPECTED_LINES);
         Util.compareActualVsExpectedJsonArrays(finalJsonArray, expectedJsonArray);
     }
     

From f164b8c597e172aec537c791b067a7cce2e3de26 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Tue, 13 Feb 2024 20:08:54 -0600
Subject: [PATCH 208/212] cleanup-after-commit reverted pom.xml version 8
 change and tabs in cdl. Updated JavaDocs in cdl

---
 pom.xml                         |   3 -
 src/main/java/org/json/CDL.java | 142 +++++++++++++++++++++-----------
 2 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1488f49..7196978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,9 +126,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.5.0</version>
-                <configuration>
-                    <source>8</source>
-                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index 251386b..26dc2da 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -40,37 +40,37 @@ public class CDL {
         do {
             c = x.next();
         } while (c == ' ' || c == '\t');
-		if (c == 0) {
-			return null;
-		} else if (c == '"' || c == '\'') {
-			q = c;
-			sb = new StringBuilder();
-			for (;;) {
-				c = x.next();
-				if (c == q) {
-					//Handle escaped double-quote
-					char nextC = x.next();
-					if (nextC != '\"') {
-						// if our quote was the end of the file, don't step
-						if (nextC > 0) {
-							x.back();
-						}
-						break;
-					}
-				}
-				if (c == 0 || c == '\n' || c == '\r') {
-					throw x.syntaxError("Missing close quote '" + q + "'.");
-				}
-				sb.append(c);
-			}
-			return sb.toString();
-		} else if (c == delimiter) {
-			x.back();
-			return "";
-		}
-		x.back();
-		return x.nextTo(delimiter);
-	}
+        if (c == 0) {
+            return null;
+        } else if (c == '"' || c == '\'') {
+            q = c;
+            sb = new StringBuilder();
+            for (;;) {
+                c = x.next();
+                if (c == q) {
+                    //Handle escaped double-quote
+                    char nextC = x.next();
+                    if (nextC != '\"') {
+                        // if our quote was the end of the file, don't step
+                        if (nextC > 0) {
+                            x.back();
+                        }
+                        break;
+                    }
+                }
+                if (c == 0 || c == '\n' || c == '\r') {
+                    throw x.syntaxError("Missing close quote '" + q + "'.");
+                }
+                sb.append(c);
+            }
+            return sb.toString();
+        } else if (c == delimiter) {
+            x.back();
+            return "";
+        }
+        x.back();
+        return x.nextTo(delimiter);
+    }
 
     /**
      * Produce a JSONArray of strings from a row of comma delimited values.
@@ -83,8 +83,11 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #rowToJSONArray(JSONTokener)}, but with a custom delimiter.
-     * @see #rowToJSONArray(JSONTokener)
+     * Produce a JSONArray of strings from a row of comma delimited values.
+     * @param x A JSONTokener of the source text.
+     * @param delimiter custom delimiter char
+     * @return A JSONArray of strings.
+     * @throws JSONException if a called function fails
      */
     public static JSONArray rowToJSONArray(JSONTokener x, char delimiter) throws JSONException {
         JSONArray ja = new JSONArray();
@@ -127,9 +130,15 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #rowToJSONObject(JSONArray, JSONTokener)}, but with a custom {@code delimiter}.
-     * 
-     * @see #rowToJSONObject(JSONArray, JSONTokener) 
+     * Produce a JSONObject from a row of comma delimited text, using a
+     * parallel JSONArray of strings to provides the names of the elements.
+     * @param names A JSONArray of names. This is commonly obtained from the
+     *  first row of a comma delimited text file using the rowToJSONArray
+     *  method.
+     * @param x A JSONTokener of the source text.
+     * @param delimiter custom delimiter char
+     * @return A JSONObject combining the names and values.
+     * @throws JSONException if a called function fails
      */
     public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x, char delimiter) throws JSONException {
         JSONArray ja = rowToJSONArray(x, delimiter);
@@ -148,8 +157,12 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #rowToString(JSONArray)}, but with a custom delimiter.
-     * @see  #rowToString(JSONArray)
+     * Produce a comma delimited text row from a JSONArray. Values containing
+     * the comma character will be quoted. Troublesome characters may be
+     * removed.
+     * @param ja A JSONArray of strings.
+     * @param delimiter custom delimiter char
+     * @return A string ending in NEWLINE.
      */
     public static String rowToString(JSONArray ja, char delimiter) {
         StringBuilder sb = new StringBuilder();
@@ -193,8 +206,12 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toJSONArray(String)}, but with a custom delimiter.
-     * @see #toJSONArray(String)
+     * Produce a JSONArray of JSONObjects from a comma delimited text string,
+     * using the first row as a source of names.
+     * @param string The comma delimited text.
+     * @param delimiter custom delimiter char
+     * @return A JSONArray of JSONObjects.
+     * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(String string, char delimiter) throws JSONException {
         return toJSONArray(new JSONTokener(string), delimiter);
@@ -212,8 +229,12 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toJSONArray(JSONTokener)}, but with a custom delimiter.
-     * @see #toJSONArray(JSONTokener)
+     * Produce a JSONArray of JSONObjects from a comma delimited text string,
+     * using the first row as a source of names.
+     * @param x The JSONTokener containing the comma delimited text.
+     * @param delimiter custom delimiter char
+     * @return A JSONArray of JSONObjects.
+     * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(JSONTokener x, char delimiter) throws JSONException {
         return toJSONArray(rowToJSONArray(x, delimiter), x, delimiter);
@@ -232,8 +253,13 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toJSONArray(JSONArray, String)}, but with a custom delimiter.
-     * @see #toJSONArray(JSONArray, String)
+     * Produce a JSONArray of JSONObjects from a comma delimited text string
+     * using a supplied JSONArray as the source of element names.
+     * @param names A JSONArray of strings.
+     * @param string The comma delimited text.
+     * @param delimiter custom delimiter char
+     * @return A JSONArray of JSONObjects.
+     * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(JSONArray names, String string, char delimiter) throws JSONException {
         return toJSONArray(names, new JSONTokener(string), delimiter);
@@ -252,8 +278,13 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toJSONArray(JSONArray, JSONTokener)}, but with a custom delimiter.
-     * @see #toJSONArray(JSONArray, JSONTokener)
+     * Produce a JSONArray of JSONObjects from a comma delimited text string
+     * using a supplied JSONArray as the source of element names.
+     * @param names A JSONArray of strings.
+     * @param x A JSONTokener of the source text.
+     * @param delimiter custom delimiter char
+     * @return A JSONArray of JSONObjects.
+     * @throws JSONException if a called function fails
      */
     public static JSONArray toJSONArray(JSONArray names, JSONTokener x, char delimiter) throws JSONException {
         if (names == null || names.length() == 0) {
@@ -287,8 +318,13 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toString(JSONArray)}, but with a custom delimiter.
-     * @see #toString(JSONArray)
+     * Produce a comma delimited text from a JSONArray of JSONObjects. The
+     * first row will be a list of names obtained by inspecting the first
+     * JSONObject.
+     * @param ja A JSONArray of JSONObjects.
+     * @param delimiter custom delimiter char
+     * @return A comma delimited text.
+     * @throws JSONException if a called function fails
      */
     public static String toString(JSONArray ja, char delimiter) throws JSONException {
         JSONObject jo = ja.optJSONObject(0);
@@ -315,8 +351,14 @@ public class CDL {
     }
 
     /**
-     * Same as {@link #toString(JSONArray,JSONArray)}, but with a custom delimiter.
-     * @see #toString(JSONArray,JSONArray)
+     * Produce a comma delimited text from a JSONArray of JSONObjects using
+     * a provided list of names. The list of names is not included in the
+     * output.
+     * @param names A JSONArray of strings.
+     * @param ja A JSONArray of JSONObjects.
+     * @param delimiter custom delimiter char
+     * @return A comma delimited text.
+     * @throws JSONException if a called function fails
      */
     public static String toString(JSONArray names, JSONArray ja, char delimiter) throws JSONException {
         if (names == null || names.length() == 0) {

From 86253211c293b59a19e0d52eff42566bbd7d3d45 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Sun, 18 Feb 2024 04:20:33 +0200
Subject: [PATCH 209/212] Added missing Javadocs for Java 21

---
 src/main/java/org/json/CDL.java              | 6 ++++++
 src/main/java/org/json/Cookie.java           | 6 ++++++
 src/main/java/org/json/CookieList.java       | 6 ++++++
 src/main/java/org/json/HTTP.java             | 6 ++++++
 src/main/java/org/json/JSONML.java           | 7 +++++++
 src/main/java/org/json/JSONPointer.java      | 6 ++++++
 src/main/java/org/json/JSONPropertyName.java | 1 +
 src/main/java/org/json/Property.java         | 7 +++++++
 src/main/java/org/json/XML.java              | 6 ++++++
 9 files changed, 51 insertions(+)

diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java
index 26dc2da..b495de1 100644
--- a/src/main/java/org/json/CDL.java
+++ b/src/main/java/org/json/CDL.java
@@ -25,6 +25,12 @@ Public Domain.
  */
 public class CDL {
 
+    /**
+     * Constructs a new CDL object.
+     */
+    public CDL() {
+    }
+
     /**
      * Get the next value. The value can be wrapped in quotes. The value can
      * be empty.
diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java
index 7a7e028..ab908a3 100644
--- a/src/main/java/org/json/Cookie.java
+++ b/src/main/java/org/json/Cookie.java
@@ -15,6 +15,12 @@ Public Domain.
  */
 public class Cookie {
 
+    /**
+     * Constructs a new Cookie object.
+     */
+    public Cookie() {
+    }
+
     /**
      * Produce a copy of a string in which the characters '+', '%', '=', ';'
      * and control characters are replaced with "%hh". This is a gentle form
diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java
index 03e54b9..d1064db 100644
--- a/src/main/java/org/json/CookieList.java
+++ b/src/main/java/org/json/CookieList.java
@@ -11,6 +11,12 @@ Public Domain.
  */
 public class CookieList {
 
+    /**
+     * Constructs a new CookieList object.
+     */
+    public CookieList() {
+    }
+ 
     /**
      * Convert a cookie list into a JSONObject. A cookie list is a sequence
      * of name/value pairs. The names are separated from the values by '='.
diff --git a/src/main/java/org/json/HTTP.java b/src/main/java/org/json/HTTP.java
index 6fee6ba..44ab3a6 100644
--- a/src/main/java/org/json/HTTP.java
+++ b/src/main/java/org/json/HTTP.java
@@ -13,6 +13,12 @@ import java.util.Locale;
  */
 public class HTTP {
 
+    /**
+     * Constructs a new HTTP object.
+     */
+    public HTTP() {
+    }
+
     /** Carriage return/line feed. */
     public static final String CRLF = "\r\n";
 
diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java
index 4aea014..7b53e4d 100644
--- a/src/main/java/org/json/JSONML.java
+++ b/src/main/java/org/json/JSONML.java
@@ -13,6 +13,13 @@ Public Domain.
  * @version 2016-01-30
  */
 public class JSONML {
+
+    /**
+     * Constructs a new JSONML object.
+     */
+    public JSONML() {
+    }
+
     /**
      * Parse XML values and store them in a JSONArray.
      * @param x       The XMLTokener containing the source string.
diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
index 91bd137..859e1e6 100644
--- a/src/main/java/org/json/JSONPointer.java
+++ b/src/main/java/org/json/JSONPointer.java
@@ -42,6 +42,12 @@ public class JSONPointer {
      */
     public static class Builder {
 
+        /**
+         * Constructs a new Builder object.
+         */
+        public Builder() {
+        }
+
         // Segments for the eventual JSONPointer string
         private final List<String> refTokens = new ArrayList<String>();
 
diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java
index 4391bb7..0e4123f 100644
--- a/src/main/java/org/json/JSONPropertyName.java
+++ b/src/main/java/org/json/JSONPropertyName.java
@@ -21,6 +21,7 @@ import java.lang.annotation.Target;
 @Target({METHOD})
 public @interface JSONPropertyName {
     /**
+     * The value of the JSON property.
      * @return The name of the property as to be used in the JSON Object.
      */
     String value();
diff --git a/src/main/java/org/json/Property.java b/src/main/java/org/json/Property.java
index 83694c0..ba6c569 100644
--- a/src/main/java/org/json/Property.java
+++ b/src/main/java/org/json/Property.java
@@ -13,6 +13,13 @@ import java.util.Properties;
  * @version 2015-05-05
  */
 public class Property {
+
+    /**
+     * Constructs a new Property object.
+     */
+    public Property() {
+    }
+
     /**
      * Converts a property file object into a JSONObject. The property file object is a table of name value pairs.
      * @param properties java.util.Properties
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 301c8ba..484463b 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -24,6 +24,12 @@ import static org.json.NumberConversionUtil.stringToNumber;
 @SuppressWarnings("boxing")
 public class XML {
 
+    /**
+     * Constructs a new XML object.
+     */
+    public XML() {
+    }
+
     /** The Character '&amp;'. */
     public static final Character AMP = '&';
 

From 771c82c4eb2feed9584273ffcab8a37d1f903569 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Sat, 24 Feb 2024 13:07:51 -0600
Subject: [PATCH 210/212] backing out recent changes to optLong, getLong. See
 #868

---
 src/main/java/org/json/JSONArray.java         |   4 +-
 src/main/java/org/json/JSONObject.java        |  95 +++++++++-
 .../java/org/json/NumberConversionUtil.java   | 152 ---------------
 src/main/java/org/json/XML.java               |  83 +++++++--
 .../org/json/NumberConversionUtilTest.java    | 174 ------------------
 src/test/java/org/json/junit/JSONMLTest.java  |   2 +-
 .../org/json/junit/JSONObjectDecimalTest.java | 100 ----------
 .../org/json/junit/JSONObjectNumberTest.java  |   6 +-
 .../java/org/json/junit/JSONObjectTest.java   |  80 +-------
 .../org/json/junit/JsonNumberZeroTest.java    |  55 ------
 .../org/json/junit/XMLConfigurationTest.java  |   2 +-
 src/test/java/org/json/junit/XMLTest.java     |   2 +-
 12 files changed, 175 insertions(+), 580 deletions(-)
 delete mode 100644 src/main/java/org/json/NumberConversionUtil.java
 delete mode 100644 src/test/java/org/json/NumberConversionUtilTest.java
 delete mode 100644 src/test/java/org/json/junit/JSONObjectDecimalTest.java
 delete mode 100644 src/test/java/org/json/junit/JsonNumberZeroTest.java

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 38b0b31..f86075e 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -360,7 +360,7 @@ public class JSONArray implements Iterable<Object> {
             if (object instanceof Number) {
                 return (Number)object;
             }
-            return NumberConversionUtil.stringToNumber(object.toString());
+            return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
             throw wrongValueFormatException(index, "number", object, e);
         }
@@ -1107,7 +1107,7 @@ public class JSONArray implements Iterable<Object> {
         
         if (val instanceof String) {
             try {
-                return NumberConversionUtil.stringToNumber((String) val);
+                return JSONObject.stringToNumber((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 4c08b0b..6494f93 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -28,9 +28,6 @@ import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import static org.json.NumberConversionUtil.potentialNumber;
-import static org.json.NumberConversionUtil.stringToNumber;
-
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
  * form is a string wrapped in curly braces with colons between the names and
@@ -2460,7 +2457,8 @@ public class JSONObject {
          * produced, then the value will just be a string.
          */
 
-        if (potentialNumber(string)) {
+        char initial = string.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -2469,8 +2467,75 @@ public class JSONObject {
         return string;
     }
 
+    /**
+     * Converts a string to a number using the narrowest possible type. Possible
+     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
+     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
+     *
+     * @param val value to convert
+     * @return Number representation of the value.
+     * @throws NumberFormatException thrown if the value is not a valid number. A public
+     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
+     */
+    protected static Number stringToNumber(final String val) throws NumberFormatException {
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    }
+                }
+            }
+            // block items like 00 01 etc. Java number parsers treat these as Octal.
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
 
-
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+    }
 
     /**
      * Throw an exception if the object is a NaN or infinite number.
@@ -2896,5 +2961,23 @@ public class JSONObject {
         );
     }
 
-
+    /**
+     * 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";
+    }
 }
diff --git a/src/main/java/org/json/NumberConversionUtil.java b/src/main/java/org/json/NumberConversionUtil.java
deleted file mode 100644
index c2f16d7..0000000
--- a/src/main/java/org/json/NumberConversionUtil.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.json;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-class NumberConversionUtil {
-
-    /**
-     * Converts a string to a number using the narrowest possible type. Possible
-     * returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
-     * When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
-     *
-     * @param input value to convert
-     * @return Number representation of the value.
-     * @throws NumberFormatException thrown if the value is not a valid number. A public
-     *      caller should catch this and wrap it in a {@link JSONException} if applicable.
-     */
-    static Number stringToNumber(final String input) throws NumberFormatException {
-        String val = input;
-        if (val.startsWith(".")){
-            val = "0"+val;
-        }
-        if (val.startsWith("-.")){
-            val = "-0."+val.substring(2);
-        }
-        char initial = val.charAt(0);
-        if ( isNumericChar(initial) || initial == '-' ) {
-            // decimal representation
-            if (isDecimalNotation(val)) {
-                // Use a BigDecimal all the time so we keep the original
-                // representation. BigDecimal doesn't support -0.0, ensure we
-                // keep that by forcing a decimal.
-                try {
-                    BigDecimal bd = new BigDecimal(val);
-                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
-                        return Double.valueOf(-0.0);
-                    }
-                    return bd;
-                } catch (NumberFormatException retryAsDouble) {
-                    // this is to support "Hex Floats" like this: 0x1.0P-1074
-                    try {
-                        Double d = Double.valueOf(val);
-                        if(d.isNaN() || d.isInfinite()) {
-                            throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                        }
-                        return d;
-                    } catch (NumberFormatException ignore) {
-                        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                    }
-                }
-            }
-            val = removeLeadingZerosOfNumber(input);
-            initial = val.charAt(0);
-            if(initial == '0' && val.length() > 1) {
-                char at1 = val.charAt(1);
-                if(isNumericChar(at1)) {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            } else if (initial == '-' && val.length() > 2) {
-                char at1 = val.charAt(1);
-                char at2 = val.charAt(2);
-                if(at1 == '0' && isNumericChar(at2)) {
-                    throw new NumberFormatException("val ["+input+"] is not a valid number.");
-                }
-            }
-            // integer representation.
-            // This will narrow any values to the smallest reasonable Object representation
-            // (Integer, Long, or BigInteger)
-
-            // BigInteger down conversion: We use a similar bitLength compare as
-            // BigInteger#intValueExact uses. Increases GC, but objects hold
-            // only what they need. i.e. Less runtime overhead if the value is
-            // long lived.
-            BigInteger bi = new BigInteger(val);
-            if(bi.bitLength() <= 31){
-                return Integer.valueOf(bi.intValue());
-            }
-            if(bi.bitLength() <= 63){
-                return Long.valueOf(bi.longValue());
-            }
-            return bi;
-        }
-        throw new NumberFormatException("val ["+input+"] is not a valid number.");
-    }
-
-    /**
-     * Checks if the character is a numeric digit ('0' to '9').
-     *
-     * @param c The character to be checked.
-     * @return true if the character is a numeric digit, false otherwise.
-     */
-    private static boolean isNumericChar(char c) {
-        return (c <= '9' && c >= '0');
-    }
-
-    /**
-     * Checks if the value could be considered a number in decimal number system.
-     * @param value
-     * @return
-     */
-    static boolean potentialNumber(String value){
-        if (value == null || value.isEmpty()){
-            return false;
-        }
-        return potentialPositiveNumberStartingAtIndex(value, (value.charAt(0)=='-'?1:0));
-    }
-
-    /**
-     * Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
-     *
-     * @param val value to test
-     * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
-     */
-    private static boolean isDecimalNotation(final String val) {
-        return val.indexOf('.') > -1 || val.indexOf('e') > -1
-                || val.indexOf('E') > -1 || "-0".equals(val);
-    }
-
-    private static boolean potentialPositiveNumberStartingAtIndex(String value,int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return digitAtIndex(value, (value.charAt(index)=='.'?index+1:index));
-    }
-
-    private static boolean digitAtIndex(String value, int index){
-        if (index >= value.length()){
-            return false;
-        }
-        return value.charAt(index) >= '0' && value.charAt(index) <= '9';
-    }
-
-    /**
-     * 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";
-    }
-}
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
index 484463b..e59ec7a 100644
--- a/src/main/java/org/json/XML.java
+++ b/src/main/java/org/json/XML.java
@@ -10,10 +10,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Iterator;
 
-import static org.json.NumberConversionUtil.potentialNumber;
-import static org.json.NumberConversionUtil.stringToNumber;
-
-
 /**
  * This provides static methods to convert an XML text into a JSONObject, and to
  * covert a JSONObject into an XML text.
@@ -499,6 +495,76 @@ public class XML {
         return true;
     }
 
+    /**
+     * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android support.
+     */
+    private static Number stringToNumber(final String val) throws NumberFormatException {
+        char initial = val.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
+            // decimal representation
+            if (isDecimalNotation(val)) {
+                // Use a BigDecimal all the time so we keep the original
+                // representation. BigDecimal doesn't support -0.0, ensure we
+                // keep that by forcing a decimal.
+                try {
+                    BigDecimal bd = new BigDecimal(val);
+                    if(initial == '-' && BigDecimal.ZERO.compareTo(bd)==0) {
+                        return Double.valueOf(-0.0);
+                    }
+                    return bd;
+                } catch (NumberFormatException retryAsDouble) {
+                    // this is to support "Hex Floats" like this: 0x1.0P-1074
+                    try {
+                        Double d = Double.valueOf(val);
+                        if(d.isNaN() || d.isInfinite()) {
+                            throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                        }
+                        return d;
+                    } catch (NumberFormatException ignore) {
+                        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                    }
+                }
+            }
+            // block items like 00 01 etc. Java number parsers treat these as Octal.
+            if(initial == '0' && val.length() > 1) {
+                char at1 = val.charAt(1);
+                if(at1 >= '0' && at1 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            } else if (initial == '-' && val.length() > 2) {
+                char at1 = val.charAt(1);
+                char at2 = val.charAt(2);
+                if(at1 == '0' && at2 >= '0' && at2 <= '9') {
+                    throw new NumberFormatException("val ["+val+"] is not a valid number.");
+                }
+            }
+            // integer representation.
+            // This will narrow any values to the smallest reasonable Object representation
+            // (Integer, Long, or BigInteger)
+
+            // BigInteger down conversion: We use a similar bitLength compare as
+            // BigInteger#intValueExact uses. Increases GC, but objects hold
+            // only what they need. i.e. Less runtime overhead if the value is
+            // long lived.
+            BigInteger bi = new BigInteger(val);
+            if(bi.bitLength() <= 31){
+                return Integer.valueOf(bi.intValue());
+            }
+            if(bi.bitLength() <= 63){
+                return Long.valueOf(bi.longValue());
+            }
+            return bi;
+        }
+        throw new NumberFormatException("val ["+val+"] is not a valid number.");
+    }
+
+    /**
+     * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain Android support.
+     */
+    private static boolean isDecimalNotation(final String val) {
+        return val.indexOf('.') > -1 || val.indexOf('e') > -1
+                || val.indexOf('E') > -1 || "-0".equals(val);
+    }
 
     /**
      * This method tries to convert the given string value to the target object
@@ -543,7 +609,8 @@ public class XML {
          * produced, then the value will just be a string.
          */
 
-        if (potentialNumber(string)) {
+        char initial = string.charAt(0);
+        if ((initial >= '0' && initial <= '9') || initial == '-') {
             try {
                 return stringToNumber(string);
             } catch (Exception ignore) {
@@ -552,11 +619,6 @@ public class XML {
         return string;
     }
 
-
-
-
-
-
     /**
      * Convert a well-formed (but not necessarily valid) XML string into a
      * JSONObject. Some information may be lost in this transformation because
@@ -975,5 +1037,4 @@ public class XML {
         }
         return sb.toString();
     }
-
 }
diff --git a/src/test/java/org/json/NumberConversionUtilTest.java b/src/test/java/org/json/NumberConversionUtilTest.java
deleted file mode 100644
index c6f0725..0000000
--- a/src/test/java/org/json/NumberConversionUtilTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.json;
-
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.junit.Assert.*;
-
-public class NumberConversionUtilTest {
-
-    @Test
-    public void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("00.10d");
-        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("0.10d");
-        assertEquals("Do not match",  0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("0.010d");
-        assertEquals("Do not match",  0.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  0.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  0, number.longValue(),0);
-        assertEquals("Do not match",  0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("00200.10d");
-        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("200.10d");
-        assertEquals("Do not match",  200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("200.010d");
-        assertEquals("Do not match",  200.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  200.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  200, number.longValue(),0);
-        assertEquals("Do not match",  200, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("-00.10d");
-        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("-0.10d");
-        assertEquals("Do not match",  -0.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("-0.010d");
-        assertEquals("Do not match",  -0.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -0.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -0, number.longValue(),0);
-        assertEquals("Do not match",  -0, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
-        Number number = NumberConversionUtil.stringToNumber("-00200.10d");
-        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
-        Number number = NumberConversionUtil.stringToNumber("-200.10d");
-        assertEquals("Do not match",  -200.10d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.10f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
-        Number number = NumberConversionUtil.stringToNumber("-200.010d");
-        assertEquals("Do not match",  -200.010d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -200.010f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -200, number.longValue(),0);
-        assertEquals("Do not match",  -200, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseNumbersWithExponents(){
-        Number number = NumberConversionUtil.stringToNumber("23.45e7");
-        assertEquals("Do not match",  23.45e7d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  23.45e7f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  2.345E8, number.longValue(),0);
-        assertEquals("Do not match",  2.345E8, number.intValue(),0);
-    }
-
-
-    @Test
-    public void shouldParseNegativeNumbersWithExponents(){
-        Number number = NumberConversionUtil.stringToNumber("-23.45e7");
-        assertEquals("Do not match",  -23.45e7d, number.doubleValue(),0.0d);
-        assertEquals("Do not match",  -23.45e7f, number.floatValue(),0.0f);
-        assertEquals("Do not match",  -2.345E8, number.longValue(),0);
-        assertEquals("Do not match",  -2.345E8, number.intValue(),0);
-    }
-
-    @Test
-    public void shouldParseBigDecimal(){
-        Number number = NumberConversionUtil.stringToNumber("19007199254740993.35481234487103587486413587843213584");
-        assertTrue(number instanceof BigDecimal);
-    }
-
-    @Test
-    public void shouldParseBigInteger(){
-        Number number = NumberConversionUtil.stringToNumber("1900719925474099335481234487103587486413587843213584");
-        assertTrue(number instanceof BigInteger);
-    }
-
-    @Test
-    public void shouldIdentifyPotentialNumber(){
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112.123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112e123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112.123"));
-        assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112e23"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("--112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("-a112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("a112.123"));
-        assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("e112.123"));
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void shouldExpectExceptionWhenNumberIsNotFormatted(){
-        NumberConversionUtil.stringToNumber("112.aa123");
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index e6abd15..154af64 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -709,7 +709,7 @@ public class JSONMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final String expectedJsonString = "[\"root\",[\"id\",1],[\"id\",1],[\"id\",0],[\"id\",0],[\"item\",{\"id\":1}],[\"title\",true]]";
+        final String expectedJsonString = "[\"root\",[\"id\",\"01\"],[\"id\",1],[\"id\",\"00\"],[\"id\",0],[\"item\",{\"id\":\"01\"}],[\"title\",true]]";
         final JSONArray actualJsonOutput = JSONML.toJSONArray(originalXml, false);
         assertEquals(expectedJsonString, actualJsonOutput.toString());
     }
diff --git a/src/test/java/org/json/junit/JSONObjectDecimalTest.java b/src/test/java/org/json/junit/JSONObjectDecimalTest.java
deleted file mode 100644
index 3302f0a..0000000
--- a/src/test/java/org/json/junit/JSONObjectDecimalTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.json.junit;
-
-import org.json.JSONObject;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.junit.Assert.assertEquals;
-
-public class JSONObjectDecimalTest {
-
-    @Test
-    public void shouldParseDecimalNumberThatStartsWithDecimalPoint(){
-        JSONObject jsonObject = new JSONObject("{value:0.50}");
-        assertEquals("Float not recognized", 0.5f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0.5f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0.5f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0.5d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", 0.5d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0.5d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(.5).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-
-
-    @Test
-    public void shouldParseNegativeDecimalNumberThatStartsWithDecimalPoint(){
-        JSONObject jsonObject = new JSONObject("{value:-.50}");
-        assertEquals("Float not recognized", -0.5f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0.5f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0.5f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0.5d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", -0.5d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0.5d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-.5).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-    @Test
-    public void shouldParseDecimalNumberThatHasZeroBeforeWithDecimalPoint(){
-        JSONObject jsonObject = new JSONObject("{value:00.050}");
-        assertEquals("Float not recognized", 0.05f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0.05f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0.05f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0.05d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", 0.05d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0.05d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(.05).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-    @Test
-    public void shouldParseNegativeDecimalNumberThatHasZeroBeforeWithDecimalPoint(){
-        JSONObject jsonObject = new JSONObject("{value:-00.050}");
-        assertEquals("Float not recognized", -0.05f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0.05f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0.05f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0.05d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", -0.05d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0.05d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-.05).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-
-}
diff --git a/src/test/java/org/json/junit/JSONObjectNumberTest.java b/src/test/java/org/json/junit/JSONObjectNumberTest.java
index 14e68d6..43173a2 100644
--- a/src/test/java/org/json/junit/JSONObjectNumberTest.java
+++ b/src/test/java/org/json/junit/JSONObjectNumberTest.java
@@ -23,10 +23,7 @@ public class JSONObjectNumberTest {
     @Parameters(name = "{index}: {0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
-            {"{value:0050}", 1},
-            {"{value:0050.0000}", 1},
-            {"{value:-0050}", -1},
-            {"{value:-0050.0000}", -1},
+            {"{value:50}", 1},
             {"{value:50.0}", 1},
             {"{value:5e1}", 1},
             {"{value:5E1}", 1},
@@ -35,7 +32,6 @@ public class JSONObjectNumberTest {
             {"{value:-50}", -1},
             {"{value:-50.0}", -1},
             {"{value:-5e1}", -1},
-            {"{value:-0005e1}", -1},
             {"{value:-5E1}", -1},
             {"{value:-5e1}", -1},
             {"{value:'-50'}", -1}
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 053f17a..d90297d 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -4,7 +4,6 @@ package org.json.junit;
 Public Domain.
 */
 
-import static java.lang.Double.NaN;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -786,7 +785,7 @@ public class JSONObjectTest {
         jsonObject.accumulate("myArray", -23.45e7);
         // include an unsupported object for coverage
         try {
-            jsonObject.accumulate("myArray", NaN);
+            jsonObject.accumulate("myArray", Double.NaN);
             fail("Expected exception");
         } catch (JSONException ignored) {}
 
@@ -818,7 +817,7 @@ public class JSONObjectTest {
         jsonObject.append("myArray", -23.45e7);
         // include an unsupported object for coverage
         try {
-            jsonObject.append("myArray", NaN);
+            jsonObject.append("myArray", Double.NaN);
             fail("Expected exception");
         } catch (JSONException ignored) {}
 
@@ -843,7 +842,7 @@ public class JSONObjectTest {
     public void jsonObjectDoubleToString() {
         String [] expectedStrs = {"1", "1", "-23.4", "-2.345E68", "null", "null" };
         Double [] doubles = { 1.0, 00001.00000, -23.4, -23.45e67, 
-                NaN, Double.NEGATIVE_INFINITY };
+                Double.NaN, Double.NEGATIVE_INFINITY };
         for (int i = 0; i < expectedStrs.length; ++i) {
             String actualStr = JSONObject.doubleToString(doubles[i]);
             assertTrue("value expected ["+expectedStrs[i]+
@@ -898,11 +897,11 @@ public class JSONObjectTest {
         assertTrue("opt doubleKey should be double", 
                 jsonObject.optDouble("doubleKey") == -23.45e7);
         assertTrue("opt doubleKey with Default should be double", 
-                jsonObject.optDouble("doubleStrKey", NaN) == 1);
+                jsonObject.optDouble("doubleStrKey", Double.NaN) == 1);
         assertTrue("opt doubleKey should be Double",
                 Double.valueOf(-23.45e7).equals(jsonObject.optDoubleObject("doubleKey")));
         assertTrue("opt doubleKey with Default should be Double",
-                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", NaN)));
+                Double.valueOf(1).equals(jsonObject.optDoubleObject("doubleStrKey", Double.NaN)));
         assertTrue("opt negZeroKey should be a Double", 
                 jsonObject.opt("negZeroKey") instanceof Double);
         assertTrue("get negZeroKey should be a Double", 
@@ -1068,21 +1067,12 @@ public class JSONObjectTest {
                 "\"tooManyZeros\":00,"+
                 "\"negativeInfinite\":-Infinity,"+
                 "\"negativeNaN\":-NaN,"+
-                "\"negativeNaNWithLeadingZeros\":-00NaN,"+
                 "\"negativeFraction\":-.01,"+
                 "\"tooManyZerosFraction\":00.001,"+
                 "\"negativeHexFloat\":-0x1.fffp1,"+
                 "\"hexFloat\":0x1.0P-1074,"+
                 "\"floatIdentifier\":0.1f,"+
-                "\"doubleIdentifier\":0.1d,"+
-                "\"doubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":0000000.1d,"+
-                "\"negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":-0000000.1d,"+
-                "\"doubleIdentifierWithMultipleLeadingZerosAfterDecimal\":0000000.0001d,"+
-                "\"negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal\":-0000000.0001d,"+
-                "\"integerWithLeadingZeros\":000900,"+
-                "\"integerWithAllZeros\":00000,"+
-                "\"compositeWithLeadingZeros\":00800.90d,"+
-                "\"decimalPositiveWithoutNumberBeforeDecimalPoint\":.90,"+
+                "\"doubleIdentifier\":0.1d"+
             "}";
         JSONObject jsonObject = new JSONObject(str);
         Object obj;
@@ -1092,22 +1082,15 @@ public class JSONObjectTest {
         assertTrue("hexNumber currently evaluates to string",
                 obj.equals("-0x123"));
         assertTrue( "tooManyZeros currently evaluates to string",
-                jsonObject.get( "tooManyZeros" ).equals(0));
+                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"));
-        obj = jsonObject.get("negativeNaNWithLeadingZeros");
-        assertTrue( "negativeNaNWithLeadingZeros currently evaluates to string",
-                obj.equals("-00NaN"));
         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.get( "tooManyZerosFraction" ).equals(BigDecimal.valueOf(0.001)));
-        assertTrue( "tooManyZerosFraction currently evaluates to double 0.001",
-                jsonObject.getLong( "tooManyZerosFraction" )==0);
         assertTrue( "tooManyZerosFraction currently evaluates to double 0.001",
                 jsonObject.optLong( "tooManyZerosFraction" )==0);
         assertTrue( "negativeHexFloat currently evaluates to double -3.99951171875",
@@ -1118,53 +1101,6 @@ public class JSONObjectTest {
                 jsonObject.get("floatIdentifier").equals(Double.valueOf(0.1)));
         assertTrue("doubleIdentifier currently evaluates to double 0.1",
                 jsonObject.get("doubleIdentifier").equals(Double.valueOf(0.1)));
-        assertTrue("doubleIdentifierWithMultipleLeadingZerosBeforeDecimal currently evaluates to double 0.1",
-                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosBeforeDecimal").equals(Double.valueOf(0.1)));
-        assertTrue("negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal currently evaluates to double -0.1",
-                jsonObject.get("negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal").equals(Double.valueOf(-0.1)));
-        assertTrue("doubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double 0.0001",
-                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(0.0001)));
-        assertTrue("doubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double 0.0001",
-                jsonObject.get("doubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(0.0001)));
-        assertTrue("negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal currently evaluates to double -0.0001",
-                jsonObject.get("negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal").equals(Double.valueOf(-0.0001)));
-        assertTrue("Integer does not evaluate to 900",
-                jsonObject.get("integerWithLeadingZeros").equals(900));
-        assertTrue("Integer does not evaluate to 900",
-                jsonObject.getInt("integerWithLeadingZeros")==900);
-        assertTrue("Integer does not evaluate to 900",
-                jsonObject.optInt("integerWithLeadingZeros")==900);
-        assertTrue("Integer does not evaluate to 0",
-                jsonObject.get("integerWithAllZeros").equals(0));
-        assertTrue("Integer does not evaluate to 0",
-                jsonObject.getInt("integerWithAllZeros")==0);
-        assertTrue("Integer does not evaluate to 0",
-                jsonObject.optInt("integerWithAllZeros")==0);
-        assertTrue("Double does not evaluate to 800.90",
-                jsonObject.get("compositeWithLeadingZeros").equals(800.90));
-        assertTrue("Double does not evaluate to 800.90",
-                jsonObject.getDouble("compositeWithLeadingZeros")==800.9d);
-        assertTrue("Integer does not evaluate to 800",
-                jsonObject.optInt("compositeWithLeadingZeros")==800);
-        assertTrue("Long does not evaluate to 800.90",
-                jsonObject.getLong("compositeWithLeadingZeros")==800);
-        assertTrue("Long does not evaluate to 800.90",
-                jsonObject.optLong("compositeWithLeadingZeros")==800);
-        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
-                0.9d,jsonObject.getDouble("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
-        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
-                0.9d,jsonObject.optDouble("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
-        assertEquals("Get long of decimalPositiveWithoutNumberBeforeDecimalPoint does not match",
-                0.0d,jsonObject.optLong("decimalPositiveWithoutNumberBeforeDecimalPoint"),  0.0d);
-
-        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
-                0.0001d,jsonObject.getDouble("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
-        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
-                0.0001d,jsonObject.optDouble("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
-        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
-                0.0d, jsonObject.getLong("doubleIdentifierWithMultipleLeadingZerosAfterDecimal") , 0.0d);
-        assertEquals("Get long of doubleIdentifierWithMultipleLeadingZerosAfterDecimal does not match",
-                0.0d,jsonObject.optLong("doubleIdentifierWithMultipleLeadingZerosAfterDecimal"),  0.0d);
         Util.checkJSONObjectMaps(jsonObject);
     }
 
@@ -2398,7 +2334,7 @@ public class JSONObjectTest {
         }
         try {
             // test validity of invalid double 
-            JSONObject.testValidity(NaN);
+            JSONObject.testValidity(Double.NaN);
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertTrue("", true);
diff --git a/src/test/java/org/json/junit/JsonNumberZeroTest.java b/src/test/java/org/json/junit/JsonNumberZeroTest.java
deleted file mode 100644
index bfa4ca9..0000000
--- a/src/test/java/org/json/junit/JsonNumberZeroTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.json.junit;
-
-import org.json.JSONObject;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.junit.Assert.assertEquals;
-
-public class JsonNumberZeroTest {
-
-    @Test
-    public void shouldParseNegativeZeroValueWithMultipleZeroDigit(){
-        JSONObject jsonObject = new JSONObject("{value:-0000}");
-        assertEquals("Float not recognized", -0f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", -0f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", -0.0d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", -0.0d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-0).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-    @Test
-    public void shouldParseZeroValueWithMultipleZeroDigit(){
-        JSONObject jsonObject = new JSONObject("{value:0000}");
-        assertEquals("Float not recognized", 0f, jsonObject.getFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0f, jsonObject.optFloat("value"), 0.0f);
-        assertEquals("Float not recognized", 0f, jsonObject.optFloatObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0d, jsonObject.optDouble("value"), 0.0f);
-        assertEquals("Double not recognized", 0.0d, jsonObject.optDoubleObject("value"), 0.0f);
-        assertEquals("Double not recognized", 0.0d, jsonObject.getDouble("value"), 0.0f);
-        assertEquals("Long not recognized", 0, jsonObject.optLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.getLong("value"), 0);
-        assertEquals("Long not recognized", 0, jsonObject.optLongObject("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.getInt("value"), 0);
-        assertEquals("Integer not recognized", 0, jsonObject.optIntegerObject("value"), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").intValue(), 0);
-        assertEquals("Number not recognized", 0, jsonObject.getNumber("value").longValue(), 0);
-        assertEquals("BigDecimal not recognized", 0, BigDecimal.valueOf(-0).compareTo(jsonObject.getBigDecimal("value")));
-        assertEquals("BigInteger not recognized",0, BigInteger.valueOf(0).compareTo(jsonObject.getBigInteger("value")));
-    }
-
-}
diff --git a/src/test/java/org/json/junit/XMLConfigurationTest.java b/src/test/java/org/json/junit/XMLConfigurationTest.java
index ba8418c..e9714af 100755
--- a/src/test/java/org/json/junit/XMLConfigurationTest.java
+++ b/src/test/java/org/json/junit/XMLConfigurationTest.java
@@ -761,7 +761,7 @@ public class XMLConfigurationTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
+        final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, 
                 new XMLParserConfiguration().withKeepStrings(false));
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 9ae1ee2..db90592 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -791,7 +791,7 @@ public class XMLTest {
     @Test
     public void testToJSONArray_jsonOutput() {
         final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>True</title></root>";
-        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":1},\"id\":[1,1,0,0],\"title\":true}}");
+        final JSONObject expectedJson = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",1,\"00\",0],\"title\":true}}");
         final JSONObject actualJsonOutput = XML.toJSONObject(originalXml, false);
 
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expectedJson);

From 898288810fb55f06dc6e046212f00dcd639773c3 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Sat, 24 Feb 2024 21:07:12 -0600
Subject: [PATCH 211/212] add unit tests to clarify current behavior for
 JSONObject and XML

---
 .../java/org/json/junit/JSONObjectTest.java   | 37 +++++++++++++++++++
 src/test/java/org/json/junit/XMLTest.java     | 15 ++++++++
 2 files changed, 52 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index d90297d..fac8c53 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -3738,6 +3738,43 @@ public class JSONObjectTest {
         new JSONObject(map1);
     }
 
+    @Test
+    public void clarifyCurrentBehavior() {
+        // Behavior documented in #653 optLong vs getLong inconsistencies
+        // This problem still exists.
+        // Internally, both number_1 and number_2 are stored as strings. This is reasonable since they are parsed as strings.
+        // However, getLong and optLong should return similar results
+        JSONObject json = new JSONObject("{\"number_1\":\"01234\", \"number_2\": \"332211\"}");
+        assertEquals(json.getLong("number_1"), 1234L);
+        assertEquals(json.optLong("number_1"), 0); //THIS VALUE IS NOT RETURNED AS A NUMBER
+        assertEquals(json.getLong("number_2"), 332211L);
+        assertEquals(json.optLong("number_2"), 332211L);
+
+        // 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 + "}");
+        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}");
+        assertEquals(j2.getString("personId"), "0123");
+
+        // Behavior uncovered while working on the code
+        // All of the values are stored as strings except for hex4, which is stored as a number. This is probably incorrect
+        JSONObject j3 = new JSONObject("{ " +
+                "\"hex1\": \"010e4\", \"hex2\": \"00f0\", \"hex3\": \"0011\", " +
+                "\"hex4\": 00e0, \"hex5\": 00f0, \"hex6\": 0011 }");
+        assertEquals(j3.getString("hex1"), "010e4");
+        assertEquals(j3.getString("hex2"), "00f0");
+        assertEquals(j3.getString("hex3"), "0011");
+        assertEquals(j3.getLong("hex4"), 0, .1);
+        assertEquals(j3.getString("hex5"), "00f0");
+        assertEquals(j3.getString("hex6"), "0011");
+    }
+
     /**
      * Method to build nested map of max maxDepth
      *
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index db90592..9bb3d9f 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1397,6 +1397,21 @@ public class XMLTest {
         Util.compareActualVsExpectedJsonObjects(actualJson,expectedJson);
     }
 
+    @Test
+    public void clarifyCurrentBehavior() {
+
+        // Behavior documented in #852
+        // After reverting the code, value is still stored as a number. This is due to how XML.isDecimalNotation() works
+        // and is probably a bug. JSONObject has a similar problem.
+        String str = "<color> <color_type>primary</color_type> <value>008E97</value> </color>";
+        JSONObject jsonObject = XML.toJSONObject(str);
+        assertEquals(jsonObject.getJSONObject("color").getLong("value"), 0e897, .1);
+
+        // Workaround for now is to use keepStrings
+        JSONObject jsonObject1 = XML.toJSONObject(str, new XMLParserConfiguration().withKeepStrings(true));
+        assertEquals(jsonObject1.getJSONObject("color").getString("value"), "008E97");
+    }
+
 }
 
 

From d520210ea26883965506d04153557e101903754a Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@Seans-MBP.attlocal.net>
Date: Sun, 25 Feb 2024 10:45:34 -0600
Subject: [PATCH 212/212] Added one more example to XMLTest
 clarifyCurrentBehavior()

---
 src/test/java/org/json/junit/XMLTest.java | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index 9bb3d9f..3b26b22 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -1400,16 +1400,30 @@ public class XMLTest {
     @Test
     public void clarifyCurrentBehavior() {
 
+        // Behavior documented in #826
+        // After reverting the code, amount is stored as numeric, and phone is stored as string
+        String str1 =
+                "    <datatypes>\n" +
+                "        <telephone>0123456789</telephone>\n" +
+                "        <amount>0.1230</amount>\n" +
+                "        <boolean>true</boolean>\n" +
+                "    </datatypes>";
+        JSONObject jsonObject1 = XML.toJSONObject(str1,
+                new XMLParserConfiguration().withKeepStrings(false));
+        assertEquals(jsonObject1.getJSONObject("datatypes").getFloat("amount"), 0.123, .1);
+        assertEquals(jsonObject1.getJSONObject("datatypes").getString("telephone"), "0123456789");
+
+
         // Behavior documented in #852
         // After reverting the code, value is still stored as a number. This is due to how XML.isDecimalNotation() works
         // and is probably a bug. JSONObject has a similar problem.
-        String str = "<color> <color_type>primary</color_type> <value>008E97</value> </color>";
-        JSONObject jsonObject = XML.toJSONObject(str);
-        assertEquals(jsonObject.getJSONObject("color").getLong("value"), 0e897, .1);
+        String str2 = "<color> <color_type>primary</color_type> <value>008E97</value> </color>";
+        JSONObject jsonObject2 = XML.toJSONObject(str2);
+        assertEquals(jsonObject2.getJSONObject("color").getLong("value"), 0e897, .1);
 
         // Workaround for now is to use keepStrings
-        JSONObject jsonObject1 = XML.toJSONObject(str, new XMLParserConfiguration().withKeepStrings(true));
-        assertEquals(jsonObject1.getJSONObject("color").getString("value"), "008E97");
+        JSONObject jsonObject3 = XML.toJSONObject(str2, new XMLParserConfiguration().withKeepStrings(true));
+        assertEquals(jsonObject3.getJSONObject("color").getString("value"), "008E97");
     }
 
 }