diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index f86075e..a108a55 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -18,11 +18,10 @@ import java.util.Map;
 
 
 /**
- * A JSONArray is an ordered sequence of values. Its external text form is a
- * string wrapped in square brackets with commas separating the values. The
- * internal form is an object having <code>get</code> and <code>opt</code>
- * methods for accessing the values by index, and <code>put</code> methods for
- * adding or replacing values. The values can be any of these types:
+ * A JSONArray is an ordered sequence of values. Its external text form is a string wrapped in square brackets with
+ * commas separating the values. The internal form is an object having <code>get</code> and <code>opt</code> methods for
+ * accessing the values by index, and <code>put</code> methods for adding or replacing values. The values can be any of
+ * these types:
  * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
  * <code>Number</code>, <code>String</code>, or the
  * <code>JSONObject.NULL object</code>.
@@ -30,19 +29,17 @@ import java.util.Map;
  * The constructor can convert a JSON text into a Java object. The
  * <code>toString</code> method converts to JSON text.
  * <p>
- * A <code>get</code> method returns a value if one can be found, and throws an
- * exception if one cannot be found. An <code>opt</code> method returns a
- * default value instead of throwing an exception, and so is useful for
- * obtaining optional values.
+ * A <code>get</code> method returns a value if one can be found, and throws an exception if one cannot be found. An
+ * <code>opt</code> method returns a default value instead of throwing an exception, and so is useful for obtaining
+ * optional values.
  * <p>
- * The generic <code>get()</code> and <code>opt()</code> methods return an
- * object which you can cast or query for type. There are also typed
+ * The generic <code>get()</code> and <code>opt()</code> methods return an object which you can cast or query for type.
+ * There are also typed
  * <code>get</code> and <code>opt</code> methods that do type checking and type
  * coercion for you.
  * <p>
- * The texts produced by the <code>toString</code> methods strictly conform to
- * JSON syntax rules. The constructors are more forgiving in the texts they will
- * accept:
+ * The texts produced by the <code>toString</code> methods strictly conform to JSON syntax rules. The constructors are
+ * more forgiving in the texts they will accept:
  * <ul>
  * <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just
  * before the closing bracket.</li>
@@ -76,19 +73,29 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Construct a JSONArray from a JSONTokener.
+     * Constructs a JSONArray from a JSONTokener.
+     * <p>
+     * This constructor reads the JSONTokener to parse a JSON array. It uses the default JSONParserConfiguration.
      *
-     * @param x
-     *            A JSONTokener
-     * @throws JSONException
-     *             If there is a syntax error.
+     * @param x A JSONTokener
+     * @throws JSONException If there is a syntax error.
      */
     public JSONArray(JSONTokener x) throws JSONException {
+        this(x, new JSONParserConfiguration());
+    }
+
+    /**
+     * Construct a JSONArray from a JSONTokener.
+     *
+     * @param x A JSONTokener
+     * @throws JSONException If there is a syntax error.
+     */
+    public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
         if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
-        
+
         char nextChar = x.nextClean();
         if (nextChar == 0) {
             // array is unclosed. No ']' found, instead EOF
@@ -105,24 +112,31 @@ public class JSONArray implements Iterable<Object> {
                     this.myArrayList.add(x.nextValue());
                 }
                 switch (x.nextClean()) {
-                case 0:
-                    // array is unclosed. No ']' found, instead EOF
-                    throw x.syntaxError("Expected a ',' or ']'");
-                case ',':
-                    nextChar = x.nextClean();
-                    if (nextChar == 0) {
+                    case 0:
                         // array is unclosed. No ']' found, instead EOF
                         throw x.syntaxError("Expected a ',' or ']'");
-                    }
-                    if (nextChar == ']') {
+                    case ',':
+                        nextChar = x.nextClean();
+                        if (nextChar == 0) {
+                            // array is unclosed. No ']' found, instead EOF
+                            throw x.syntaxError("Expected a ',' or ']'");
+                        }
+                        if (nextChar == ']') {
+                            return;
+                        }
+                        x.back();
+                        break;
+                    case ']':
+                        if (jsonParserConfiguration.isStrictMode()) {
+                            nextChar = x.nextClean();
+                            if (nextChar != 0) {
+                                throw x.syntaxError("invalid character found after end of array: " + nextChar);
+                            }
+                        }
+
                         return;
-                    }
-                    x.back();
-                    break;
-                case ']':
-                    return;
-                default:
-                    throw x.syntaxError("Expected a ',' or ']'");
+                    default:
+                        throw x.syntaxError("Expected a ',' or ']'");
                 }
             }
         }
@@ -131,34 +145,32 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray from a source JSON text.
      *
