geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [17/34] geode git commit: GEODE-2142: spotless
Date Wed, 01 Mar 2017 00:14:16 GMT
GEODE-2142: spotless


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/eac0bb8c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/eac0bb8c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/eac0bb8c

Branch: refs/heads/GEODE-4160-mockito
Commit: eac0bb8c8e20cae892680a3a39b790c0e05bf4cf
Parents: 7c8794c
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Fri Feb 17 15:43:49 2017 -0800
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Mon Feb 27 07:18:55 2017 -0800

----------------------------------------------------------------------
 .../internal/cli/result/AbstractResultData.java |    7 +-
 geode-json/src/main/java/org/json/JSON.java     |  176 +-
 .../src/main/java/org/json/JSONArray.java       | 1458 ++++++-----
 .../src/main/java/org/json/JSONException.java   |   59 +-
 .../src/main/java/org/json/JSONObject.java      |  378 +--
 .../src/main/java/org/json/JSONString.java      |   17 +-
 .../src/main/java/org/json/JSONStringer.java    |  779 +++---
 .../src/main/java/org/json/JSONTokener.java     | 1149 +++++----
 geode-json/src/test/java/org/json/FileTest.java |  407 ++-
 .../src/test/java/org/json/JSONArrayTest.java   | 1171 +++++----
 .../java/org/json/JSONFunctionTestObject.java   |   18 +-
 .../src/test/java/org/json/JSONObjectTest.java  | 2314 +++++++++---------
 .../test/java/org/json/JSONStringerTest.java    |  735 +++---
 .../src/test/java/org/json/JSONTokenerTest.java | 1199 +++++----
 .../src/test/java/org/json/ParsingTest.java     |  535 ++--
 .../src/test/java/org/json/SelfUseTest.java     |  465 ++--
 16 files changed, 5350 insertions(+), 5517 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/eac0bb8c/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
index 81ab511..f453ec6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
@@ -175,8 +175,9 @@ public abstract class AbstractResultData implements ResultData {
       sectionData.put(FILE_TYPE_FIELD, fileType);
       sectionData.put(FILE_MESSAGE, message);
       DeflaterInflaterData deflaterInflaterData = CliUtil.compressBytes(data);
-      sectionData.put(FILE_DATA_FIELD, Base64.getEncoder().encodeToString(deflaterInflaterData.getData()));
-      sectionData.put(DATA_LENGTH_FIELD,deflaterInflaterData.getDataLength());
+      sectionData.put(FILE_DATA_FIELD,
+          Base64.getEncoder().encodeToString(deflaterInflaterData.getData()));
+      sectionData.put(DATA_LENGTH_FIELD, deflaterInflaterData.getDataLength());
     } catch (GfJsonException e) {
       throw new ResultDataException(e.getMessage());
     }
