updating fork

CDL.java

@@ -41,7 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
  * The names for the elements in the JSONObjects can be taken from the names
  * in the first row.
  * @author JSON.org
- * @version 2015-05-01
+ * @version 2016-05-01
  */
 public class CDL {
 
@@ -69,7 +69,12 @@ private static String getValue(JSONTokener x) throws JSONException {
             for (;;) {
                 c = x.next();
                 if (c == q) {
-                    break;
+                    //Handle escaped double-quote
+                    if(x.next() != '\"')
+                    {
+                        x.back();
+                        break;
+                    }
                 }
                 if (c == 0 || c == '\n' || c == '\r') {
                     throw x.syntaxError("Missing close quote '" + q + "'.");

Cookie.java

@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  * Convert a web browser cookie specification to a JSONObject and back.
  * JSON and Cookies are both notations for name/value pairs.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class Cookie {
 

CookieList.java

@@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Convert a web browser cookie list string to a JSONObject and back.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class CookieList {
 

HTTP.java

@@ -25,11 +25,12 @@ of this software and associated documentation files (the "Software"), to deal
 */
 
 import java.util.Iterator;
+import java.util.Locale;
 
 /**
  * Convert an HTTP header to a JSONObject and back.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class HTTP {
 
@@ -74,7 +75,7 @@ public static JSONObject toJSONObject(String string) throws JSONException {
         String         token;
 
         token = x.nextToken();
-        if (token.toUpperCase().startsWith("HTTP")) {
+        if (token.toUpperCase(Locale.ROOT).startsWith("HTTP")) {
 
 // Response
 

HTTPTokener.java

@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  * The HTTPTokener extends the JSONTokener to provide additional methods
  * for the parsing of HTTP headers.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class HTTPTokener extends JSONTokener {
 

JSONArray.java

@@ -28,10 +28,12 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Array;
-import java.math.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -76,7 +78,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2015-07-22
+ * @version 2016-08/15
  */
 public class JSONArray implements Iterable<Object> {
 
@@ -151,13 +153,12 @@ public JSONArray(String source) throws JSONException {
      * @param collection
      *            A Collection.
      */
-    public JSONArray(Collection<Object> collection) {
+    public JSONArray(Collection<?> collection) {
         this.myArrayList = new ArrayList<Object>();
         if (collection != null) {
-            Iterator<Object> iter = collection.iterator();
-            while (iter.hasNext()) {
-                this.myArrayList.add(JSONObject.wrap(iter.next()));
-            }
+        	for (Object o: collection){
+        		this.myArrayList.add(JSONObject.wrap(o));
+        	}
         }
     }
 
@@ -594,7 +595,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue)
                 return myE;
             }
             return Enum.valueOf(clazz, val.toString());
-        } catch (IllegalArgumentException | NullPointerException e) {
+        } catch (IllegalArgumentException e) {
+            return defaultValue;
+        } catch (NullPointerException e) {
             return defaultValue;
         }
     }
@@ -746,7 +749,7 @@ public JSONArray put(boolean value) {
      *            A Collection value.
      * @return this.
      */
-    public JSONArray put(Collection<Object> value) {
+    public JSONArray put(Collection<?> value) {
         this.put(new JSONArray(value));
         return this;
     }
@@ -799,7 +802,7 @@ public JSONArray put(long value) {
      *            A Map value.
      * @return this.
      */
-    public JSONArray put(Map<String, Object> value) {
+    public JSONArray put(Map<?, ?> value) {
         this.put(new JSONObject(value));
         return this;
     }
@@ -848,7 +851,7 @@ public JSONArray put(int index, boolean value) throws JSONException {
      * @throws JSONException
      *             If the index is negative or if the value is not finite.
      */
-    public JSONArray put(int index, Collection<Object> value) throws JSONException {
+    public JSONArray put(int index, Collection<?> value) throws JSONException {
         this.put(index, new JSONArray(value));
         return this;
     }
@@ -920,7 +923,7 @@ public JSONArray put(int index, long value) throws JSONException {
      *             If the index is negative or if the the value is an invalid
      *             number.
      */
-    public JSONArray put(int index, Map<String, Object> value) throws JSONException {
+    public JSONArray put(int index, Map<?, ?> value) throws JSONException {
         this.put(index, new JSONObject(value));
         return this;
     }
@@ -956,6 +959,80 @@ public JSONArray put(int index, Object value) throws JSONException {
         }
         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:
+     * <pre>
+     * [
+     *     {"b":"c"}
+     * ]
+     * </pre>
+     * 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.
+     *
+     * @param jsonPointer string that can be used to create a JSONPointer
+     * @return the item matched by the JSONPointer, otherwise null
+     */
+    public Object query(String jsonPointer) {
+        return query(new JSONPointer(jsonPointer));
+    }
+
+    /**
+     * Uses a uaer initialized JSONPointer  and tries to 
+     * match it to an item whithin this JSONArray. For example, given a
+     * JSONArray initialized with this document:
+     * <pre>
+     * [
+     *     {"b":"c"}
+     * ]
+     * </pre>
+     * 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.
+     *
+     * @param jsonPointer string that can be used to create a JSONPointer
+     * @return the item matched by the JSONPointer, otherwise null
+     */
+    public Object query(JSONPointer jsonPointer) {
+        return jsonPointer.queryFrom(this);
+    }
+
+    /**
+     * Queries and returns a value from this object using {@code jsonPointer}, or
+     * returns null if the query fails due to a missing key.
+     * 
+     * @param jsonPointer the string representation of the JSON pointer
+     * @return the queried value or {@code null}
+     * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
+     */
+    public Object optQuery(String jsonPointer) {
+    	return optQuery(new JSONPointer(jsonPointer));
+    }
+
+    /**
+     * Queries and returns a value from this object using {@code jsonPointer}, or
+     * returns null if the query fails due to a missing key.
+     * 
+     * @param The JSON pointer
+     * @return the queried value or {@code null}
+     * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax
+     */
+    public Object optQuery(JSONPointer jsonPointer) {
+        try {
+            return jsonPointer.queryFrom(this);
+        } catch (JSONPointerException e) {
+            return null;
+        }
+    }
 
     /**
      * Remove an index and close the hole.
@@ -1084,14 +1161,16 @@ public Writer write(Writer writer) throws JSONException {
      * <p>
      * Warning: This method assumes that the data structure is acyclical.
      *
+     * @param writer
+     *            Writes the serialized JSON
      * @param indentFactor
      *            The number of spaces to add to each level of indentation.
      * @param indent
      *            The indention of the top level.
      * @return The writer.
      * @throws JSONException
      */
-    Writer write(Writer writer, int indentFactor, int indent)
+    public Writer write(Writer writer, int indentFactor, int indent)
             throws JSONException {
         try {
             boolean commanate = false;
@@ -1127,4 +1206,29 @@ Writer write(Writer writer, int indentFactor, int indent)
             throw new JSONException(e);
         }
     }
+
+    /**
+     * Returns a java.util.List containing all of the elements in this array.
+     * If an element in the array is a JSONArray or JSONObject it will also
+     * be converted.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return a java.util.List containing the elements of this array
+     */
+    public List<Object> toList() {
+        List<Object> results = new ArrayList<Object>(this.myArrayList.size());
+        for (Object element : this.myArrayList) {
+            if (element == null || JSONObject.NULL.equals(element)) {
+                results.add(null);
+            } else if (element instanceof JSONArray) {
+                results.add(((JSONArray) element).toList());
+            } else if (element instanceof JSONObject) {
+                results.add(((JSONObject) element).toMap());
+            } else {
+                results.add(element);
+            }
+        }
+        return results;
+    }
 }

JSONException.java

@@ -4,40 +4,42 @@
  * The JSONException is thrown by the JSON.org classes when things are amiss.
  *
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class JSONException extends RuntimeException {
+    /** Serialization ID */
     private static final long serialVersionUID = 0;
-    private Throwable cause;
 
     /**
      * Constructs a JSONException with an explanatory message.
      *
      * @param message
      *            Detail about the reason for the exception.
      */
-    public JSONException(String message) {
+    public JSONException(final String message) {
         super(message);
     }
 
     /**
-     * Constructs a new JSONException with the specified cause.
-     * @param cause The cause.
+     * Constructs a JSONException with an explanatory message and cause.
+     * 
+     * @param message
+     *            Detail about the reason for the exception.
+     * @param cause
+     *            The cause.
      */
-    public JSONException(Throwable cause) {
-        super(cause.getMessage());
-        this.cause = cause;
+    public JSONException(final String message, final Throwable cause) {
+        super(message, cause);
     }
 
     /**
-     * Returns the cause of this exception or null if the cause is nonexistent
-     * or unknown.
-     *
-     * @return the cause of this exception or null if the cause is nonexistent
-     *          or unknown.
+     * Constructs a new JSONException with the specified cause.
+     * 
+     * @param cause
+     *            The cause.
      */
-    @Override
-    public Throwable getCause() {
-        return this.cause;
+    public JSONException(final Throwable cause) {
+        super(cause.getMessage(), cause);
     }
+
 }