Merge pull request #793 from stleary/revert-761

Reverting #761

.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

.github/workflows/pipeline.yml

@@ -10,46 +10,21 @@ 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@v2
-      - name: Setup java
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-      - 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:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 8, 11 ]
+        java: [ 8, 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 }}

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?
 

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,8 +14,8 @@ import java.util.Properties;
 
 <h3>Using JSONArray</h3>
 
-```
-	private static void JSONExampleArray1() {
+```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
 
@@ -44,21 +44,21 @@ import java.util.Properties;
 	//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
+//This method creates an JSONArray of labels in which those are generated by their positions
 
-	private static JSONArray listNumberArray(int max){
+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
 
@@ -76,13 +76,13 @@ import java.util.Properties;
 	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
 
@@ -112,12 +112,12 @@ import java.util.Properties;
 	JSONObject jsonObject = new JSONObject(str);
 
 	System.out.println("Final JSONOBject: " + jsonObject);
-	}
+}
 ```
 <h3>Using JSONObject</h3>
 
-```
-	private static void JSONExampleObject1() {
+```java
+private static void JSONExampleObject1() {
 
 	//We can create a JSONObject from a String with the class builder
 
@@ -125,10 +125,10 @@ import java.util.Properties;
 	JSONObject example = new JSONObject(string);
 	System.out.println("Final JSONObject: " + example);
 
-	}
+}
 ```
-```
-	private static void JSONExampleObject2() {
+```java
+private static void JSONExampleObject2() {
 
 	//We can also create a JSONObject directly without messing around with any of the other functions.
 
@@ -149,10 +149,10 @@ import java.util.Properties;
 	//example.put("nullValue", null); //This is not possible
 
 	 System.out.println("Final JSONOBject: " + example);
-	}
+}
 ```
-```
-	private static void JSONExampleObject3() {
+```java
+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
@@ -166,12 +166,12 @@ import java.util.Properties;
 
 	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
@@ -200,10 +200,10 @@ import java.util.Properties;
 	//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
 
@@ -215,7 +215,7 @@ import java.util.Properties;
 	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,8 +223,8 @@ import java.util.Properties;
 	
 <h3>Extra: Conversion to JSONArray</h3>
 
-```
-	private static void JSONObjectToArray() {
+```java
+private static void JSONObjectToArray() {
 	//We start with a JSONObject
 
 	String string = "{\"0\":\"value\",\"1\":5,\"2\":-2.345E68,\"3\":true}";
@@ -240,12 +240,12 @@ import java.util.Properties;
 	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
 
@@ -256,10 +256,10 @@ import java.util.Properties;
 
 	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
 
@@ -270,12 +270,12 @@ import java.util.Properties;
 	JSONObject output = XML.toJSONObject(string);
 
 	System.out.println("Final JSONObject: " + output);
-	}
+}
 ```
 <h3>Cookie Conversions</h3>
 
-```
-	private static void CookieToExampleConversion() {
+```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.
@@ -288,10 +288,10 @@ import java.util.Properties;
 
 	String output = Cookie.toString(example);
 	System.out.println("Final Cookie: " + output);
-	}
+}
 ```
-```
-	private static void CookieFromExampleConversion() {
+```java
+private static void CookieFromExampleConversion() {
 
 	//We start with a string with  the Cookie format
 
@@ -301,13 +301,13 @@ import java.util.Properties;
 
 	JSONObject output = Cookie.toJSONObject(string);
 	System.out.println("Final JSONObject: " + output);
-	}
+}
 ```
 
 <h3>HTTP Conversions</h3>
 
-```
-	private static void HTTPToExampleConversion() {
+```java
+private static void HTTPToExampleConversion() {
 
 	//We start with a JSONObject
 	//The JSONObject must have the minimun header for a HTTP request or header
@@ -320,10 +320,10 @@ import java.util.Properties;
 
 	String output = HTTP.toString(example);
 	System.out.println("Final HTTP: " + output);
-	}
+}
 ```
-```	
-	private static void HTTPFromExampleConversion() {
+```java
+private static void HTTPFromExampleConversion() {
 
 	//We start with a string with  the HTTP format
 
@@ -333,11 +333,11 @@ import java.util.Properties;
 
 	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"
@@ -358,9 +358,9 @@ private static void CDLToExampleConversion() {
 
 	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
@@ -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,10 +391,10 @@ 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
 
@@ -404,12 +404,12 @@ private static void CDLFromExampleConversion() {
 
 	JSONObject output = Property.toJSONObject(input);
 	System.out.println("Final JSONObject: " + output);
-	}
+}
 ```
-<h2>List of all examples methods</h2>
+ <h2>List of all examples methods</h2>
 
-```
-	public static void main(String[] args) {
+```java
+public static void main(String[] args) {
 	//JSONObjectToArray();
 	//JSONExampleArray1();
 	//JSONExampleArray2();
@@ -428,6 +428,6 @@ private static void CDLFromExampleConversion() {
 	//CDLFromExampleConversion();
 	//PropertyToExampleConversion();
 	//PropertyFromExampleConversion();
-	}
+}
 ```
 

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/20231013/json-20231013.jar)**
 
 
 # Overview

build.gradle

@@ -20,9 +20,9 @@ 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:1.9.5'
+    testImplementation 'org.mockito:mockito-core:4.2.0'
 }
 
 subprojects {
@@ -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 {
 }

docs/RELEASES.md

@@ -5,6 +5,14 @@ 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
+
+20220924    New License - public domain, and some minor updates
+
 20220320    Wrap StackOverflow with JSONException
 
 20211205    Recent commits and some bug fixes for similar()
@@ -18,6 +26,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
 

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20220320</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>
@@ -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>
@@ -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>
@@ -139,6 +139,12 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -156,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>

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.
      * 
@@ -788,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;
     }
 
     /**
@@ -846,6 +1009,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,
@@ -1451,10 +1646,8 @@ 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();
     }
-    }
 
     /**
      * Write the contents of the JSONArray as JSON text to a writer. For

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 ? JSONMLParserConfiguration.KEEP_STRINGS : JSONMLParserConfiguration.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 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
+     */
+    private static Object parse(
+        XMLTokener x,
+        boolean    arrayForm,
+        JSONArray  ja,
+        JSONMLParserConfiguration 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, JSONMLParserConfiguration.ORIGINAL, 0);
     }
 
 
@@ -246,7 +276,56 @@ 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);
+    }
+
+
+
+    /**
+     * 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 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, JSONMLParserConfiguration 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 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, JSONMLParserConfiguration config) throws JSONException {
+        return (JSONArray)parse(x, true, null, config, 0);
     }
 
 
@@ -268,7 +347,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 +364,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,7 +382,7 @@ 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);
     }
 
 
@@ -323,7 +402,29 @@ 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 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, JSONMLParserConfiguration config) throws JSONException {
+        return (JSONObject)parse(new XMLTokener(string), false, null, config, 0);
     }
 
 
@@ -341,7 +442,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 +462,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 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, JSONMLParserConfiguration config) throws JSONException {
+        return (JSONObject)parse(x, false, null, config, 0);
     }
 
 
@@ -442,6 +565,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,

src/main/java/org/json/JSONMLParserConfiguration.java

@@ -0,0 +1,67 @@
+package org.json;
+/*
+Public Domain.
+*/
+
+/**
+ * Configuration object for the XML to JSONML parser. The configuration is immutable.
+ */
+@SuppressWarnings({""})
+public class JSONMLParserConfiguration 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;
+
+    /** Original Configuration of the XML to JSONML Parser. */
+    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 JSONMLParserConfiguration KEEP_STRINGS
+        = new JSONMLParserConfiguration().withKeepStrings(true);
+
+    /**
+     * Default parser configuration. Does not keep strings (tries to implicitly convert values).
+     */
+    public JSONMLParserConfiguration() {
+        super();
+        this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+    }
+
+    /**
+     * 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
+     */
+    protected JSONMLParserConfiguration(final boolean keepStrings, final int maxNestingDepth) {
+        super(keepStrings, maxNestingDepth);
+    }
+
+    /**
+     * Provides a new instance of the same configuration.
+     */
+    @Override
+    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 JSONMLParserConfiguration(
+                this.keepStrings,
+                this.maxNestingDepth
+        );
+    }
+
+    @Override
+    public JSONMLParserConfiguration withKeepStrings(final boolean newVal) {
+        return super.withKeepStrings(newVal);
+    }
+
+    @Override
+    public JSONMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
+        return super.withMaxNestingDepth(maxNestingDepth);
+    }
+}

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 ':'.
@@ -256,6 +248,9 @@ public class JSONObject {
                 if (x.nextClean() == '}') {
                     return;
                 }
+                if (x.end()) {
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                }
                 x.back();
                 break;
             case '}':
@@ -288,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));
                 }
             }
@@ -351,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();
@@ -1131,6 +1129,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
@@ -1290,15 +1327,43 @@ 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();
     }
 
     /**
-     * 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.
      *
@@ -1311,7 +1376,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.
      *
@@ -1333,6 +1398,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
@@ -1365,6 +1466,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.
@@ -1374,8 +1507,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;
     }
 
     /**
@@ -1436,6 +1583,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,
@@ -1514,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>()));
@@ -1549,6 +1731,7 @@ public class JSONObject {
 
                             objectsRecord.add(result);
 
+                            testValidity(result);
                             this.map.put(key, wrap(result, objectsRecord));
 
                             objectsRecord.remove(result);
@@ -2006,7 +2189,6 @@ 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) {
@@ -2014,7 +2196,6 @@ public class JSONObject {
             return "";
         }
     }
-    }
 
     public static Writer quote(String string, Writer w) throws IOException {
         if (string == null || string.isEmpty()) {
@@ -2204,14 +2385,21 @@ 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;
+        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
@@ -2228,25 +2416,26 @@ 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.");
                     }
                 }
             }
-            // block items like 00 01 etc. Java number parsers treat these as Octal.
+            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 ["+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.
@@ -2266,7 +2455,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.");
     }
 
     /**
@@ -2302,8 +2491,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) {
@@ -2312,6 +2500,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.
      *
@@ -2399,10 +2609,8 @@ 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();
     }
-    }
 
     /**
      * Make a JSON text of an Object value. If the object has an
@@ -2713,4 +2921,24 @@ public class JSONObject {
             "JavaBean object contains recursively defined member variable of key " + quote(key)
         );
     }
+
+    /**
+     * For a prospective number, remove the leading zeros
+     * @param value prospective number
+     * @return number without leading zeros
+     */
+    private static String removeLeadingZerosOfNumber(String value){
+        if (value.equals("-")){return value;}
+        boolean negativeFirstChar = (value.charAt(0) == '-');
+        int counter = negativeFirstChar ? 1:0;
+        while (counter < value.length()){
+            if (value.charAt(counter) != '0'){
+                if (negativeFirstChar) {return "-".concat(value.substring(counter));}
+                return value.substring(counter);
+            }
+            ++counter;
+        }
+        if (negativeFirstChar) {return "-0";}
+        return "0";
+    }
 }

src/main/java/org/json/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 -> 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 { }

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.

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

@@ -1,11 +1,7 @@
 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.*;
+import java.nio.charset.Charset;
 
 /*
 Public Domain.
@@ -61,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")));
     }
 
 
@@ -406,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 {
@@ -427,6 +418,17 @@ 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);
+        }
 
         /*
          * Handle unquoted text. This could be the values true, false, or
@@ -522,4 +524,10 @@ public class JSONTokener {
         return " at " + this.index + " [character " + this.character + " line " +
                 this.line + "]";
     }
+
+    public void close() throws IOException {
+        if(reader!=null){
+            reader.close();
+        }
+    }
 }

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

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

@@ -229,10 +229,14 @@ 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)
+    private static boolean parse(XMLTokener x, JSONObject context, String name, XMLParserConfiguration config, int currentNestingDepth)
             throws JSONException {
         char c;
         int i;
@@ -402,7 +406,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) {
@@ -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;
@@ -752,6 +760,28 @@ 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);
+    }
+
+    /**
+     * 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();
         JSONArray ja;
         JSONObject jo;
@@ -761,9 +791,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 +841,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 +892,85 @@ 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);
+    }
+
+    /**
+     * 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++) {
+            sb.append(' ');
+        }
+        return sb.toString();
     }
 }

src/main/java/org/json/XMLParserConfiguration.java

@@ -15,7 +15,13 @@ import java.util.Set;
  * @author AylwardJ
  */
 @SuppressWarnings({""})
-public class XMLParserConfiguration {
+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; // We could override
+
     /** Original Configuration of the XML Parser. */
     public static final XMLParserConfiguration ORIGINAL
         = new XMLParserConfiguration();
@@ -23,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
@@ -59,7 +59,7 @@ public class XMLParserConfiguration {
      * values), and the CDATA Tag Name is "content".
      */
     public XMLParserConfiguration () {
-        this.keepStrings = false;
+        super();
         this.cDataTagName = "content";
         this.convertNilAttributeToNull = false;
         this.xsiTypeMap = Collections.emptyMap();
@@ -106,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;
     }
@@ -125,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;
     }
@@ -141,10 +141,12 @@ public class XMLParserConfiguration {
      * @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 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 ) {
-        this.keepStrings = keepStrings;
+            final boolean convertNilAttributeToNull, final Map<String, XMLXsiTypeConverter<?>> xsiTypeMap, final Set<String> forceList,
+            final int maxNestingDepth) {
+        super(keepStrings, maxNestingDepth);
         this.cDataTagName = cDataTagName;
         this.convertNilAttributeToNull = convertNilAttributeToNull;
         this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap);
@@ -166,20 +168,11 @@ 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() {
-        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)
@@ -189,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);
     }
 
     /**
@@ -297,4 +289,18 @@ public class XMLParserConfiguration {
         newConfig.forceList = Collections.unmodifiableSet(cloneForceList);
         return newConfig;
     }
+
+    /**
+     * 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 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 XMLParserConfiguration withMaxNestingDepth(int maxNestingDepth) {
+        return super.withMaxNestingDepth(maxNestingDepth);
+    }
 }

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;
@@ -119,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));
@@ -369,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);
@@ -386,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);
@@ -461,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,
@@ -538,43 +551,75 @@ 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)));
+                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)));
+        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)));
+                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)));
+        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",
-                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));
 
+        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", 
+        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));
@@ -583,6 +628,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",
@@ -600,10 +652,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);
@@ -972,12 +1029,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);
@@ -986,9 +1043,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
@@ -1330,7 +1387,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);

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

@@ -833,4 +833,157 @@ public class JSONMLTest {
                     ex.getMessage());
         }
     }
+
+    @Test
+    public void testToJSONArrayMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
+
+        final int maxNestingDepth = 42;
+
+        try {
+            JSONML.toJSONArray(wayTooLongMalformedXML, JSONMLParserConfiguration.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, JSONMLParserConfiguration.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, 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 JSONMLParserConfiguration used");
+        }
+    }
+
+
+    @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
+    public void testToJSONObjectMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
+
+        final int maxNestingDepth = 42;
+
+        try {
+            JSONML.toJSONObject(wayTooLongMalformedXML, JSONMLParserConfiguration.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 testToJSONObjectMaxNestingDepthIsRespectedWithValidXML() {
+        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, JSONMLParserConfiguration.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 testToJSONObjectMaxNestingDepthWithValidFittingXML() {
+        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, 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 JSONMLParserConfiguration used");
+        }
+    }
+
 }

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

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

@@ -0,0 +1,150 @@
+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:0050}", 1},
+            {"{value:0050.0000}", 1},
+            {"{value:-0050}", -1},
+            {"{value:-0050.0000}", -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:-0005e1}", -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 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"));
+    }
+}

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

@@ -4,11 +4,13 @@ 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;
 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;
@@ -54,7 +56,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;
@@ -206,13 +207,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);
     }
     
@@ -231,6 +236,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;
@@ -299,12 +309,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
@@ -565,13 +575,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
@@ -621,9 +631,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);
     }
 
@@ -773,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) {}
 
@@ -805,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) {}
 
@@ -830,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]+
@@ -866,9 +876,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!"));
@@ -883,7 +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", NaN)));
         assertTrue("opt negZeroKey should be a Double", 
                 jsonObject.opt("negZeroKey") instanceof Double);
         assertTrue("get negZeroKey should be a Double", 
@@ -896,6 +912,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 +924,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 +946,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",
@@ -969,7 +1001,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.
          */
@@ -979,13 +1011,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")));
     }
@@ -1033,12 +1065,21 @@ 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,"+
+                "\"doubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":0000000.1d,"+
+                "\"negativeDoubleIdentifierWithMultipleLeadingZerosBeforeDecimal\":-0000000.1d,"+
+                "\"doubleIdentifierWithMultipleLeadingZerosAfterDecimal\":0000000.0001d,"+
+                "\"negativeDoubleIdentifierWithMultipleLeadingZerosAfterDecimal\":-0000000.0001d,"+
+                "\"integerWithLeadingZeros\":000900,"+
+                "\"integerWithAllZeros\":00000,"+
+                "\"compositeWithLeadingZeros\":00800.90d,"+
+                "\"decimalPositiveWithoutNumberBeforeDecimalPoint\":.90,"+
             "}";
         JSONObject jsonObject = new JSONObject(str);
         Object obj;
@@ -1048,17 +1089,24 @@ 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"));
         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",
@@ -1067,6 +1115,53 @@ 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);
     }
 
@@ -1232,8 +1327,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); 
@@ -1686,19 +1781,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);
@@ -1942,7 +2037,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);
 
@@ -2013,14 +2108,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);
@@ -2058,7 +2153,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));
 
@@ -2085,9 +2180,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
@@ -2098,7 +2193,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
@@ -2198,6 +2293,51 @@ 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",
+                "Missing value at 1 [character 2 line 1]",
+                e.getMessage());
+        }
+        try {
+            // key is a nested array containing a map
+            String str = "{\"a\": 1, [{\"foo\": \"bar\"}]: \"baz\"}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Missing value at 9 [character 10 line 1]",
+                e.getMessage());
+        }
+        try {
+            // key contains }
+            String str = "{foo}: 2}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Expected a ':' after a key at 5 [character 6 line 1]",
+                e.getMessage());
+        }
+        try {
+            // key contains ]
+            String str = "{foo]: 2}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                "Expected a ':' after a key at 5 [character 6 line 1]",
+                e.getMessage());
+        }
+        try {
+            // \0 after ,
+            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+                    e.getMessage());
+        }
         try {
             // append to wrong key
             String str = "{\"myKey\":true, \"myOtherKey\":false}";
@@ -2252,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);
@@ -2465,20 +2605,32 @@ 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 ",
                 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",
                 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,20 +2654,32 @@ 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 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 ",
                 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 +2694,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 +2725,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);
@@ -3166,7 +3348,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"));
@@ -3215,6 +3397,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 + "}]");
@@ -3509,4 +3692,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));
+        }
+    }
 }

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

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

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

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

@@ -1052,6 +1052,29 @@ public class XMLConfigurationTest {
         Util.compareActualVsExpectedJsonObjects(jsonObject, expetedJsonObject);
     }
 
+    @Test
+    public void testMaxNestingDepthIsSet() {
+        XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL;
+
+        assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.DEFAULT_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,
      * convert to JSONObject and compare actual to expected result.

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.Charset;
 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;
@@ -921,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 {
@@ -1049,4 +1044,262 @@ public class XMLTest {
             fail("Expected to be unable to modify the config");
         } catch (Exception ignored) { }
     }
+
+    @Test
+    public void testIndentComplicatedJsonObject(){
+        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 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" +
+                " <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";
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
+
+
+    }
+    @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);
+        JSONObject actualJsonObject = XML.toJSONObject(actual);
+        String expected = "<Test>\n" +
+                "  <employee>\n" +
+                "    <name>sonoo</name>\n" +
+                "    <salary>56000</salary>\n" +
+                "    <married>true</married>\n" +
+                "  </employee>\n" +
+                "</Test>\n";
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
+    }
+
+    @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);
+        JSONObject actualJsonObject = XML.toJSONObject(actual);
+        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";
+        JSONObject expectedJsonObject = XML.toJSONObject(expected);
+        assertTrue(expectedJsonObject.similar(actualJsonObject));
+
+
+    }
+
+    @Test
+    public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
+        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());
+        }
+    }
+
+    @Test
+    public void testMaxNestingDepthOf42IsRespected() {
+        final String wayTooLongMalformedXML = new String(new char[6000]).replace("\0", "<a>");
+
+        final int maxNestingDepth = 42;
+
+        try {
+            XML.toJSONObject(wayTooLongMalformedXML, XMLParserConfiguration.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 {
+            XML.toJSONObject(perfectlyFineXML, XMLParserConfiguration.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 {
+            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");
+        }
+    }
 }
+
+
+

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

src/test/resources/Issue593.json

@@ -0,0 +1,704 @@
+{
+ "success": true,
+ "error": null,
+ "response": [
+  {
+   "loc": {
+    "long": 31.25,
+    "lat": 30.063
+   },
+   "interval": "day",
+   "place": {
+    "name": "cairo",
+    "state": "qh",
+    "country": "eg"
+   },
+   "periods": [
+    {
+     "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"
+    },
+    {
+     "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"
+    }
+   ],
+   "profile": {
+    "tz": "Africa/Cairo",
+    "elevM": 23,
+    "elevFT": 75
+   }
+  }
+ ]
+}

src/test/resources/Issue593.xml

@@ -0,0 +1,691 @@
+<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>