@@ -231,7 +232,7 @@ public abstract class AbstractResultData implements ResultData {
       String fileDataString = (String) object.get(FILE_DATA_FIELD);
       int fileDataLength = (int) object.get(DATA_LENGTH_FIELD);
       byte[] byteArray = Base64.getDecoder().decode(fileDataString);
-      byte[] uncompressBytes = CliUtil.uncompressBytes(byteArray,fileDataLength).getData();
+      byte[] uncompressBytes = CliUtil.uncompressBytes(byteArray, fileDataLength).getData();
 
       boolean isGfshVM = CliUtil.isGfshVM();
       File fileToDumpData = new File(fileName);

http://git-wip-us.apache.org/repos/asf/geode/blob/eac0bb8c/geode-json/src/main/java/org/json/JSON.java
----------------------------------------------------------------------
diff --git a/geode-json/src/main/java/org/json/JSON.java b/geode-json/src/main/java/org/json/JSON.java
index 1b32e69..7105cab 100755
--- a/geode-json/src/main/java/org/json/JSON.java
+++ b/geode-json/src/main/java/org/json/JSON.java
@@ -1,116 +1,112 @@
 /*
  * Copyright (C) 2010 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package org.json;
 
 class JSON {
-    /**
-     * Returns the input if it is a JSON-permissible value; throws otherwise.
-     */
-    static double checkDouble(double d) throws JSONException {
-        if (Double.isInfinite(d) || Double.isNaN(d)) {
-            throw new JSONException("Forbidden numeric value: " + d);
-        }
-        return d;
+  /**
+   * Returns the input if it is a JSON-permissible value; throws otherwise.
+   */
+  static double checkDouble(double d) throws JSONException {
+    if (Double.isInfinite(d) || Double.isNaN(d)) {
+      throw new JSONException("Forbidden numeric value: " + d);
     }
+    return d;
+  }
 
-    static Boolean toBoolean(Object value) {
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        } else if (value instanceof String) {
-            String stringValue = (String) value;
-            if ("true".equalsIgnoreCase(stringValue)) {
-                return true;
-            } else if ("false".equalsIgnoreCase(stringValue)) {
-                return false;
-            }
-        }
-        return null;
+  static Boolean toBoolean(Object value) {
+    if (value instanceof Boolean) {
+      return (Boolean) value;
+    } else if (value instanceof String) {
+      String stringValue = (String) value;
+      if ("true".equalsIgnoreCase(stringValue)) {
+        return true;
+      } else if ("false".equalsIgnoreCase(stringValue)) {
+        return false;
+      }
     }
+    return null;
+  }
 
-    static Double toDouble(Object value) {
-        if (value instanceof Double) {
-            return (Double) value;
-        } else if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        } else if (value instanceof String) {
-            try {
-                return Double.valueOf((String) value);
-            } catch (NumberFormatException ignored) {
-            }
-        }
-        return null;
+  static Double toDouble(Object value) {
+    if (value instanceof Double) {
+      return (Double) value;
+    } else if (value instanceof Number) {
+      return ((Number) value).doubleValue();
+    } else if (value instanceof String) {
+      try {
+        return Double.valueOf((String) value);
+      } catch (NumberFormatException ignored) {
+      }
     }
+    return null;
+  }
 
-    static Integer toInteger(Object value) {
-        if (value instanceof Integer) {
-            return (Integer) value;
-        } else if (value instanceof Number) {
-            return ((Number) value).intValue();
-        } else if (value instanceof String) {
-            try {
-                return (int) Double.parseDouble((String) value);
-            } catch (NumberFormatException ignored) {
-            }
-        }
-        return null;
+  static Integer toInteger(Object value) {
+    if (value instanceof Integer) {
+      return (Integer) value;
+    } else if (value instanceof Number) {
+      return ((Number) value).intValue();
+    } else if (value instanceof String) {
+      try {
+        return (int) Double.parseDouble((String) value);
+      } catch (NumberFormatException ignored) {
+      }
     }
+    return null;
+  }
 
-    static Long toLong(Object value) {
-        if (value instanceof Long) {
-            return (Long) value;
-        } else if (value instanceof Number) {
-            return ((Number) value).longValue();
-        } else if (value instanceof String) {
-            try {
-                return (long) Double.parseDouble((String) value);
-            } catch (NumberFormatException ignored) {
-            }
-        }
-        return null;
+  static Long toLong(Object value) {
+    if (value instanceof Long) {
+      return (Long) value;
+    } else if (value instanceof Number) {
+      return ((Number) value).longValue();
+    } else if (value instanceof String) {
+      try {
+        return (long) Double.parseDouble((String) value);
+      } catch (NumberFormatException ignored) {
+      }
     }
+    return null;
+  }
 
-    static String toString(Object value) {
-        if (value instanceof String) {
-            return (String) value;
-        } else if (value != null) {
-            return String.valueOf(value);
-        }
-        return null;
+  static String toString(Object value) {
+    if (value instanceof String) {
+      return (String) value;
+    } else if (value != null) {
+      return String.valueOf(value);
     }
+    return null;
+  }
 
-    public static JSONException typeMismatch(Object indexOrName, Object actual,
-            String requiredType) throws JSONException {
-        if (actual == null) {
-            throw new JSONException("Value at " + indexOrName + " is null.");
-        } else {
-            throw new JSONException("Value " + actual + " at " + indexOrName
-                    + " of type " + actual.getClass().getName()
-                    + " cannot be converted to " + requiredType);
-        }
+  public static JSONException typeMismatch(Object indexOrName, Object actual, String requiredType)
+      throws JSONException {
+    if (actual == null) {
+      throw new JSONException("Value at " + indexOrName + " is null.");
+    } else {
+      throw new JSONException("Value " + actual + " at " + indexOrName + " of type "
+          + actual.getClass().getName() + " cannot be converted to " + requiredType);
     }
+  }
 
-    public static JSONException typeMismatch(Object actual, String requiredType)
-            throws JSONException {
-        if (actual == null) {
-            throw new JSONException("Value is null.");
-        } else {
-            throw new JSONException("Value " + actual
-                    + " of type " + actual.getClass().getName()
-                    + " cannot be converted to " + requiredType);
-        }
+  public static JSONException typeMismatch(Object actual, String requiredType)
+      throws JSONException {
+    if (actual == null) {
+      throw new JSONException("Value is null.");
+    } else {
+      throw new JSONException("Value " + actual + " of type " + actual.getClass().getName()
+          + " cannot be converted to " + requiredType);
     }
+  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/eac0bb8c/geode-json/src/main/java/org/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/geode-json/src/main/java/org/json/JSONArray.java b/geode-json/src/main/java/org/json/JSONArray.java
index 074624d..c961139 100755
--- a/geode-json/src/main/java/org/json/JSONArray.java
+++ b/geode-json/src/main/java/org/json/JSONArray.java
@@ -1,17 +1,15 @@
 /*
  * Copyright (C) 2010 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package org.json;
@@ -24,736 +22,726 @@ import java.util.List;
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 
 /**
- * A dense indexed sequence of values. Values may be any mix of
- * {@link JSONObject JSONObjects}, other {@link JSONArray JSONArrays}, Strings,
- * Booleans, Integers, Longs, Doubles, {@code null} or {@link JSONObject#NULL}.
- * Values may not be {@link Double#isNaN() NaNs}, {@link Double#isInfinite()
- * infinities}, or of any type not listed here.
+ * A dense indexed sequence of values. Values may be any mix of {@link JSONObject JSONObjects},
+ * other {@link JSONArray JSONArrays}, Strings, Booleans, Integers, Longs, Doubles, {@code null} or
+ * {@link JSONObject#NULL}. Values may not be {@link Double#isNaN() NaNs},
+ * {@link Double#isInfinite() infinities}, or of any type not listed here.
  *
- * {@code JSONArray} has the same type coercion behavior and
- * optional/mandatory accessors as {@link JSONObject}. See that class'
- * documentation for details.
+ * {@code JSONArray} has the same type coercion behavior and optional/mandatory accessors as
+ * {@link JSONObject}. See that class' documentation for details.
  *
- * <strong>Warning:</strong> this class represents null in two incompatible
- * ways: the standard Java {@code null} reference, and the sentinel value {@link
- * JSONObject#NULL}. In particular, {@code get} fails if the requested index
- * holds the null reference, but succeeds if it holds {@code JSONObject.NULL}.
+ * <strong>Warning:</strong> this class represents null in two incompatible ways: the standard Java
+ * {@code null} reference, and the sentinel value {@link JSONObject#NULL}. In particular,
+ * {@code get} fails if the requested index holds the null reference, but succeeds if it holds
+ * {@code JSONObject.NULL}.
  *
- * Instances of this class are not thread safe. Although this class is
- * non-final, it was not designed for inheritance and should not be subclassed.
- * In particular, self-use by overridable methods is not specified. See
- * <i>Effective Java</i> Item 17, "Design and Document or inheritance or else
- * prohibit it" for further information.
+ * Instances of this class are not thread safe. Although this class is non-final, it was not
+ * designed for inheritance and should not be subclassed. In particular, self-use by overridable
+ * methods is not specified. See <i>Effective Java</i> Item 17, "Design and Document or inheritance
+ * or else prohibit it" for further information.
  */
 public class JSONArray {
 
-    private final List<Object> values;
-
-    /**
-     * Creates a {@code JSONArray} with no values.
-     */
-    public JSONArray() {
-        values = new ArrayList<Object>();
-    }
-
-    /**
-     * Creates a new {@code JSONArray} by copying all values from the given
-     * collection.
-     *
-     * @param copyFrom a collection whose values are of supported types.
-     *                 Unsupported values are not permitted and will yield an array in an
-     *                 inconsistent state.
-     */
-    /* Accept a raw type for API compatibility */
-    public JSONArray(Collection<?> copyFrom) {
-        this();
-        if (copyFrom != null) {
-            for (Object aCopyFrom : copyFrom) {
-                put(JSONObject.wrap(aCopyFrom));
-            }
-        }
-    }
-
-    /**
-     * Creates a new {@code JSONArray} with values from the next array in the
-     * tokener.
-     *
-     * @param readFrom a tokener whose nextValue() method will yield a
-     *                 {@code JSONArray}.
-     * @throws JSONException if the parse fails or doesn't yield a
-     *                       {@code JSONArray}.
-     */
-    public JSONArray(JSONTokener readFrom) throws JSONException {
-        /*
-         * Getting the parser to populate this could get tricky. Instead, just
-         * parse to temporary JSONArray and then steal the data from that.
-         */
-        Object object = readFrom.nextValue();
-        if (object instanceof JSONArray) {
-            values = ((JSONArray) object).values;
-        } else {
-            throw JSON.typeMismatch(object, "JSONArray");
-        }
-    }
-
-    /**
-     * Creates a new {@code JSONArray} with values from the JSON string.
-     *
-     * @param json a JSON-encoded string containing an array.
-     * @throws JSONException if the parse fails or doesn't yield a {@code
-     *                       JSONArray}.
-     */
-    public JSONArray(String json) throws JSONException {
-        this(new JSONTokener(json));
-    }
-
-    /**
-     * Creates a new {@code JSONArray} with values from the given primitive array.
-     *
-     * @param array The values to use.
-     * @throws JSONException if any of the values are non-finite double values (i.e. NaN or infinite)
-     */
-    public JSONArray(Object array) throws JSONException {
-        if (!array.getClass().isArray()) {
-            throw new JSONException("Not a primitive array: " + array.getClass());
-        }
-        final int length = Array.getLength(array);
-        values = new ArrayList<Object>(length);
-        for (int i = 0; i < length; ++i) {
-            put(JSONObject.wrap(Array.get(array, i)));
-        }
-    }
-
-    /**
-     * @return Returns the number of values in this array.
-     */
-    public int length() {
-        return values.size();
-    }
-
-    /**
-     * Appends {@code value} to the end of this array.
-     *
-     * @param value The value to append.
-     * @return this array.
-     */
-    public JSONArray put(boolean value) {
-        values.add(value);
-        return this;
-    }
-
-    /**
-     * Appends {@code value} to the end of this array.
-     *
-     * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
-     *              {@link Double#isInfinite() infinities}.
-     * @return this array.
-     * @throws JSONException If the value is unacceptable.
-     */
-    public JSONArray put(double value) throws JSONException {
-        values.add(JSON.checkDouble(value));
-        return this;
-    }
-
-    /**
-     * Appends {@code value} to the end of this array.
-     *
-     * @param value The value to append.
-     * @return this array.
-     */
-    public JSONArray put(int value) {
-        values.add(value);
-        return this;
-    }
-
-    /**
-     * Appends {@code value} to the end of this array.
-     *
-     * @param value The value to append.
-     * @return this array.
-     */
-    public JSONArray put(long value) {
-        values.add(value);
-        return this;
-    }
-
-    /**
-     * Appends {@code value} wrapped by {@link JSONArray} to the end of this array.
-     *
-     * @param value any collection.
-     * @return this array.
-     */
-    public JSONArray put(Collection<?> value) {
-        if (value == null) {
-            return put((Object)null);
-        }
-        values.add(new JSONArray(value));
-        return this;
-    }
-
-    /**
-     * Appends {@code value} to the end of this array.
-     *
-     * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean,
-     *              Integer, Long, Double, {@link JSONObject#NULL}, or {@code null}. May
-     *              not be {@link Double#isNaN() NaNs} or {@link Double#isInfinite()
-     *              infinities}. Unsupported values are not permitted and will cause the
-     *              array to be in an inconsistent state.
-     * @return this array.
-     */
-    public JSONArray put(Object value) {
-        values.add(value);
-        return this;
-    }
-
-    /**
-     * Same as {@link #put}, with added validity checks.
-     *
-     * @param value The value to append.
-     */
-    void checkedPut(Object value) throws JSONException {
-        if (value instanceof Number) {
-            JSON.checkDouble(((Number) value).doubleValue());
-        }
-
-        put(value);
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value}, null padding this array
-     * to the required length if necessary. If a value already exists at {@code
-     * index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value The value to set.
-     * @return this array.
-     * @throws JSONException This should never happen.
-     */
-    public JSONArray put(int index, boolean value) throws JSONException {
-        return put(index, (Boolean) value);
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value}, null padding this array
-     * to the required length if necessary. If a value already exists at {@code
-     * index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
-     *              {@link Double#isInfinite() infinities}.
-     * @return this array.
-     * @throws JSONException If the value is not a finite value.
-     */
-    public JSONArray put(int index, double value) throws JSONException {
-        return put(index, (Double) value);
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value}, null padding this array
-     * to the required length if necessary. If a value already exists at {@code
-     * index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value The value to set.
-     * @return this array.
-     * @throws JSONException Should never actually happen.
-     */
-    public JSONArray put(int index, int value) throws JSONException {
-        return put(index, (Integer) value);
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value}, null padding this array
-     * to the required length if necessary. If a value already exists at {@code
-     * index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value The value to set.
-     * @return this array.
-     * @throws JSONException Should never actually happen.
-     */
-    public JSONArray put(int index, long value) throws JSONException {
-        return put(index, (Long) value);
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value} wrapped into {@link JSONArray},
-     * null padding this array to the required length if necessary. If a value already
-     * exists at {@code index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value The value to set.
-     * @return this array.
-     * @throws JSONException Should never actually happen.
-     */
-    public JSONArray put(int index, Collection<?> value) throws JSONException {
-        if (value == null) {
-            return put(index, (Object)null);
-        }
-        return put(index, new JSONArray(value));
-    }
-
-    /**
-     * Sets the value at {@code index} to {@code value}, null padding this array
-     * to the required length if necessary. If a value already exists at {@code
-     * index}, it will be replaced.
-     *
-     * @param index Where to put the value.
-     * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean,
-     *              Integer, Long, Double, {@link JSONObject#NULL}, or {@code null}. May
-     *              not be {@link Double#isNaN() NaNs} or {@link Double#isInfinite()
-     *              infinities}.
-     * @return this array.
-     * @throws JSONException If the value cannot be represented as a finite double value.
-     */
-    public JSONArray put(int index, Object value) throws JSONException {
-        if (value instanceof Number) {
-            // deviate from the original by checking all Numbers, not just floats & doubles
-            JSON.checkDouble(((Number) value).doubleValue());
-        }
-        while (values.size() <= index) {
-            values.add(null);
-        }
-        values.set(index, value);
-        return this;
-    }
-
-    /**
-     * Returns true if this array has no value at {@code index}, or if its value
-     * is the {@code null} reference or {@link JSONObject#NULL}.
-     *
-     * @param index Which value to check.
-     * @return true if the value is null.
-     */
-    public boolean isNull(int index) {
-        Object value = opt(index);
-        return value == null || value == JSONObject.NULL;
-    }
-
-    /**
-     * Returns the value at {@code index}.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if this array has no value at {@code index}, or if
-     *                       that value is the {@code null} reference. This method returns
-     *                       normally if the value is {@code JSONObject#NULL}.
-     */
-    public Object get(int index) throws JSONException {
-        try {
-            Object value = values.get(index);
-            if (value == null) {
-                throw new JSONException("Value at " + index + " is null.");
-            }
-            return value;
-        } catch (IndexOutOfBoundsException e) {
-            throw new JSONException("Index " + index + " out of range [0.." + values.size() + ")");
-        }
-    }
-
-    /**
-     * Returns the value at {@code index}, or null if the array has no value
-     * at {@code index}.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public Object opt(int index) {
-        if (index < 0 || index >= values.size()) {
-            return null;
-        }
-        return values.get(index);
-    }
-
-    /**
-     * Removes and returns the value at {@code index}, or null if the array has no value
-     * at {@code index}.
-     *
-     * @param index Which value to remove.
-     * @return The value previously at the specified location.
-     */
-    public Object remove(int index) {
-        if (index < 0 || index >= values.size()) {
-            return null;
-        }
-        return values.remove(index);
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a boolean or can
-     * be coerced to a boolean.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value at {@code index} doesn't exist or
-     *                       cannot be coerced to a boolean.
-     */
-    public boolean getBoolean(int index) throws JSONException {
-        Object object = get(index);
-        Boolean result = JSON.toBoolean(object);
-        if (result == null) {
-            throw JSON.typeMismatch(index, object, "boolean");
-        }
-        return result;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a boolean or can
-     * be coerced to a boolean. Returns false otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public boolean optBoolean(int index) {
-        return optBoolean(index, false);
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a boolean or can
-     * be coerced to a boolean. Returns {@code fallback} otherwise.
-     *
-     * @param index    Which value to get.
-     * @param fallback the fallback value to return if no value exists.
-     * @return the value at the specified location or the fallback value.
-     */
-    public boolean optBoolean(int index, boolean fallback) {
-        Object object = opt(index);
-        Boolean result = JSON.toBoolean(object);
-        return result != null ? result : fallback;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a double or can
-     * be coerced to a double.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value at {@code index} doesn't exist or
-     *                       cannot be coerced to a double.
-     */
-    public double getDouble(int index) throws JSONException {
-        Object object = get(index);
-        Double result = JSON.toDouble(object);
-        if (result == null) {
-            throw JSON.typeMismatch(index, object, "double");
-        }
-        return result;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a double or can
-     * be coerced to a double. Returns {@code NaN} otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public double optDouble(int index) {
-        return optDouble(index, Double.NaN);
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a double or can
-     * be coerced to a double. Returns {@code fallback} otherwise.
-     *
-     * @param index    Which value to get.
-     * @param fallback The fallback value to use if no value is at the specified location.
-     * @return the value at the specified location or the fallback value.
-     */
-    public double optDouble(int index, double fallback) {
-        Object object = opt(index);
-        Double result = JSON.toDouble(object);
-        return result != null ? result : fallback;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is an int or
-     * can be coerced to an int.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value at {@code index} doesn't exist or
-     *                       cannot be coerced to a int.
-     */
-    public int getInt(int index) throws JSONException {
-        Object object = get(index);
-        Integer result = JSON.toInteger(object);
-        if (result == null) {
-            throw JSON.typeMismatch(index, object, "int");
-        }
-        return result;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is an int or
-     * can be coerced to an int. Returns 0 otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public int optInt(int index) {
-        return optInt(index, 0);
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is an int or
-     * can be coerced to an int. Returns {@code fallback} otherwise.
-     *
-     * @param index    Which value to get.
-     * @param fallback The fallback value to use if no value is at the specified location.
-     * @return the value at the specified location or the fallback value.
-     */
-    public int optInt(int index, int fallback) {
-        Object object = opt(index);
-        Integer result = JSON.toInteger(object);
-        return result != null ? result : fallback;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a long or
-     * can be coerced to a long.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value at {@code index} doesn't exist or
-     *                       cannot be coerced to a long.
-     */
-    public long getLong(int index) throws JSONException {
-        Object object = get(index);
-        Long result = JSON.toLong(object);
-        if (result == null) {
-            throw JSON.typeMismatch(index, object, "long");
-        }
-        return result;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a long or
-     * can be coerced to a long. Returns 0 otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public long optLong(int index) {
-        return optLong(index, 0L);
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a long or
-     * can be coerced to a long. Returns {@code fallback} otherwise.
-     *
-     * @param index    Which value to get.
-     * @param fallback The fallback value to use if no value is at the specified location.
-     * @return the value at the specified location or the fallback value.
-     */
-    public long optLong(int index, long fallback) {
-        Object object = opt(index);
-        Long result = JSON.toLong(object);
-        return result != null ? result : fallback;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists, coercing it if
-     * necessary.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if no such value exists.
-     */
-    public String getString(int index) throws JSONException {
-        Object object = get(index);
-        String result = JSON.toString(object);
-        if (result == null) {
-            throw JSON.typeMismatch(index, object, "String");
-        }
-        return result;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists, coercing it if
-     * necessary. Returns the empty string if no such value exists.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public String optString(int index) {
-        return optString(index, "");
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists, coercing it if
-     * necessary. Returns {@code fallback} if no such value exists.
-     *
-     * @param index    Which value to get.
-     * @param fallback The fallback value to use if no value is at the specified location.
-     * @return the value at the specified location or the fallback value.
-     */
-    public String optString(int index, String fallback) {
-        Object object = opt(index);
-        String result = JSON.toString(object);
-        return result != null ? result : fallback;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a {@code
-     * JSONArray}.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value doesn't exist or is not a {@code
-     *                       JSONArray}.
-     */
-    public JSONArray getJSONArray(int index) throws JSONException {
-        Object object = get(index);
-        if (object instanceof JSONArray) {
-            return (JSONArray) object;
-        } else {
-            throw JSON.typeMismatch(index, object, "JSONArray");
-        }
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a {@code
-     * JSONArray}. Returns null otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public JSONArray optJSONArray(int index) {
-        Object object = opt(index);
-        return object instanceof JSONArray ? (JSONArray) object : null;
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a {@code
-     * JSONObject}.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     * @throws JSONException if the value doesn't exist or is not a {@code
-     *                       JSONObject}.
-     */
-    public JSONObject getJSONObject(int index) throws JSONException {
-        Object object = get(index);
-        if (object instanceof JSONObject) {
-            return (JSONObject) object;
-        } else {
-            throw JSON.typeMismatch(index, object, "JSONObject");
-        }
-    }
-
-    /**
-     * Returns the value at {@code index} if it exists and is a {@code
-     * JSONObject}. Returns null otherwise.
-     *
-     * @param index Which value to get.
-     * @return the value at the specified location.
-     */
-    public JSONObject optJSONObject(int index) {
-        Object object = opt(index);
-        return object instanceof JSONObject ? (JSONObject) object : null;
-    }
-
-    /**
-     * Returns a new object whose values are the values in this array, and whose
-     * names are the values in {@code names}. Names and values are paired up by
-     * index from 0 through to the shorter array's length. Names that are not
-     * strings will be coerced to strings. This method returns null if either
-     * array is empty.
-     *
-     * @param names The names to apply to the returned values.
-     * @return the newly constructed object.
-     * @throws JSONException Should not be possible.
-     */
-    public JSONObject toJSONObject(JSONArray names) throws JSONException {
-        JSONObject result = new JSONObject();
-        int length = Math.min(names.length(), values.size());
-        if (length == 0) {
-            return null;
-        }
-        for (int i = 0; i < length; i++) {
-            String name = JSON.toString(names.opt(i));
-            result.put(name, opt(i));
-        }
-        return result;
-    }
-
-    /**
-     * Returns a new string by alternating this array's values with {@code
-     * separator}. This array's string values are quoted and have their special
-     * characters escaped. For example, the array containing the strings '12"
-     * pizza', 'taco' and 'soda' joined on '+' returns this:
-     * <pre>"12\" pizza"+"taco"+"soda"</pre>
-     *
-     * @param separator The string used to separate the returned values.
-     * @return the conjoined values.
-     * @throws JSONException Only if there is a coding error.
-     */
-    public String join(String separator) throws JSONException {
-        JSONStringer stringer = new JSONStringer();
-        stringer.open(JSONStringer.Scope.NULL, "");
-        for (int i = 0, size = values.size(); i < size; i++) {
-            if (i > 0) {
-                stringer.out.append(separator);
-            }
-            stringer.value(values.get(i));
-        }
-        stringer.close(JSONStringer.Scope.NULL, JSONStringer.Scope.NULL, "");
-        return stringer.out.toString();
-    }
-
-    /**
-     * Encodes this array as a compact JSON string, such as:
-     * <pre>[94043,90210]</pre>
-     *
-     * @return The string form of this array.
-     */
-    @Override
-    public String toString() {
-        try {
-            JSONStringer stringer = new JSONStringer();
-            writeTo(stringer);
-            return stringer.toString();
-        } catch (JSONException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Encodes this array as a human readable JSON string for debugging, such
-     * as:
-     * <pre>
-     * [
-     *     94043,
-     *     90210
-     * ]</pre>
-     *
-     * @param indentSpaces the number of spaces to indent for each level of
-     *                     nesting.
-     * @return The string form of this array.
-     * @throws JSONException Only if there is a coding error.
-     */
-    public String toString(int indentSpaces) throws JSONException {
-        JSONStringer stringer = new JSONStringer(indentSpaces);
-        writeTo(stringer);
-        return stringer.toString();
-    }
-
-    void writeTo(JSONStringer stringer) throws JSONException {
-        stringer.array();
-        for (Object value : values) {
-            stringer.value(value);
-        }
-        stringer.endArray();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof JSONArray && ((JSONArray) o).values.equals(values);
-    }
-
-    @Override
-    public int hashCode() {
-        // diverge from the original, which doesn't implement hashCode
-        return values.hashCode();
-    }
+  private final List<Object> values;
+
+  /**
+   * Creates a {@code JSONArray} with no values.
+   */
+  public JSONArray() {
+    values = new ArrayList<Object>();
+  }
+
+  /**
+   * Creates a new {@code JSONArray} by copying all values from the given collection.
+   *
+   * @param copyFrom a collection whose values are of supported types. Unsupported values are not
+   *        permitted and will yield an array in an inconsistent state.
+   */
+  /* Accept a raw type for API compatibility */
+  public JSONArray(Collection<?> copyFrom) {
+    this();
+    if (copyFrom != null) {
+      for (Object aCopyFrom : copyFrom) {
+        put(JSONObject.wrap(aCopyFrom));
+      }
+    }
+  }
+
+  /**
+   * Creates a new {@code JSONArray} with values from the next array in the tokener.
+   *
+   * @param readFrom a tokener whose nextValue() method will yield a {@code JSONArray}.
+   * @throws JSONException if the parse fails or doesn't yield a {@code JSONArray}.
+   */
+  public JSONArray(JSONTokener readFrom) throws JSONException {
+    /*
+     * Getting the parser to populate this could get tricky. Instead, just parse to temporary
+     * JSONArray and then steal the data from that.
+     */
+    Object object = readFrom.nextValue();
+    if (object instanceof JSONArray) {
+      values = ((JSONArray) object).values;
+    } else {
+      throw JSON.typeMismatch(object, "JSONArray");
+    }
+  }
+
+  /**
+   * Creates a new {@code JSONArray} with values from the JSON string.
+   *
+   * @param json a JSON-encoded string containing an array.
+   * @throws JSONException if the parse fails or doesn't yield a {@code
+   *                       JSONArray}.
+   */
+  public JSONArray(String json) throws JSONException {
+    this(new JSONTokener(json));
+  }
+
+  /**
+   * Creates a new {@code JSONArray} with values from the given primitive array.
+   *
+   * @param array The values to use.
+   * @throws JSONException if any of the values are non-finite double values (i.e. NaN or infinite)
+   */
+  public JSONArray(Object array) throws JSONException {
+    if (!array.getClass().isArray()) {
+      throw new JSONException("Not a primitive array: " + array.getClass());
+    }
+    final int length = Array.getLength(array);
+    values = new ArrayList<Object>(length);
+    for (int i = 0; i < length; ++i) {
+      put(JSONObject.wrap(Array.get(array, i)));
+    }
+  }
+
+  /**
+   * @return Returns the number of values in this array.
+   */
+  public int length() {
+    return values.size();
+  }
+
+  /**
+   * Appends {@code value} to the end of this array.
+   *
+   * @param value The value to append.
+   * @return this array.
+   */
+  public JSONArray put(boolean value) {
+    values.add(value);
+    return this;
+  }
+
+  /**
+   * Appends {@code value} to the end of this array.
+   *
+   * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
+   *        {@link Double#isInfinite() infinities}.
+   * @return this array.
+   * @throws JSONException If the value is unacceptable.
+   */
+  public JSONArray put(double value) throws JSONException {
+    values.add(JSON.checkDouble(value));
+    return this;
+  }
+
+  /**
+   * Appends {@code value} to the end of this array.
+   *
+   * @param value The value to append.
+   * @return this array.
+   */
+  public JSONArray put(int value) {
+    values.add(value);
+    return this;
+  }
+
+  /**
+   * Appends {@code value} to the end of this array.
+   *
+   * @param value The value to append.
+   * @return this array.
+   */
+  public JSONArray put(long value) {
+    values.add(value);
+    return this;
+  }
+
+  /**
+   * Appends {@code value} wrapped by {@link JSONArray} to the end of this array.
+   *
+   * @param value any collection.
+   * @return this array.
+   */
+  public JSONArray put(Collection<?> value) {
+    if (value == null) {
+      return put((Object) null);
+    }
+    values.add(new JSONArray(value));
+    return this;
+  }
+
+  /**
+   * Appends {@code value} to the end of this array.
+   *
+   * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
+   *        {@link JSONObject#NULL}, or {@code null}. May not be {@link Double#isNaN() NaNs} or
+   *        {@link Double#isInfinite() infinities}. Unsupported values are not permitted and will
+   *        cause the array to be in an inconsistent state.
+   * @return this array.
+   */
+  public JSONArray put(Object value) {
+    values.add(value);
+    return this;
+  }
+
+  /**
+   * Same as {@link #put}, with added validity checks.
+   *
+   * @param value The value to append.
+   */
+  void checkedPut(Object value) throws JSONException {
+    if (value instanceof Number) {
+      JSON.checkDouble(((Number) value).doubleValue());
+    }
+
+    put(value);
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value}, null padding this array to the required
+   * length if necessary. If a value already exists at {@code
+   * index}, it will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value The value to set.
+   * @return this array.
+   * @throws JSONException This should never happen.
+   */
+  public JSONArray put(int index, boolean value) throws JSONException {
+    return put(index, (Boolean) value);
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value}, null padding this array to the required
+   * length if necessary. If a value already exists at {@code
+   * index}, it will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
+   *        {@link Double#isInfinite() infinities}.
+   * @return this array.
+   * @throws JSONException If the value is not a finite value.
+   */
+  public JSONArray put(int index, double value) throws JSONException {
+    return put(index, (Double) value);
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value}, null padding this array to the required
+   * length if necessary. If a value already exists at {@code
+   * index}, it will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value The value to set.
+   * @return this array.
+   * @throws JSONException Should never actually happen.
+   */
+  public JSONArray put(int index, int value) throws JSONException {
+    return put(index, (Integer) value);
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value}, null padding this array to the required
+   * length if necessary. If a value already exists at {@code
+   * index}, it will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value The value to set.
+   * @return this array.
+   * @throws JSONException Should never actually happen.
+   */
+  public JSONArray put(int index, long value) throws JSONException {
+    return put(index, (Long) value);
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value} wrapped into {@link JSONArray}, null padding
+   * this array to the required length if necessary. If a value already exists at {@code index}, it
+   * will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value The value to set.
+   * @return this array.
+   * @throws JSONException Should never actually happen.
+   */
+  public JSONArray put(int index, Collection<?> value) throws JSONException {
+    if (value == null) {
+      return put(index, (Object) null);
+    }
+    return put(index, new JSONArray(value));
+  }
+
+  /**
+   * Sets the value at {@code index} to {@code value}, null padding this array to the required
+   * length if necessary. If a value already exists at {@code
+   * index}, it will be replaced.
+   *
+   * @param index Where to put the value.
+   * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
+   *        {@link JSONObject#NULL}, or {@code null}. May not be {@link Double#isNaN() NaNs} or
+   *        {@link Double#isInfinite() infinities}.
+   * @return this array.
+   * @throws JSONException If the value cannot be represented as a finite double value.
+   */
+  public JSONArray put(int index, Object value) throws JSONException {
+    if (value instanceof Number) {
+      // deviate from the original by checking all Numbers, not just floats & doubles
+      JSON.checkDouble(((Number) value).doubleValue());
+    }
+    while (values.size() <= index) {
+      values.add(null);
+    }
+    values.set(index, value);
+    return this;
+  }
+
+  /**
+   * Returns true if this array has no value at {@code index}, or if its value is the {@code null}
+   * reference or {@link JSONObject#NULL}.
+   *
+   * @param index Which value to check.
+   * @return true if the value is null.
+   */
+  public boolean isNull(int index) {
+    Object value = opt(index);
+    return value == null || value == JSONObject.NULL;
+  }
+
+  /**
+   * Returns the value at {@code index}.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if this array has no value at {@code index}, or if that value is the
+   *         {@code null} reference. This method returns normally if the value is
+   *         {@code JSONObject#NULL}.
+   */
+  public Object get(int index) throws JSONException {
+    try {
+      Object value = values.get(index);
+      if (value == null) {
+        throw new JSONException("Value at " + index + " is null.");
+      }
+      return value;
+    } catch (IndexOutOfBoundsException e) {
+      throw new JSONException("Index " + index + " out of range [0.." + values.size() + ")");
+    }
+  }
+
+  /**
+   * Returns the value at {@code index}, or null if the array has no value at {@code index}.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public Object opt(int index) {
+    if (index < 0 || index >= values.size()) {
+      return null;
+    }
+    return values.get(index);
+  }
+
+  /**
+   * Removes and returns the value at {@code index}, or null if the array has no value at
+   * {@code index}.
+   *
+   * @param index Which value to remove.
+   * @return The value previously at the specified location.
+   */
+  public Object remove(int index) {
+    if (index < 0 || index >= values.size()) {
+      return null;
+    }
+    return values.remove(index);
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a boolean or can be coerced to a
+   * boolean.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value at {@code index} doesn't exist or cannot be coerced to a
+   *         boolean.
+   */
+  public boolean getBoolean(int index) throws JSONException {
+    Object object = get(index);
+    Boolean result = JSON.toBoolean(object);
+    if (result == null) {
+      throw JSON.typeMismatch(index, object, "boolean");
+    }
+    return result;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a boolean or can be coerced to a
+   * boolean. Returns false otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public boolean optBoolean(int index) {
+    return optBoolean(index, false);
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a boolean or can be coerced to a
+   * boolean. Returns {@code fallback} otherwise.
+   *
+   * @param index Which value to get.
+   * @param fallback the fallback value to return if no value exists.
+   * @return the value at the specified location or the fallback value.
+   */
+  public boolean optBoolean(int index, boolean fallback) {
+    Object object = opt(index);
+    Boolean result = JSON.toBoolean(object);
+    return result != null ? result : fallback;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a double or can be coerced to a double.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value at {@code index} doesn't exist or cannot be coerced to a
+   *         double.
+   */
+  public double getDouble(int index) throws JSONException {
+    Object object = get(index);
+    Double result = JSON.toDouble(object);
+    if (result == null) {
+      throw JSON.typeMismatch(index, object, "double");
+    }
+    return result;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a double or can be coerced to a double.
+   * Returns {@code NaN} otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public double optDouble(int index) {
+    return optDouble(index, Double.NaN);
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a double or can be coerced to a double.
+   * Returns {@code fallback} otherwise.
+   *
+   * @param index Which value to get.
+   * @param fallback The fallback value to use if no value is at the specified location.
+   * @return the value at the specified location or the fallback value.
+   */
+  public double optDouble(int index, double fallback) {
+    Object object = opt(index);
+    Double result = JSON.toDouble(object);
+    return result != null ? result : fallback;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is an int or can be coerced to an int.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value at {@code index} doesn't exist or cannot be coerced to a
+   *         int.
+   */
+  public int getInt(int index) throws JSONException {
+    Object object = get(index);
+    Integer result = JSON.toInteger(object);
+    if (result == null) {
+      throw JSON.typeMismatch(index, object, "int");
+    }
+    return result;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is an int or can be coerced to an int.
+   * Returns 0 otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public int optInt(int index) {
+    return optInt(index, 0);
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is an int or can be coerced to an int.
+   * Returns {@code fallback} otherwise.
+   *
+   * @param index Which value to get.
+   * @param fallback The fallback value to use if no value is at the specified location.
+   * @return the value at the specified location or the fallback value.
+   */
+  public int optInt(int index, int fallback) {
+    Object object = opt(index);
+    Integer result = JSON.toInteger(object);
+    return result != null ? result : fallback;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a long or can be coerced to a long.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value at {@code index} doesn't exist or cannot be coerced to a
+   *         long.
+   */
+  public long getLong(int index) throws JSONException {
+    Object object = get(index);
+    Long result = JSON.toLong(object);
+    if (result == null) {
+      throw JSON.typeMismatch(index, object, "long");
+    }
+    return result;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a long or can be coerced to a long.
+   * Returns 0 otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public long optLong(int index) {
+    return optLong(index, 0L);
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a long or can be coerced to a long.
+   * Returns {@code fallback} otherwise.
+   *
+   * @param index Which value to get.
+   * @param fallback The fallback value to use if no value is at the specified location.
+   * @return the value at the specified location or the fallback value.
+   */
+  public long optLong(int index, long fallback) {
+    Object object = opt(index);
+    Long result = JSON.toLong(object);
+    return result != null ? result : fallback;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists, coercing it if necessary.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if no such value exists.
+   */
+  public String getString(int index) throws JSONException {
+    Object object = get(index);
+    String result = JSON.toString(object);
+    if (result == null) {
+      throw JSON.typeMismatch(index, object, "String");
+    }
+    return result;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists, coercing it if necessary. Returns the empty
+   * string if no such value exists.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public String optString(int index) {
+    return optString(index, "");
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists, coercing it if necessary. Returns
+   * {@code fallback} if no such value exists.
+   *
+   * @param index Which value to get.
+   * @param fallback The fallback value to use if no value is at the specified location.
+   * @return the value at the specified location or the fallback value.
+   */
+  public String optString(int index, String fallback) {
+    Object object = opt(index);
+    String result = JSON.toString(object);
+    return result != null ? result : fallback;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a {@code
+   * JSONArray}.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value doesn't exist or is not a {@code
+   *                       JSONArray}.
+   */
+  public JSONArray getJSONArray(int index) throws JSONException {
+    Object object = get(index);
+    if (object instanceof JSONArray) {
+      return (JSONArray) object;
+    } else {
+      throw JSON.typeMismatch(index, object, "JSONArray");
+    }
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a {@code
+   * JSONArray}. Returns null otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public JSONArray optJSONArray(int index) {
+    Object object = opt(index);
+    return object instanceof JSONArray ? (JSONArray) object : null;
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a {@code
+   * JSONObject}.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   * @throws JSONException if the value doesn't exist or is not a {@code
+   *                       JSONObject}.
+   */
+  public JSONObject getJSONObject(int index) throws JSONException {
+    Object object = get(index);
+    if (object instanceof JSONObject) {
+      return (JSONObject) object;
+    } else {
+      throw JSON.typeMismatch(index, object, "JSONObject");
+    }
+  }
+
+  /**
+   * Returns the value at {@code index} if it exists and is a {@code
+   * JSONObject}. Returns null otherwise.
+   *
+   * @param index Which value to get.
+   * @return the value at the specified location.
+   */
+  public JSONObject optJSONObject(int index) {
+    Object object = opt(index);
+    return object instanceof JSONObject ? (JSONObject) object : null;
+  }
+
+  /**
+   * Returns a new object whose values are the values in this array, and whose names are the values
+   * in {@code names}. Names and values are paired up by index from 0 through to the shorter array's
+   * length. Names that are not strings will be coerced to strings. This method returns null if
+   * either array is empty.
+   *
+   * @param names The names to apply to the returned values.
+   * @return the newly constructed object.
+   * @throws JSONException Should not be possible.
+   */
+  public JSONObject toJSONObject(JSONArray names) throws JSONException {
+    JSONObject result = new JSONObject();
+    int length = Math.min(names.length(), values.size());
+    if (length == 0) {
+      return null;
+    }
+    for (int i = 0; i < length; i++) {
+      String name = JSON.toString(names.opt(i));
+      result.put(name, opt(i));
+    }
+    return result;
+  }
+
+  /**
+   * Returns a new string by alternating this array's values with {@code
+   * separator}. This array's string values are quoted and have their special characters escaped.
+   * For example, the array containing the strings '12" pizza', 'taco' and 'soda' joined on '+'
+   * returns this:
+   * 
+   * <pre>
+   * "12\" pizza" + "taco" + "soda"
+   * </pre>
+   *
+   * @param separator The string used to separate the returned values.
+   * @return the conjoined values.
+   * @throws JSONException Only if there is a coding error.
+   */
+  public String join(String separator) throws JSONException {
+    JSONStringer stringer = new JSONStringer();
+    stringer.open(JSONStringer.Scope.NULL, "");
+    for (int i = 0, size = values.size(); i < size; i++) {
+      if (i > 0) {
+        stringer.out.append(separator);
+      }
+      stringer.value(values.get(i));
+    }
+    stringer.close(JSONStringer.Scope.NULL, JSONStringer.Scope.NULL, "");
+    return stringer.out.toString();
+  }
+
+  /**
+   * Encodes this array as a compact JSON string, such as:
+   * 
+   * <pre>
+   * [94043,90210]
+   * </pre>
+   *
+   * @return The string form of this array.
+   */
+  @Override
+  public String toString() {
+    try {
+      JSONStringer stringer = new JSONStringer();
+      writeTo(stringer);
+      return stringer.toString();
+    } catch (JSONException e) {
+      return null;
+    }
+  }
+
+  /**
+   * Encodes this array as a human readable JSON string for debugging, such as:
+   * 
+   * <pre>
+   * [
+   *     94043,
+   *     90210
+   * ]
+   * </pre>
+   *
+   * @param indentSpaces the number of spaces to indent for each level of nesting.
+   * @return The string form of this array.
+   * @throws JSONException Only if there is a coding error.
+   */
+  public String toString(int indentSpaces) throws JSONException {
+    JSONStringer stringer = new JSONStringer(indentSpaces);
+    writeTo(stringer);
+    return stringer.toString();
+  }
+
+  void writeTo(JSONStringer stringer) throws JSONException {
+    stringer.array();
+    for (Object value : values) {
+      stringer.value(value);
+    }
+    stringer.endArray();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof JSONArray && ((JSONArray) o).values.equals(values);
+  }
+
+  @Override
+  public int hashCode() {
+    // diverge from the original, which doesn't implement hashCode
+    return values.hashCode();
+  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/eac0bb8c/geode-json/src/main/java/org/json/JSONException.java
----------------------------------------------------------------------
diff --git a/geode-json/src/main/java/org/json/JSONException.java b/geode-json/src/main/java/org/json/JSONException.java
index 1292e86..83fb4b8 100755
--- a/geode-json/src/main/java/org/json/JSONException.java
+++ b/geode-json/src/main/java/org/json/JSONException.java
@@ -1,17 +1,15 @@
 /*
  * Copyright (C) 2010 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package org.json;
@@ -21,37 +19,40 @@ package org.json;
 /**
  * Thrown to indicate a problem with the JSON API. Such problems include:
  * <ul>
- *   <li>Attempts to parse or construct malformed documents
- *   <li>Use of null as a name
- *   <li>Use of numeric types not available to JSON, such as {@link
- *       Double#isNaN() NaNs} or {@link Double#isInfinite() infinities}.
- *   <li>Lookups using an out of range index or nonexistent name
- *   <li>Type mismatches on lookups
+ * <li>Attempts to parse or construct malformed documents
+ * <li>Use of null as a name
+ * <li>Use of numeric types not available to JSON, such as {@link Double#isNaN() NaNs} or
+ * {@link Double#isInfinite() infinities}.
+ * <li>Lookups using an out of range index or nonexistent name
+ * <li>Type mismatches on lookups
  * </ul>
  *
- * <p>Although this is a checked exception, it is rarely recoverable. Most
- * callers should simply wrap this exception in an unchecked exception and
- * rethrow:
- * <pre>  public JSONArray toJSONObject() {
+ * <p>
+ * Although this is a checked exception, it is rarely recoverable. Most callers should simply wrap
+ * this exception in an unchecked exception and rethrow:
+ * 
+ * <pre>
+ *   public JSONArray toJSONObject() {
  *     try {
  *         JSONObject result = new JSONObject();
  *         ...
  *     } catch (JSONException e) {
  *         throw new RuntimeException(e);
  *     }
- * }</pre>
+ * }
+ * </pre>
  */
 public class JSONException extends RuntimeException {
 
-    public JSONException(String s) {
-        super(s);
-    }
+  public JSONException(String s) {
+    super(s);
+  }
 
-    public JSONException(Throwable cause) {
-        super(cause);
-    }
+  public JSONException(Throwable cause) {
+    super(cause);
+  }
 
-    public JSONException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public JSONException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }


Mime
View raw message