-     * @param source
-     *            A string that begins with <code>[</code>&nbsp;<small>(left
-     *            bracket)</small> and ends with <code>]</code>
-     *            &nbsp;<small>(right bracket)</small>.
-     * @throws JSONException
-     *             If there is a syntax error.
+     * @param source A string that begins with <code>[</code>&nbsp;<small>(left bracket)</small> and ends with
+     *               <code>]</code> &nbsp;<small>(right bracket)</small>.
+     * @throws JSONException If there is a syntax error.
      */
     public JSONArray(String source) throws JSONException {
-        this(new JSONTokener(source));
+        this(new JSONTokener(source), new JSONParserConfiguration());
+    }
+
+    public JSONArray(String source, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+        this(new JSONTokener(source), jsonParserConfiguration);
     }
 
     /**
      * Construct a JSONArray from a Collection.
      *
-     * @param collection
-     *            A Collection.
+     * @param collection A Collection.
      */
     public JSONArray(Collection<?> collection) {
-      this(collection, 0, new JSONParserConfiguration());
+        this(collection, 0, new JSONParserConfiguration());
     }
 
     /**
      * Construct a JSONArray from a Collection.
      *
-     * @param collection
-     *            A Collection.
-     * @param jsonParserConfiguration
-     *            Configuration object for the JSON parser
+     * @param collection              A Collection.
+     * @param jsonParserConfiguration Configuration object for the JSON parser
      */
     public JSONArray(Collection<?> collection, JSONParserConfiguration jsonParserConfiguration) {
         this(collection, 0, jsonParserConfiguration);
@@ -167,16 +179,14 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray from a collection with recursion depth.
      *
-     * @param collection
-     *             A Collection.
-     * @param recursionDepth
-     *             Variable for tracking the count of nested object creations.
-     * @param jsonParserConfiguration
-     *             Configuration object for the JSON parser
+     * @param collection              A Collection.
+     * @param recursionDepth          Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration Configuration object for the JSON parser
      */
     JSONArray(Collection<?> collection, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
         if (recursionDepth > jsonParserConfiguration.getMaxNestingDepth()) {
-          throw new JSONException("JSONArray has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
+            throw new JSONException(
+                "JSONArray has reached recursion depth limit of " + jsonParserConfiguration.getMaxNestingDepth());
         }
         if (collection == null) {
             this.myArrayList = new ArrayList<Object>();
@@ -189,8 +199,7 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray from an Iterable. This is a shallow copy.
      *
-     * @param iter
-     *            A Iterable collection.
+     * @param iter A Iterable collection.
      */
     public JSONArray(Iterable<?> iter) {
         this();
@@ -203,8 +212,7 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray from another JSONArray. This is a shallow copy.
      *
-     * @param array
-     *            A array.
+     * @param array A array.
      */
     public JSONArray(JSONArray array) {
         if (array == null) {
@@ -219,20 +227,15 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray from an array.
      *
-     * @param array
-     *            Array. If the parameter passed is null, or not an array, an
-     *            exception will be thrown.
-     *
-     * @throws JSONException
-     *            If not an array or if an array value is non-finite number.
-     * @throws NullPointerException
-     *            Thrown if the array parameter is null.
+     * @param array Array. If the parameter passed is null, or not an array, an exception will be thrown.
+     * @throws JSONException        If not an array or if an array value is non-finite number.
+     * @throws NullPointerException Thrown if the array parameter is null.
      */
     public JSONArray(Object array) throws JSONException {
         this();
         if (!array.getClass().isArray()) {
             throw new JSONException(
-                    "JSONArray initial value should be a string or collection or array.");
+                "JSONArray initial value should be a string or collection or array.");
         }
         this.addAll(array, true, 0);
     }
@@ -240,17 +243,15 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Construct a JSONArray with the specified initial capacity.
      *
-     * @param initialCapacity
-     *            the initial capacity of the JSONArray.
-     * @throws JSONException
-     *             If the initial capacity is negative.
+     * @param initialCapacity the initial capacity of the JSONArray.
+     * @throws JSONException If the initial capacity is negative.
      */
     public JSONArray(int initialCapacity) throws JSONException {
-    	if (initialCapacity < 0) {
+        if (initialCapacity < 0) {
             throw new JSONException(
-                    "JSONArray initial capacity cannot be negative.");
-    	}
-    	this.myArrayList = new ArrayList<Object>(initialCapacity);
+                "JSONArray initial capacity cannot be negative.");
+        }
+        this.myArrayList = new ArrayList<Object>(initialCapacity);
     }
 
     @Override
@@ -261,11 +262,9 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the object value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return An object value.
-     * @throws JSONException
-     *             If there is no value for the index.
+     * @throws JSONException If there is no value for the index.
      */
     public Object get(int index) throws JSONException {
         Object object = this.opt(index);
@@ -276,25 +275,21 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the boolean value associated with an index. The string values "true"
-     * and "false" are converted to boolean.
+     * Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The truth.
-     * @throws JSONException
-     *             If there is no value for the index or if the value is not
-     *             convertible to boolean.
+     * @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
      */
     public boolean getBoolean(int index) throws JSONException {
         Object object = this.get(index);
         if (object.equals(Boolean.FALSE)
-                || (object instanceof String && ((String) object)
-                        .equalsIgnoreCase("false"))) {
+            || (object instanceof String && ((String) object)
+            .equalsIgnoreCase("false"))) {
             return false;
         } else if (object.equals(Boolean.TRUE)
-                || (object instanceof String && ((String) object)
-                        .equalsIgnoreCase("true"))) {
+            || (object instanceof String && ((String) object)
+            .equalsIgnoreCase("true"))) {
             return true;
         }
         throw wrongValueFormatException(index, "boolean", object, null);
@@ -303,17 +298,14 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the double value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a number.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
     public double getDouble(int index) throws JSONException {
         final Object object = this.get(index);
-        if(object instanceof Number) {
-            return ((Number)object).doubleValue();
+        if (object instanceof Number) {
+            return ((Number) object).doubleValue();
         }
         try {
             return Double.parseDouble(object.toString());
@@ -325,17 +317,15 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the float value associated with a key.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The numeric value.
-     * @throws JSONException
-     *             if the key is not found or if the value is not a Number
-     *             object and cannot be converted to a number.
+     * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
+     *                       number.
      */
     public float getFloat(int index) throws JSONException {
         final Object object = this.get(index);
-        if(object instanceof Number) {
-            return ((Number)object).floatValue();
+        if (object instanceof Number) {
+            return ((Number) object).floatValue();
         }
         try {
             return Float.parseFloat(object.toString());
@@ -347,18 +337,16 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the Number value associated with a key.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The numeric value.
-     * @throws JSONException
-     *             if the key is not found or if the value is not a Number
-     *             object and cannot be converted to a number.
+     * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
+     *                       number.
      */
     public Number getNumber(int index) throws JSONException {
         Object object = this.get(index);
         try {
             if (object instanceof Number) {
-                return (Number)object;
+                return (Number) object;
             }
             return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
@@ -368,47 +356,38 @@ public class JSONArray implements Iterable<Object> {
 
     /**
      * Get the enum value associated with an index.
-     * 
-     * @param <E>
-     *            Enum Type
-     * @param clazz
-     *            The type of enum to retrieve.
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     *
+     * @param <E>   Enum Type
+     * @param clazz The type of enum to retrieve.
+     * @param index The index must be between 0 and length() - 1.
      * @return The enum value at the index location
-     * @throws JSONException
-     *            if the key is not found or if the value cannot be converted
-     *            to an enum.
+     * @throws JSONException if the key is not found or if the value cannot be converted to an enum.
      */
     public <E extends Enum<E>> E getEnum(Class<E> clazz, int index) throws JSONException {
         E val = optEnum(clazz, index);
-        if(val==null) {
+        if (val == null) {
             // JSONException should really take a throwable argument.
             // If it did, I would re-implement this with the Enum.valueOf
             // method and place any thrown exception in the JSONException
             throw wrongValueFormatException(index, "enum of type "
-                    + JSONObject.quote(clazz.getSimpleName()), opt(index), null);
+                + JSONObject.quote(clazz.getSimpleName()), opt(index), null);
         }
         return val;
     }
 
     /**
-     * Get the BigDecimal value associated with an index. If the value is float
-     * or double, the {@link BigDecimal#BigDecimal(double)} constructor
-     * will be used. See notes on the constructor for conversion issues that
-     * may arise.
+     * Get the BigDecimal value associated with an index. If the value is float or double, the
+     * {@link BigDecimal#BigDecimal(double)} constructor will be used. See notes on the constructor for conversion
+     * issues that may arise.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a BigDecimal.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a BigDecimal.
      */
-    public BigDecimal getBigDecimal (int index) throws JSONException {
+    public BigDecimal getBigDecimal(int index) throws JSONException {
         Object object = this.get(index);
         BigDecimal val = JSONObject.objectToBigDecimal(object, null);
-        if(val == null) {
+        if (val == null) {
             throw wrongValueFormatException(index, "BigDecimal", object, null);
         }
         return val;
@@ -417,17 +396,14 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the BigInteger value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a BigInteger.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a BigInteger.
      */
-    public BigInteger getBigInteger (int index) throws JSONException {
+    public BigInteger getBigInteger(int index) throws JSONException {
         Object object = this.get(index);
         BigInteger val = JSONObject.objectToBigInteger(object, null);
-        if(val == null) {
+        if (val == null) {
             throw wrongValueFormatException(index, "BigInteger", object, null);
         }
         return val;
@@ -436,16 +412,14 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the int value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value is not a number.
+     * @throws JSONException If the key is not found or if the value is not a number.
      */
     public int getInt(int index) throws JSONException {
         final Object object = this.get(index);
-        if(object instanceof Number) {
-            return ((Number)object).intValue();
+        if (object instanceof Number) {
+            return ((Number) object).intValue();
         }
         try {
             return Integer.parseInt(object.toString());
@@ -457,12 +431,9 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the JSONArray associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return A JSONArray value.
-     * @throws JSONException
-     *             If there is no value for the index. or if the value is not a
-     *             JSONArray
+     * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
      */
     public JSONArray getJSONArray(int index) throws JSONException {
         Object object = this.get(index);
@@ -475,12 +446,9 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the JSONObject associated with an index.
      *
-     * @param index
-     *            subscript
+     * @param index subscript
      * @return A JSONObject value.
-     * @throws JSONException
-     *             If there is no value for the index or if the value is not a
-     *             JSONObject
+     * @throws JSONException If there is no value for the index or if the value is not a JSONObject
      */
     public JSONObject getJSONObject(int index) throws JSONException {
         Object object = this.get(index);
@@ -493,17 +461,14 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the long value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a number.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
     public long getLong(int index) throws JSONException {
         final Object object = this.get(index);
-        if(object instanceof Number) {
-            return ((Number)object).longValue();
+        if (object instanceof Number) {
+            return ((Number) object).longValue();
         }
         try {
             return Long.parseLong(object.toString());
@@ -515,11 +480,9 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the string associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return A string value.
-     * @throws JSONException
-     *             If there is no string value for the index.
+     * @throws JSONException If there is no string value for the index.
      */
     public String getString(int index) throws JSONException {
         Object object = this.get(index);
@@ -532,8 +495,7 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Determine if the value is <code>null</code>.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return true if the value at the index is <code>null</code>, or if there is no value.
      */
     public boolean isNull(int index) {
@@ -545,24 +507,22 @@ public class JSONArray implements Iterable<Object> {
      * <code>separator</code> string is inserted between each element. Warning:
      * This method assumes that the data structure is acyclical.
      *
-     * @param separator
-     *            A string that will be inserted between the elements.
+     * @param separator A string that will be inserted between the elements.
      * @return a string.
-     * @throws JSONException
-     *             If the array contains an invalid number.
+     * @throws JSONException If the array contains an invalid number.
      */
     public String join(String separator) throws JSONException {
         int len = this.length();
         if (len == 0) {
             return "";
         }
-        
+
         StringBuilder sb = new StringBuilder(
-                   JSONObject.valueToString(this.myArrayList.get(0)));
+            JSONObject.valueToString(this.myArrayList.get(0)));
 
         for (int i = 1; i < len; i++) {
             sb.append(separator)
-              .append(JSONObject.valueToString(this.myArrayList.get(i)));
+                .append(JSONObject.valueToString(this.myArrayList.get(i)));
         }
         return sb.toString();
     }
@@ -577,8 +537,7 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Removes all of the elements from this JSONArray.
-     * The JSONArray will be empty after this call returns.
+     * Removes all of the elements from this JSONArray. The JSONArray will be empty after this call returns.
      */
     public void clear() {
         this.myArrayList.clear();
@@ -587,22 +546,19 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Get the optional object value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1. If not, null is returned.
+     * @param index The index must be between 0 and length() - 1. If not, null is returned.
      * @return An object value, or null if there is no object at that index.
      */
     public Object opt(int index) {
         return (index < 0 || index >= this.length()) ? null : this.myArrayList
-                .get(index);
+            .get(index);
     }
 
     /**
-     * Get the optional boolean value 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".
+     * Get the optional boolean value 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The truth.
      */
     public boolean optBoolean(int index) {
@@ -610,14 +566,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional boolean value 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).
+     * Get the optional boolean value 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.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue A boolean default.
      * @return The truth.
      */
     public boolean optBoolean(int index, boolean defaultValue) {
@@ -629,12 +582,10 @@ 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".
+     * 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The truth.
      */
     public Boolean optBooleanObject(int index) {
@@ -642,14 +593,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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).
+     * 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.
+     * @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) {
@@ -661,12 +609,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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
-     * cannot be converted to a number.
+     * 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 cannot be converted to a number.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
      */
     public double optDouble(int index) {
@@ -674,14 +620,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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 value.
+     * @param index        subscript
+     * @param defaultValue The default value.
      * @return The value.
      */
     public double optDouble(int index, double defaultValue) {
@@ -697,12 +640,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The object.
      */
     public Double optDoubleObject(int index) {
@@ -710,14 +651,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index        subscript
+     * @param defaultValue The default object.
      * @return The object.
      */
     public Double optDoubleObject(int index, Double defaultValue) {
@@ -733,12 +671,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
      */
     public float optFloat(int index) {
@@ -746,14 +682,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
      *
-     * @param index
-     *            subscript
-     * @param defaultValue
-     *            The default value.
+     * @param index        subscript
+     * @param defaultValue The default value.
      * @return The value.
      */
     public float optFloat(int index, float defaultValue) {
@@ -769,12 +702,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The object.
      */
     public Float optFloatObject(int index) {
@@ -782,14 +713,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index        subscript
+     * @param defaultValue The default object.
      * @return The object.
      */
     public Float optFloatObject(int index, Float defaultValue) {
@@ -805,12 +733,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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
-     * cannot be converted to a number.
+     * 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 cannot be converted to a number.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
      */
     public int optInt(int index) {
@@ -818,14 +744,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional int 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.
+     * Get the optional int 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
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      * @return The value.
      */
     public int optInt(int index, int defaultValue) {
@@ -837,12 +760,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The object.
      */
     public Integer optIntegerObject(int index) {
@@ -850,14 +771,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -870,13 +788,10 @@ public class JSONArray implements Iterable<Object> {
 
     /**
      * Get the enum value associated with a key.
-     * 
-     * @param <E>
-     *            Enum Type
-     * @param clazz
-     *            The type of enum to retrieve.
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     *
+     * @param <E>   Enum Type
+     * @param clazz The type of enum to retrieve.
+     * @param index The index must be between 0 and length() - 1.
      * @return The enum value at the index location or null if not found
      */
     public <E extends Enum<E>> E optEnum(Class<E> clazz, int index) {
@@ -885,17 +800,13 @@ public class JSONArray implements Iterable<Object> {
 
     /**
      * Get the enum value associated with a key.
-     * 
-     * @param <E>
-     *            Enum Type
-     * @param clazz
-     *            The type of enum to retrieve.
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default in case the value is not found
-     * @return The enum value at the index location or defaultValue if
-     *            the value is not found or cannot be assigned to clazz
+     *
+     * @param <E>          Enum Type
+     * @param clazz        The type of enum to retrieve.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default in case the value is not found
+     * @return The enum value at the index location or defaultValue if the value is not found or cannot be assigned to
+     * clazz
      */
     public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue) {
         try {
@@ -918,14 +829,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional BigInteger value associated with an index. The 
-     * defaultValue is returned if there is no value for the index, or if the 
-     * value is not a number and cannot be converted to a number.
+     * Get the optional BigInteger value associated with an index. The defaultValue is returned if there is no value for
+     * the index, or if the value is not a number and cannot be converted to a number.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      * @return The value.
      */
     public BigInteger optBigInteger(int index, BigInteger defaultValue) {
@@ -934,17 +842,13 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional BigDecimal value associated with an index. The 
-     * defaultValue is returned if there is no value for the index, or if the 
-     * value is not a number and cannot be converted to a number. If the value
-     * is float or double, the {@link BigDecimal#BigDecimal(double)}
-     * constructor will be used. See notes on the constructor for conversion
+     * Get the optional BigDecimal value associated with an index. The defaultValue is returned if there is no value for
+     * the index, or if the value is not a number and cannot be converted to a number. If the value is float or double,
+     * the {@link BigDecimal#BigDecimal(double)} constructor will be used. See notes on the constructor for conversion
      * issues that may arise.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      * @return The value.
      */
     public BigDecimal optBigDecimal(int index, BigDecimal defaultValue) {
@@ -953,11 +857,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return A JSONArray value.
      */
     public JSONArray optJSONArray(int index) {
@@ -965,13 +868,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -980,11 +881,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional JSONObject associated with an index. Null is returned if
-     * there is no value at that index or if the value is not a JSONObject.
+     * Get the optional JSONObject associated with an index. Null 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 index The index must be between 0 and length() - 1.
      * @return A JSONObject value.
      */
     public JSONObject optJSONObject(int index) {
@@ -992,13 +892,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -1007,12 +905,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional long 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
-     * cannot be converted to a number.
+     * Get the optional long 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 cannot be converted to a number.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return The value.
      */
     public long optLong(int index) {
@@ -1020,14 +916,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional long 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.
+     * Get the optional long 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
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      * @return The value.
      */
     public long optLong(int index, long defaultValue) {
@@ -1039,12 +932,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @param index The index must be between 0 and length() - 1.
      * @return The object.
      */
     public Long optLongObject(int index) {
@@ -1052,14 +943,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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.
+     * 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.
+     * @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) {
@@ -1071,13 +959,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * 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,
-     * an attempt will be made to evaluate it as a number ({@link BigDecimal}). This method
-     * would be used in cases where type coercion of the number value is unwanted.
+     * 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, an attempt will be made to evaluate it as a number
+     * ({@link BigDecimal}). This method would be used in cases where type coercion of the number value is unwanted.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return An object which is the value.
      */
     public Number optNumber(int index) {
@@ -1085,15 +971,12 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get an optional {@link Number} value 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 ({@link BigDecimal}). This method
-     * would be used in cases where type coercion of the number value is unwanted.
+     * Get an optional {@link Number} value 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
+     * ({@link BigDecimal}). This method would be used in cases where type coercion of the number value is unwanted.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default.
      * @return An object which is the value.
      */
     public Number optNumber(int index, Number defaultValue) {
@@ -1101,10 +984,10 @@ public class JSONArray implements Iterable<Object> {
         if (JSONObject.NULL.equals(val)) {
             return defaultValue;
         }
-        if (val instanceof Number){
+        if (val instanceof Number) {
             return (Number) val;
         }
-        
+
         if (val instanceof String) {
             try {
                 return JSONObject.stringToNumber((String) val);
@@ -1116,12 +999,10 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional string value associated with an index. It returns an
-     * empty string if there is no value at that index. If the value is not a
-     * string and is not null, then it is converted to a string.
+     * Get the optional string value associated with an index. It returns an empty string if there is no value at that
+     * index. If the value is not a string and is not null, then it is converted to a string.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
      * @return A String value.
      */
     public String optString(int index) {
@@ -1129,26 +1010,22 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Get the optional string associated with an index. The defaultValue is
-     * returned if the key is not found.
+     * Get the optional string associated with an index. The defaultValue is returned if the key is not found.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      * @return A String value.
      */
     public String optString(int index, String defaultValue) {
         Object object = this.opt(index);
         return JSONObject.NULL.equals(object) ? defaultValue : object
-                .toString();
+            .toString();
     }
 
     /**
      * Append a boolean value. This increases the array's length by one.
      *
-     * @param value
-     *            A boolean value.
+     * @param value A boolean value.
      * @return this.
      */
     public JSONArray put(boolean value) {
@@ -1156,14 +1033,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
+     * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
      *
-     * @param value
-     *            A Collection value.
+     * @param value A Collection value.
      * @return this.
-     * @throws JSONException
-     *            If the value is non-finite number.
+     * @throws JSONException If the value is non-finite number.
      */
     public JSONArray put(Collection<?> value) {
         return this.put(new JSONArray(value));
@@ -1172,24 +1046,20 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Append a double value. This increases the array's length by one.
      *
-     * @param value
-     *            A double value.
+     * @param value A double value.
      * @return this.
-     * @throws JSONException
-     *             if the value is not finite.
+     * @throws JSONException if the value is not finite.
      */
     public JSONArray put(double value) throws JSONException {
         return this.put(Double.valueOf(value));
     }
-    
+
     /**
      * Append a float value. This increases the array's length by one.
      *
-     * @param value
-     *            A float value.
+     * @param value A float value.
      * @return this.
-     * @throws JSONException
-     *             if the value is not finite.
+     * @throws JSONException if the value is not finite.
      */
     public JSONArray put(float value) throws JSONException {
         return this.put(Float.valueOf(value));
@@ -1198,8 +1068,7 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Append an int value. This increases the array's length by one.
      *
-     * @param value
-     *            An int value.
+     * @param value An int value.
      * @return this.
      */
     public JSONArray put(int value) {
@@ -1209,8 +1078,7 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Append an long value. This increases the array's length by one.
      *
-     * @param value
-     *            A long value.
+     * @param value A long value.
      * @return this.
      */
     public JSONArray put(long value) {
@@ -1218,16 +1086,12 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONObject which
-     * is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a JSONObject which is produced from a Map.
      *
-     * @param value
-     *            A Map value.
+     * @param value A Map value.
      * @return this.
-     * @throws JSONException
-     *            If a value in the map is non-finite number.
-     * @throws NullPointerException
-     *            If a key in the map is <code>null</code>
+     * @throws JSONException        If a value in the map is non-finite number.
+     * @throws NullPointerException If a key in the map is <code>null</code>
      */
     public JSONArray put(Map<?, ?> value) {
         return this.put(new JSONObject(value));
@@ -1236,13 +1100,10 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Append an object value. This increases the array's length by one.
      *
-     * @param value
-     *            An object value. The value should be a Boolean, Double,
-     *            Integer, JSONArray, JSONObject, Long, or String, or the
-     *            JSONObject.NULL object.
+     * @param value An object value. The value should be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or
+     *              String, or the JSONObject.NULL object.
      * @return this.
-     * @throws JSONException
-     *            If the value is non-finite number.
+     * @throws JSONException If the value is non-finite number.
      */
     public JSONArray put(Object value) {
         JSONObject.testValidity(value);
@@ -1251,121 +1112,90 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Put or replace a boolean value in the JSONArray. If the index is greater
-     * than the length of the JSONArray, then null elements will be added as
-     * necessary to pad it out.
+     * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A boolean value.
+     * @param index The subscript.
+     * @param value A boolean value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(int index, boolean value) throws JSONException {
         return this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
+     * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A Collection value.
+     * @param index The subscript.
+     * @param value A Collection value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is non-finite.
+     * @throws JSONException If the index is negative or if the value is non-finite.
      */
     public JSONArray put(int index, Collection<?> value) throws JSONException {
         return this.put(index, new JSONArray(value));
     }
 
     /**
-     * Put or replace a double value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace a double value. If the index is greater than the length of the JSONArray, then null elements will
+     * be added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A double value.
+     * @param index The subscript.
+     * @param value A double value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is non-finite.
+     * @throws JSONException If the index is negative or if the value is non-finite.
      */
     public JSONArray put(int index, double value) throws JSONException {
         return this.put(index, Double.valueOf(value));
     }
 
     /**
-     * Put or replace a float value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace a float value. If the index is greater than the length of the JSONArray, then null elements will
+     * be added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A float value.
+     * @param index The subscript.
+     * @param value A float value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is non-finite.
+     * @throws JSONException If the index is negative or if the value is non-finite.
      */
     public JSONArray put(int index, float value) throws JSONException {
         return this.put(index, Float.valueOf(value));
     }
 
     /**
-     * Put or replace an int value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            An int value.
+     * @param index The subscript.
+     * @param value An int value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(int index, int value) throws JSONException {
         return this.put(index, Integer.valueOf(value));
     }
 
     /**
-     * Put or replace a long value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A long value.
+     * @param index The subscript.
+     * @param value A long value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(int index, long value) throws JSONException {
         return this.put(index, Long.valueOf(value));
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONObject that
-     * is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            The Map value.
-     * @return
-     *             reference to self
-     * @throws JSONException
-     *             If the index is negative or if the value is an invalid
-     *             number.
-     * @throws NullPointerException
-     *             If a key in the map is <code>null</code>
+     * @param index The subscript.
+     * @param value The Map value.
+     * @return reference to self
+     * @throws JSONException        If the index is negative or if the value is an invalid number.
+     * @throws NullPointerException If a key in the map is <code>null</code>
      */
     public JSONArray put(int index, Map<?, ?> value) throws JSONException {
         this.put(index, new JSONObject(value, new JSONParserConfiguration()));
@@ -1373,40 +1203,29 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONObject that
-     * is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map.
      *
-     * @param index
-     *          The subscript
-     * @param value
-     *          The Map value.
-     * @param jsonParserConfiguration
-     *          Configuration object for the JSON parser
+     * @param index                   The subscript
+     * @param value                   The Map value.
+     * @param jsonParserConfiguration Configuration object for the JSON parser
      * @return reference to self
-     * @throws JSONException
-     *          If the index is negative or if the value is an invalid
-     *          number.
+     * @throws JSONException If the index is negative or if the value is an invalid number.
      */
-    public JSONArray put(int index, Map<?, ?> value, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+    public JSONArray put(int index, Map<?, ?> value, JSONParserConfiguration jsonParserConfiguration)
+        throws JSONException {
         this.put(index, new JSONObject(value, jsonParserConfiguration));
         return this;
     }
 
     /**
-     * Put or replace an object value in the JSONArray. If the index is greater
-     * than the length of the JSONArray, then null elements will be added as
-     * necessary to pad it out.
+     * Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            The value to put into the array. The value should be a
-     *            Boolean, Double, Integer, JSONArray, JSONObject, Long, or
-     *            String, or the JSONObject.NULL object.
+     * @param index The subscript.
+     * @param value The value to put into the array. The value should be a Boolean, Double, Integer, JSONArray,
+     *              JSONObject, Long, or String, or the JSONObject.NULL object.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is an invalid
-     *             number.
+     * @throws JSONException If the index is negative or if the value is an invalid number.
      */
     public JSONArray put(int index, Object value) throws JSONException {
         if (index < 0) {
@@ -1417,7 +1236,7 @@ public class JSONArray implements Iterable<Object> {
             this.myArrayList.set(index, value);
             return this;
         }
-        if(index == this.length()){
+        if (index == this.length()) {
             // simple append
             return this.put(value);
         }
@@ -1434,21 +1253,19 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Put a collection's elements in to the JSONArray.
      *
-     * @param collection
-     *            A Collection.
-     * @return this. 
+     * @param collection A Collection.
+     * @return this.
      */
     public JSONArray putAll(Collection<?> collection) {
         this.addAll(collection, false);
         return this;
     }
-    
+
     /**
      * Put an Iterable's elements in to the JSONArray.
      *
-     * @param iter
-     *            An Iterable.
-     * @return this. 
+     * @param iter An Iterable.
+     * @return this.
      */
     public JSONArray putAll(Iterable<?> iter) {
         this.addAll(iter, false);
@@ -1458,9 +1275,8 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Put a JSONArray's elements in to the JSONArray.
      *
-     * @param array
-     *            A JSONArray.
-     * @return this. 
+     * @param array A JSONArray.
+     * @return this.
      */
     public JSONArray putAll(JSONArray array) {
         // directly copy the elements from the source array to this one
@@ -1472,36 +1288,30 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Put an array's elements in to the JSONArray.
      *
-     * @param array
-     *            Array. If the parameter passed is null, or not an array or Iterable, an
-     *            exception will be thrown.
-     * @return this. 
-     *
-     * @throws JSONException
-     *            If not an array, JSONArray, Iterable or if an value is non-finite number.
-     * @throws NullPointerException
-     *            Thrown if the array parameter is null.
+     * @param array Array. If the parameter passed is null, or not an array or Iterable, an exception will be thrown.
+     * @return this.
+     * @throws JSONException        If not an array, JSONArray, Iterable or if an value is non-finite number.
+     * @throws NullPointerException Thrown if the array parameter is null.
      */
     public JSONArray putAll(Object array) throws JSONException {
         this.addAll(array, false);
         return this;
     }
-    
+
     /**
-     * Creates a JSONPointer using an initialization string and tries to 
-     * match it to an item within this JSONArray. For example, given a
-     * JSONArray initialized with this document:
+     * Creates a JSONPointer using an initialization string and tries to match it to an item within this JSONArray. For
+     * example, given a JSONArray initialized with this document:
      * <pre>
      * [
      *     {"b":"c"}
      * ]
      * </pre>
-     * and this JSONPointer string: 
+     * and this JSONPointer string:
      * <pre>
      * "/0/b"
      * </pre>
-     * Then this method will return the String "c"
-     * A JSONPointerException may be thrown from code called by this method.
+     * Then this method will return the String "c" A JSONPointerException may be thrown from code called by this
+     * method.
      *
      * @param jsonPointer string that can be used to create a JSONPointer
      * @return the item matched by the JSONPointer, otherwise null
@@ -1509,22 +1319,21 @@ public class JSONArray implements Iterable<Object> {
     public Object query(String jsonPointer) {
         return query(new JSONPointer(jsonPointer));
     }
-    
+
     /**
-     * Uses a user initialized JSONPointer  and tries to 
-     * match it to an item within this JSONArray. For example, given a
+     * Uses a user initialized JSONPointer  and tries to match it to an item within this JSONArray. For example, given a
      * JSONArray initialized with this document:
      * <pre>
      * [
      *     {"b":"c"}
      * ]
      * </pre>
-     * and this JSONPointer: 
+     * and this JSONPointer:
      * <pre>
      * "/0/b"
      * </pre>
-     * Then this method will return the String "c"
-     * A JSONPointerException may be thrown from code called by this method.
+     * Then this method will return the String "c" A JSONPointerException may be thrown from code called by this
+     * method.
      *
      * @param jsonPointer string that can be used to create a JSONPointer
      * @return the item matched by the JSONPointer, otherwise null
@@ -1532,23 +1341,23 @@ public class JSONArray implements Iterable<Object> {
     public Object query(JSONPointer jsonPointer) {
         return jsonPointer.queryFrom(this);
     }
-    
+
     /**
-     * Queries and returns a value from this object using {@code jsonPointer}, or
-     * returns null if the query fails due to a missing key.
-     * 
+     * Queries and returns a value from this object using {@code jsonPointer}, or returns null if the query fails due to
+     * a missing key.
+     *
      * @param jsonPointer the string representation of the JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
      */
     public Object optQuery(String jsonPointer) {
-    	return optQuery(new JSONPointer(jsonPointer));
+        return optQuery(new JSONPointer(jsonPointer));
     }
-    
+
     /**
-     * Queries and returns a value from this object using {@code jsonPointer}, or
-     * returns null if the query fails due to a missing key.
-     * 
+     * Queries and returns a value from this object using {@code jsonPointer}, or returns null if the query fails due to
+     * a missing key.
+     *
      * @param jsonPointer The JSON pointer
      * @return the queried value or {@code null}
      * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
@@ -1564,10 +1373,8 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Remove an index and close the hole.
      *
-     * @param index
-     *            The index of the element to be removed.
-     * @return The value that was associated with the index, or null if there
-     *         was no value.
+     * @param index The index of the element to be removed.
+     * @return The value that was associated with the index, or null if there was no value.
      */
     public Object remove(int index) {
         return index >= 0 && index < this.length()
@@ -1576,8 +1383,7 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Determine if two JSONArrays are similar.
-     * They must contain similar sequences.
+     * Determine if two JSONArrays are similar. They must contain similar sequences.
      *
      * @param other The other JSONArray
      * @return true if they are equal
@@ -1587,29 +1393,29 @@ public class JSONArray implements Iterable<Object> {
             return false;
         }
         int len = this.length();
-        if (len != ((JSONArray)other).length()) {
+        if (len != ((JSONArray) other).length()) {
             return false;
         }
         for (int i = 0; i < len; i += 1) {
             Object valueThis = this.myArrayList.get(i);
-            Object valueOther = ((JSONArray)other).myArrayList.get(i);
-            if(valueThis == valueOther) {
-            	continue;
+            Object valueOther = ((JSONArray) other).myArrayList.get(i);
+            if (valueThis == valueOther) {
+                continue;
             }
-            if(valueThis == null) {
-            	return false;
+            if (valueThis == null) {
+                return false;
             }
             if (valueThis instanceof JSONObject) {
-                if (!((JSONObject)valueThis).similar(valueOther)) {
+                if (!((JSONObject) valueThis).similar(valueOther)) {
                     return false;
                 }
             } else if (valueThis instanceof JSONArray) {
-                if (!((JSONArray)valueThis).similar(valueOther)) {
+                if (!((JSONArray) valueThis).similar(valueOther)) {
                     return false;
                 }
             } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
-                	return false;
+                if (!JSONObject.isNumberSimilar((Number) valueThis, (Number) valueOther)) {
+                    return false;
                 }
             } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
                 if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
@@ -1623,16 +1429,11 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Produce a JSONObject by combining a JSONArray of names with the values of
-     * this JSONArray.
+     * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
      *
-     * @param names
-     *            A JSONArray containing a list of key strings. These will be
-     *            paired with the values.
-     * @return A JSONObject, or null if there are no names or if this JSONArray
-     *         has no values.
-     * @throws JSONException
-     *             If any of the names are null.
+     * @param names A JSONArray containing a list of key strings. These will be paired with the values.
+     * @return A JSONObject, or null if there are no names or if this JSONArray has no values.
+     * @throws JSONException If any of the names are null.
      */
     public JSONObject toJSONObject(JSONArray names) throws JSONException {
         if (names == null || names.isEmpty() || this.isEmpty()) {
@@ -1646,16 +1447,14 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Make a JSON text of this JSONArray. For compactness, no unnecessary
-     * whitespace is added. If it is not possible to produce a syntactically
-     * correct JSON text then null will be returned instead. This could occur if
-     * the array contains an invalid number.
+     * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
+     * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
+     * contains an invalid number.
      * <p><b>
      * Warning: This method assumes that the data structure is acyclical.
      * </b>
      *
-     * @return a printable, displayable, transmittable representation of the
-     *         array.
+     * @return a printable, displayable, transmittable representation of the array.
      */
     @Override
     public String toString() {
@@ -1668,58 +1467,11 @@ public class JSONArray implements Iterable<Object> {
 
     /**
      * Make a pretty-printed JSON text of this JSONArray.
-     * 
+     *
      * <p>If <pre> {@code indentFactor > 0}</pre> and the {@link JSONArray} has only
      * one element, then the array will be output on a single line:
      * <pre>{@code [1]}</pre>
-     * 
-     * <p>If an array has 2 or more elements, then it will be output across
-     * multiple lines: <pre>{@code
-     * [
-     * 1,
-     * "value 2",
-     * 3
-     * ]
-     * }</pre>
-     * <p><b>
-     * Warning: This method assumes that the data structure is acyclical.
-     * </b>
-     * 
-     * @param indentFactor
-     *            The number of spaces to add to each level of indentation.
-     * @return a printable, displayable, transmittable representation of the
-     *         object, beginning with <code>[</code>&nbsp;<small>(left
-     *         bracket)</small> and ending with <code>]</code>
-     *         &nbsp;<small>(right bracket)</small>.
-     * @throws JSONException if a called function fails
-     */
-    @SuppressWarnings("resource")
-    public String toString(int indentFactor) throws JSONException {
-        StringWriter sw = new StringWriter();
-        return this.write(sw, indentFactor, 0).toString();
-    }
-
-    /**
-     * Write the contents of the JSONArray as JSON text to a writer. For
-     * compactness, no whitespace is added.
-     * <p><b>
-     * Warning: This method assumes that the data structure is acyclical.
-     *</b>
-     * @param writer the writer object
-     * @return The writer.
-     * @throws JSONException if a called function fails
-     */
-    public Writer write(Writer writer) throws JSONException {
-        return this.write(writer, 0, 0);
-    }
-
-    /**
-     * Write the contents of the JSONArray as JSON text to a writer.
-     * 
-     * <p>If <pre>{@code indentFactor > 0}</pre> and the {@link JSONArray} has only
-     * one element, then the array will be output on a single line:
-     * <pre>{@code [1]}</pre>
-     * 
+     *
      * <p>If an array has 2 or more elements, then it will be output across
      * multiple lines: <pre>{@code
      * [
@@ -1732,18 +1484,60 @@ public class JSONArray implements Iterable<Object> {
      * Warning: This method assumes that the data structure is acyclical.
      * </b>
      *
-     * @param writer
-     *            Writes the serialized JSON
-     * @param indentFactor
-     *            The number of spaces to add to each level of indentation.
-     * @param indent
-     *            The indentation of the top level.
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @return a printable, displayable, transmittable representation of the object, beginning with
+     * <code>[</code>&nbsp;<small>(left bracket)</small> and ending with <code>]</code> &nbsp;<small>(right
+     * bracket)</small>.
+     * @throws JSONException if a called function fails
+     */
+    @SuppressWarnings("resource")
+    public String toString(int indentFactor) throws JSONException {
+        StringWriter sw = new StringWriter();
+        return this.write(sw, indentFactor, 0).toString();
+    }
+
+    /**
+     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
+     * <p><b>
+     * Warning: This method assumes that the data structure is acyclical.
+     * </b>
+     *
+     * @param writer the writer object
+     * @return The writer.
+     * @throws JSONException if a called function fails
+     */
+    public Writer write(Writer writer) throws JSONException {
+        return this.write(writer, 0, 0);
+    }
+
+    /**
+     * Write the contents of the JSONArray as JSON text to a writer.
+     *
+     * <p>If <pre>{@code indentFactor > 0}</pre> and the {@link JSONArray} has only
+     * one element, then the array will be output on a single line:
+     * <pre>{@code [1]}</pre>
+     *
+     * <p>If an array has 2 or more elements, then it will be output across
+     * multiple lines: <pre>{@code
+     * [
+     * 1,
+     * "value 2",
+     * 3
+     * ]
+     * }</pre>
+     * <p><b>
+     * Warning: This method assumes that the data structure is acyclical.
+     * </b>
+     *
+     * @param writer       Writes the serialized JSON
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @param indent       The indentation of the top level.
      * @return The writer.
      * @throws JSONException if a called function fails or unable to write
      */
     @SuppressWarnings("resource")
     public Writer write(Writer writer, int indentFactor, int indent)
-            throws JSONException {
+        throws JSONException {
         try {
             boolean needsComma = false;
             int length = this.length();
@@ -1752,7 +1546,7 @@ public class JSONArray implements Iterable<Object> {
             if (length == 1) {
                 try {
                     JSONObject.writeValue(writer, this.myArrayList.get(0),
-                            indentFactor, indent);
+                        indentFactor, indent);
                 } catch (Exception e) {
                     throw new JSONException("Unable to write JSONArray value at index: 0", e);
                 }
@@ -1769,7 +1563,7 @@ public class JSONArray implements Iterable<Object> {
                     JSONObject.indent(writer, newIndent);
                     try {
                         JSONObject.writeValue(writer, this.myArrayList.get(i),
-                                indentFactor, newIndent);
+                            indentFactor, newIndent);
                     } catch (Exception e) {
                         throw new JSONException("Unable to write JSONArray value at index: " + i, e);
                     }
@@ -1788,9 +1582,8 @@ public class JSONArray implements Iterable<Object> {
     }
 
     /**
-     * Returns a java.util.List containing all of the elements in this array.
-     * If an element in the array is a JSONArray or JSONObject it will also
-     * be converted to a List and a Map respectively.
+     * Returns a java.util.List containing all of the elements in this array. If an element in the array is a JSONArray
+     * or JSONObject it will also be converted to a List and a Map respectively.
      * <p>
      * Warning: This method assumes that the data structure is acyclical.
      *
@@ -1824,22 +1617,20 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Add a collection's elements to the JSONArray.
      *
-     * @param collection
-     *            A Collection.
-     * @param wrap
-     *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
-     *            {@code false} to add the items directly
-     * @param recursionDepth
-     *            Variable for tracking the count of nested object creations.
+     * @param collection     A Collection.
+     * @param wrap           {@code true} to call {@link JSONObject#wrap(Object)} for each item, {@code false} to add
+     *                       the items directly
+     * @param recursionDepth Variable for tracking the count of nested object creations.
      */
-    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) {
+    private void addAll(Collection<?> collection, boolean wrap, int recursionDepth,
+        JSONParserConfiguration jsonParserConfiguration) {
         this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size());
         if (wrap) {
-            for (Object o: collection){
+            for (Object o : collection) {
                 this.put(JSONObject.wrap(o, recursionDepth + 1, jsonParserConfiguration));
             }
         } else {
-            for (Object o: collection){
+            for (Object o : collection) {
                 this.put(o);
             }
         }
@@ -1848,19 +1639,17 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Add an Iterable's elements to the JSONArray.
      *
-     * @param iter
-     *            An Iterable.
-     * @param wrap
-     *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
-     *            {@code false} to add the items directly
+     * @param iter An Iterable.
+     * @param wrap {@code true} to call {@link JSONObject#wrap(Object)} for each item, {@code false} to add the items
+     *             directly
      */
     private void addAll(Iterable<?> iter, boolean wrap) {
         if (wrap) {
-            for (Object o: iter){
+            for (Object o : iter) {
                 this.put(JSONObject.wrap(o));
             }
         } else {
-            for (Object o: iter){
+            for (Object o : iter) {
                 this.put(o);
             }
         }
@@ -1869,56 +1658,43 @@ public class JSONArray implements Iterable<Object> {
     /**
      * Add an array's elements to the JSONArray.
      *
-     * @param array
-     *          Array. If the parameter passed is null, or not an array,
-     *          JSONArray, Collection, or Iterable, an exception will be
-     *          thrown.
-     * @param wrap
-     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
-     *          {@code false} to add the items directly
-     * @throws JSONException
-     *          If not an array or if an array value is non-finite number.
+     * @param array Array. If the parameter passed is null, or not an array, JSONArray, Collection, or Iterable, an
+     *              exception will be thrown.
+     * @param wrap  {@code true} to call {@link JSONObject#wrap(Object)} for each item, {@code false} to add the items
+     *              directly
+     * @throws JSONException If not an array or if an array value is non-finite number.
      */
     private void addAll(Object array, boolean wrap) throws JSONException {
-      this.addAll(array, wrap, 0);
+        this.addAll(array, wrap, 0);
     }
 
     /**
      * Add an array's elements to the JSONArray.
      *
-     * @param array
-     *            Array. If the parameter passed is null, or not an array,
-     *            JSONArray, Collection, or Iterable, an exception will be
-     *            thrown.
-     * @param wrap
-     *          {@code true} to call {@link JSONObject#wrap(Object)} for each item,
-     *          {@code false} to add the items directly
-     * @param recursionDepth
-     *          Variable for tracking the count of nested object creations.
+     * @param array          Array. If the parameter passed is null, or not an array, JSONArray, Collection, or
+     *                       Iterable, an exception will be thrown.
+     * @param wrap           {@code true} to call {@link JSONObject#wrap(Object)} for each item, {@code false} to add
+     *                       the items directly
+     * @param recursionDepth Variable for tracking the count of nested object creations.
      */
     private void addAll(Object array, boolean wrap, int recursionDepth) {
         addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
     }
+
     /**
-     * Add an array's elements to the JSONArray.
-     *`
-     * @param array
-     *            Array. If the parameter passed is null, or not an array,
-     *            JSONArray, Collection, or Iterable, an exception will be
-     *            thrown.
-     * @param wrap
-     *            {@code true} to call {@link JSONObject#wrap(Object)} for each item,
-     *            {@code false} to add the items directly
-     * @param recursionDepth
-     *            Variable for tracking the count of nested object creations.
-     * @param jsonParserConfiguration
-     *            Variable to pass parser custom configuration for json parsing.
-     * @throws JSONException
-     *            If not an array or if an array value is non-finite number.
-     * @throws NullPointerException
-     *            Thrown if the array parameter is null.
+     * Add an array's elements to the JSONArray. `
+     *
+     * @param array                   Array. If the parameter passed is null, or not an array, JSONArray, Collection, or
+     *                                Iterable, an exception will be thrown.
+     * @param wrap                    {@code true} to call {@link JSONObject#wrap(Object)} for each item, {@code false}
+     *                                to add the items directly
+     * @param recursionDepth          Variable for tracking the count of nested object creations.
+     * @param jsonParserConfiguration Variable to pass parser custom configuration for json parsing.
+     * @throws JSONException        If not an array or if an array value is non-finite number.
+     * @throws NullPointerException Thrown if the array parameter is null.
      */
-    private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
+    private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserConfiguration jsonParserConfiguration)
+        throws JSONException {
         if (array.getClass().isArray()) {
             int length = Array.getLength(array);
             this.myArrayList.ensureCapacity(this.myArrayList.size() + length);
@@ -1935,43 +1711,44 @@ public class JSONArray implements Iterable<Object> {
             // use the built in array list `addAll` as all object
             // wrapping should have been completed in the original
             // JSONArray
-            this.myArrayList.addAll(((JSONArray)array).myArrayList);
+            this.myArrayList.addAll(((JSONArray) array).myArrayList);
         } else if (array instanceof Collection) {
-            this.addAll((Collection<?>)array, wrap, recursionDepth);
+            this.addAll((Collection<?>) array, wrap, recursionDepth);
         } else if (array instanceof Iterable) {
-            this.addAll((Iterable<?>)array, wrap);
+            this.addAll((Iterable<?>) array, wrap);
         } else {
             throw new JSONException(
-                    "JSONArray initial value should be a string or collection or array.");
+                "JSONArray initial value should be a string or collection or array.");
         }
     }
-    
+
     /**
      * Create a new JSONException in a common format for incorrect conversions.
-     * @param idx index of the item
+     *
+     * @param idx       index of the item
      * @param valueType the type of value being coerced to
-     * @param cause optional cause of the coercion failure
+     * @param cause     optional cause of the coercion failure
      * @return JSONException that can be thrown.
      */
     private static JSONException wrongValueFormatException(
-            int idx,
-            String valueType,
-            Object value,
-            Throwable cause) {
-        if(value == null) {
+        int idx,
+        String valueType,
+        Object value,
+        Throwable cause) {
+        if (value == null) {
             return new JSONException(
-                    "JSONArray[" + idx + "] is not a " + valueType + " (null)."
-                    , cause);
+                "JSONArray[" + idx + "] is not a " + valueType + " (null)."
+                , cause);
         }
         // don't try to toString collections or known object types that could be large.
-        if(value instanceof Map || value instanceof Iterable || value instanceof JSONObject) {
+        if (value instanceof Map || value instanceof Iterable || value instanceof JSONObject) {
             return new JSONException(
-                    "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + ")."
-                    , cause);
+                "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + ")."
+                , cause);
         }
         return new JSONException(
-                "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + " : " + value + ")."
-                , cause);
+            "JSONArray[" + idx + "] is not a " + valueType + " (" + value.getClass() + " : " + value + ")."
+            , cause);
     }
 
 }
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
index 509b988..b4cf2cb 100644
--- a/src/test/java/org/json/junit/JSONParserConfigurationTest.java
+++ b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -1,14 +1,19 @@
 package org.json.junit;
 
+import java.util.Arrays;
+import java.util.List;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONParserConfiguration;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 public class JSONParserConfigurationTest {
+
     private static final String TEST_SOURCE = "{\"key\": \"value1\", \"key\": \"value2\"}";
 
     @Test(expected = JSONException.class)
@@ -19,16 +24,30 @@ public class JSONParserConfigurationTest {
     @Test
     public void testOverwrite() {
         JSONObject jsonObject = new JSONObject(TEST_SOURCE,
-                new JSONParserConfiguration().withOverwriteDuplicateKey(true));
+            new JSONParserConfiguration().withOverwriteDuplicateKey(true));
 
         assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));
     }
 
+    @Test
+    public void givenInvalidInputArrays_testStrictModeTrue_shouldThrowJsonException() {
+        List<String> strictModeInputTestCases = Arrays.asList("[1,2];[3,4]", "", "[1, 2,3]:[4,5]"/*, "[{test: implied}]"*/);
+        JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
+            .withStrictMode(true);
+
+        strictModeInputTestCases.forEach(testCase -> {
+            System.out.println("Test case: " + testCase);
+            assertThrows("expected non-compliant array but got instead: " + testCase, JSONException.class,
+                () -> new JSONArray(testCase, jsonParserConfiguration));
+            System.out.println("Passed");
+        });
+    }
+
     @Test
     public void verifyDuplicateKeyThenMaxDepth() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withOverwriteDuplicateKey(true)
-                .withMaxNestingDepth(42);
+            .withOverwriteDuplicateKey(true)
+            .withMaxNestingDepth(42);
 
         assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());
         assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
@@ -37,8 +56,8 @@ public class JSONParserConfigurationTest {
     @Test
     public void verifyMaxDepthThenDuplicateKey() {
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration()
-                .withMaxNestingDepth(42)
-                .withOverwriteDuplicateKey(true);
+            .withMaxNestingDepth(42)
+            .withOverwriteDuplicateKey(true);
 
         assertTrue(jsonParserConfiguration.isOverwriteDuplicateKey());
         assertEquals(42, jsonParserConfiguration.getMaxNestingDepth());