geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [3/8] geode git commit: GEODE-2142: Removal of non-compliant org.json implementation.
Date Fri, 17 Feb 2017 21:01:02 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/b3ec80bc/geode-json/src/main/java/org/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/geode-json/src/main/java/org/json/JSONObject.java b/geode-json/src/main/java/org/json/JSONObject.java
index a2c6d8b..d5de19f 100755
--- a/geode-json/src/main/java/org/json/JSONObject.java
+++ b/geode-json/src/main/java/org/json/JSONObject.java
@@ -1,1525 +1,1005 @@
-package org.json;
-
 /*
- * Copyright (c) 2002 JSON.org
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
- * associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- * 
- * The Software shall be used for Good, not Evil.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
- * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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
+ *
+ *      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.
  */
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.Field;
+package org.json;
+
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.Locale;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.TreeMap;
+
+// Note: this class was written without inspecting the non-free org.json sourcecode.
 
 /**
- * A JSONObject is an unordered collection of name/value pairs. Its external form is a string
- * wrapped in curly braces with colons between the names and values, and commas between the values
- * and names. The internal form is an object having <code>get</code> and <code>opt</code> methods
- * for accessing the values by name, and <code>put</code> methods for adding or replacing values by
- * name. 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</code> object. A JSONObject constructor can be used to convert an external
- * form JSON text into an internal form whose values can be retrieved with the <code>get</code> and
- * <code>opt</code> methods, or to convert values into a JSON text using the <code>put</code> and
- * <code>toString</code> methods. 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 <code>get</code> and <code>opt</code> methods that
- * do type checking and type coercion for you. The opt methods differ from the get methods in that
- * they do not throw. Instead, they return a specified value, such as null.
- * <p>
- * The <code>put</code> methods add or replace values in an object. For example,
+ * A modifiable set of name/value mappings. Names are unique, non-null strings.
+ * Values may be any mix of {@link JSONObject JSONObjects}, {@link JSONArray
+ * JSONArrays}, Strings, Booleans, Integers, Longs, Doubles or {@link #NULL}.
+ * Values may not be {@code null}, {@link Double#isNaN() NaNs}, {@link
+ * Double#isInfinite() infinities}, or of any type not listed here.
  *
- * <pre>
- * myString = new JSONObject().put(&quot;JSON&quot;, &quot;Hello, World!&quot;).toString();
- * </pre>
+ * <p>This class can coerce values to another type when requested.
+ * <ul>
+ * <li>When the requested type is a boolean, strings will be coerced using a
+ * case-insensitive comparison to "true" and "false".
+ * <li>When the requested type is a double, other {@link Number} types will
+ * be coerced using {@link Number#doubleValue() doubleValue}. Strings
+ * that can be coerced using {@link Double#valueOf(String)} will be.
+ * <li>When the requested type is an int, other {@link Number} types will
+ * be coerced using {@link Number#intValue() intValue}. Strings
+ * that can be coerced using {@link Double#valueOf(String)} will be,
+ * and then cast to int.
+ * <li><a name="lossy">When the requested type is a long, other {@link Number} types will
+ * be coerced using {@link Number#longValue() longValue}. Strings
+ * that can be coerced using {@link Double#valueOf(String)} will be,
+ * and then cast to long. This two-step conversion is lossy for very
+ * large values. For example, the string "9223372036854775806" yields the
+ * long 9223372036854775807.</a>
+ * <li>When the requested type is a String, other non-null values will be
+ * coerced using {@link String#valueOf(Object)}. Although null cannot be
+ * coerced, the sentinel value {@link JSONObject#NULL} is coerced to the
+ * string "null".
+ * </ul>
  *
- * produces the string <code>{"JSON": "Hello, World"}</code>.
- * <p>
- * The texts produced by the <code>toString</code> methods strictly conform to the JSON syntax
- * rules. The constructors are more forgiving in the texts they will accept:
+ * <p>This class can look up both mandatory and optional values:
  * <ul>
- * <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just before the closing
- * brace.</li>
- * <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single quote)</small>.</li>
- * <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
- * and if they do not contain leading or trailing spaces, and if they do not contain any of these
- * characters: <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers and if they
- * are not the reserved words <code>true</code>, <code>false</code>, or <code>null</code>.</li>
- * <li>Keys can be followed by <code>=</code> or <code>=></code> as well as by <code>:</code>.</li>
- * <li>Values can be followed by <code>;</code> <small>(semicolon)</small> as well as by
- * <code>,</code> <small>(comma)</small>.</li>
+ * <li>Use <code>get<i>Type</i>()</code> to retrieve a mandatory value. This
+ * fails with a {@code JSONException} if the requested name has no value
+ * or if the value cannot be coerced to the requested type.
+ * <li>Use <code>opt<i>Type</i>()</code> to retrieve an optional value. This
+ * returns a system- or user-supplied default if the requested name has no
+ * value or if the value cannot be coerced to the requested type.
  * </ul>
  *
- * @author JSON.org
- * @version 2012-05-29
+ * <p><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, calling {@code put(name, null)} removes the
+ * named entry from the object but {@code put(name, JSONObject.NULL)} stores an
+ * entry whose value is {@code JSONObject.NULL}.
+ *
+ * <p>Instances of this class are not thread safe. Although this class is
+ * nonfinal, it was not designed for inheritance and should not be subclassed.
+ * In particular, self-use by overrideable 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 JSONObject {
+
+  private static final Double NEGATIVE_ZERO = -0d;
+
+  public static ThreadLocal<Set> cyclicDependencySet = new ThreadLocal();
+  public static ThreadLocal<Boolean> cyclicDepChkEnabled = new ThreadLocal();
+
   /**
-   * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is
-   * equivalent to the value that JavaScript calls undefined.
+   * A sentinel value used to explicitly define a name with no value. Unlike
+   * {@code null}, names with this value:
+   * <ul>
+   * <li>show up in the {@link #names} array
+   * <li>show up in the {@link #keys} iterator
+   * <li>return {@code true} for {@link #has(String)}
+   * <li>do not throw on {@link #get(String)}
+   * <li>are included in the encoded JSON string.
+   * </ul>
+   *
+   * <p>This value violates the general contract of {@link Object#equals} by
+   * returning true when compared to {@code null}. Its {@link #toString}
+   * method returns "null".
    */
-  private static final class Null {
-
-    /**
-     * There is only intended to be a single instance of the NULL object, so the clone method
-     * returns itself.
-     * 
-     * @return NULL.
-     */
-    protected final Object clone() {
-      return this;
+  public static final Object NULL = new Object() {
+    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+    @Override
+    public boolean equals(Object o) {
+      return o == this || o == null; // API specifies this broken equals implementation
     }
 
-    /**
-     * A Null object is equal to the null value and to itself.
-     * 
-     * @param object An object to test for nullness.
-     * @return true if the object parameter is the JSONObject.NULL object or null.
-     */
-    public boolean equals(Object object) {
-      return object == null || object == this;
+    // at least make the broken equals(null) consistent with Objects.hashCode(null).
+    @Override
+    public int hashCode() {
+      return 0;
     }
 
-    /**
-     * Get the "null" string value.
-     * 
-     * @return The string "null".
-     */
+    @Override
     public String toString() {
       return "null";
     }
-  }
-
-
-  /**
-   * The map where the JSONObject's properties are kept.
-   */
-  private final Map map;
-
-
-  /**
-   * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to
-   * use Java's <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns
-   * <code>true</code>. <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
-   */
-  public static final Object NULL = new Null();
-
-
-  public static ThreadLocal<Set> cyclicDependencySet = new ThreadLocal();
-  public static ThreadLocal<Boolean> cyclicDepChkEnabled = new ThreadLocal();
+  };
 
+  private final LinkedHashMap<String, Object> nameValuePairs;
 
   /**
-   * Construct an empty JSONObject.
+   * Creates a {@code JSONObject} with no name/value mappings.
    */
   public JSONObject() {
-    this.map = new LinkedHashMap();
+    nameValuePairs = new LinkedHashMap<String, Object>();
   }
 
-
   /**
-   * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to
-   * identify the keys that should be copied. Missing keys are ignored.
-   * 
-   * @param jo A JSONObject.
-   * @param names An array of strings.
+   * Creates a new {@code JSONObject} by copying all name/value mappings from
+   * the given map.
+   * @param copyFrom a map whose keys are of type {@link String} and whose values are of supported
+   * types.
+   * @throws NullPointerException if any of the map's keys are null.
    */
-  public JSONObject(JSONObject jo, String[] names) {
+    /* (accept a raw type for API compatibility) */
+  public JSONObject(Map copyFrom) {
     this();
-    for (int i = 0; i < names.length; i += 1) {
-      try {
-        this.putOnce(names[i], jo.opt(names[i]));
-      } catch (Exception ignore) {
-      }
-    }
-  }
-
-
-  /**
-   * Construct a JSONObject from a JSONTokener.
-   * 
-   * @param x A JSONTokener object containing the source string.
-   * @throws JSONException If there is a syntax error in the source string or a duplicated key.
-   */
-  public JSONObject(JSONTokener x) throws JSONException {
-    this();
-    char c;
-    String key;
-
-    if (x.nextClean() != '{') {
-      throw x.syntaxError("A JSONObject text must begin with '{'");
-    }
-    for (;;) {
-      c = x.nextClean();
-      switch (c) {
-        case 0:
-          throw x.syntaxError("A JSONObject text must end with '}'");
-        case '}':
-          return;
-        default:
-          x.back();
-          key = x.nextValue().toString();
-      }
-
-      // The key is followed by ':'. We will also tolerate '=' or '=>'.
-
-      c = x.nextClean();
-      if (c == '=') {
-        if (x.next() != '>') {
-          x.back();
-        }
-      } else if (c != ':') {
-        throw x.syntaxError("Expected a ':' after a key");
-      }
-      this.putOnce(key, x.nextValue());
-
-      // Pairs are separated by ','. We will also tolerate ';'.
-
-      switch (x.nextClean()) {
-        case ';':
-        case ',':
-          if (x.nextClean() == '}') {
-            return;
-          }
-          x.back();
-          break;
-        case '}':
-          return;
-        default:
-          throw x.syntaxError("Expected a ',' or '}'");
+    Map<?, ?> contentsTyped = (Map<?, ?>) copyFrom;
+    for (Map.Entry<?, ?> entry : contentsTyped.entrySet()) {
+            /*
+             * Deviate from the original by checking that keys are non-null and
+             * of the proper type. (We still defer validating the values).
+             */
+      String key = (String) entry.getKey();
+      if (key == null) {
+        throw new NullPointerException("key == null");
       }
+      nameValuePairs.put(key, wrap(entry.getValue()));
     }
   }
 
-
   /**
-   * Construct a JSONObject from a Map.
-   *
-   * @param map A map object that can be used to initialize the contents of the JSONObject.
+   * Creates a new {@code JSONObject} with name/value mappings from the next
+   * object in the tokener.
+   * @param readFrom a tokener whose nextValue() method will yield a {@code JSONObject}.
+   * @throws JSONException if the parse fails or doesn't yield a {@code JSONObject}.
    */
-  public JSONObject(Map map) {
-    this.map = new LinkedHashMap();
-    if (map != null) {
-      Iterator i = map.entrySet().iterator();
-      while (i.hasNext()) {
-        Map.Entry e = (Map.Entry) i.next();
-        Object value = e.getValue();
-        if (value != null) {
-          this.map.put(e.getKey(), wrap(value));
-        }
-      }
+  public JSONObject(JSONTokener readFrom) throws JSONException {
+        /*
+         * Getting the parser to populate this could get tricky. Instead, just
+         * parse to temporary JSONObject and then steal the data from that.
+         */
+    Object object = readFrom.nextValue();
+    if (object instanceof JSONObject) {
+      this.nameValuePairs = ((JSONObject) object).nameValuePairs;
+    } else {
+      throw JSON.typeMismatch(object, "JSONObject");
     }
   }
 
-
   /**
-   * Construct a JSONObject from an Object using bean getters. It reflects on all of the public
-   * methods of the object. For each of the methods with no parameters and a name starting with
-   * <code>"get"</code> or <code>"is"</code> followed by an uppercase letter, the method is invoked,
-   * and a key and the value returned from the getter method are put into the new JSONObject.
-   *
-   * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix. If the second
-   * remaining character is not upper case, then the first character is converted to lower case.
-   *
-   * For example, if an object has a method named <code>"getName"</code>, and if the result of
-   * calling <code>object.getName()</code> is <code>"Larry Fine"</code>, then the JSONObject will
-   * contain <code>"name": "Larry Fine"</code>.
-   *
-   * @param bean An object that has getter methods that should be used to make a JSONObject.
+   * Creates a new {@code JSONObject} with name/value mappings from the JSON
+   * string.
+   * @param json a JSON-encoded string containing an object.
+   * @throws JSONException if the parse fails or doesn't yield a {@code JSONObject}.
    */
-  public JSONObject(Object bean) {
-    this();
-    this.populateMap(bean);
+  public JSONObject(String json) throws JSONException {
+    this(new JSONTokener(json));
   }
 
-
   /**
-   * Construct a JSONObject from an Object, using reflection to find the public members. The
-   * resulting JSONObject's keys will be the strings from the names array, and the values will be
-   * the field values associated with those keys in the object. If a key is not found or not
-   * visible, then it will not be copied into the new JSONObject.
-   * 
-   * @param object An object that has fields that should be used to make a JSONObject.
-   * @param names An array of strings, the names of the fields to be obtained from the object.
+   * Creates a new {@code JSONObject} by copying mappings for the listed names
+   * from the given object. Names that aren't present in {@code copyFrom} will
+   * be skipped.
+   * @param copyFrom The source object.
+   * @param names The names of the fields to copy.
+   * @throws JSONException On internal errors. Shouldn't happen.
    */
-  public JSONObject(Object object, String names[]) {
+  public JSONObject(JSONObject copyFrom, String[] names) throws JSONException {
     this();
-    Class c = object.getClass();
-    for (int i = 0; i < names.length; i += 1) {
-      String name = names[i];
-      try {
-        this.putOpt(name, c.getField(name).get(object));
-      } catch (Exception ignore) {
+    for (String name : names) {
+      Object value = copyFrom.opt(name);
+      if (value != null) {
+        nameValuePairs.put(name, value);
       }
     }
   }
 
-
   /**
-   * Construct a JSONObject from a source JSON text string. This is the most commonly used
-   * JSONObject constructor.
-   * 
-   * @param source A string beginning with <code>{</code>&nbsp;<small>(left brace)</small> and
-   *        ending with <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @exception JSONException If there is a syntax error in the source string or a duplicated key.
+   * Creates a json object from a bean
+   * @param bean the bean to create the json object from
+   * @throws JSONException If there is an exception while reading the bean
    */
-  public JSONObject(String source) throws JSONException {
-    this(new JSONTokener(source));
+  public JSONObject(Object bean) throws JSONException {
+    this(propertiesAsMap(bean));
   }
 
+  //This is custom properties mapping specific for GEODE
+  private static Map<String, Object> propertiesAsMap(Object bean) {
+    Map<String, Object> props = new TreeMap();
+    Class klass = bean.getClass();
 
-  /**
-   * Construct a JSONObject from a ResourceBundle.
-   * 
-   * @param baseName The ResourceBundle base name.
-   * @param locale The Locale to load the ResourceBundle for.
-   * @throws JSONException If any JSONExceptions are detected.
-   */
-  public JSONObject(String baseName, Locale locale) throws JSONException {
-    this();
-    ResourceBundle bundle =
-        ResourceBundle.getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
-
-    // Iterate through the keys in the bundle.
-
-    Enumeration keys = bundle.getKeys();
-    while (keys.hasMoreElements()) {
-      Object key = keys.nextElement();
-      if (key instanceof String) {
-
-        // Go through the path, ensuring that there is a nested JSONObject for each
-        // segment except the last. Add the value using the last segment's name into
-        // the deepest nested JSONObject.
-
-        String[] path = ((String) key).split("\\.");
-        int last = path.length - 1;
-        JSONObject target = this;
-        for (int i = 0; i < last; i += 1) {
-          String segment = path[i];
-          JSONObject nextTarget = target.optJSONObject(segment);
-          if (nextTarget == null) {
-            nextTarget = new JSONObject();
-            target.put(segment, nextTarget);
+    // If klass is a System class then set includeSuperClass to false.
+
+    boolean includeSuperClass = klass.getClassLoader() != null;
+
+    Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+    for (int i = 0; i < methods.length; i += 1) {
+      try {
+        Method method = methods[i];
+        if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
+          String name = method.getName();
+          String key = "";
+          if (name.startsWith("get")) {
+            if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
+              key = "";
+            } else {
+              key = name.substring(3);
+            }
+          } else if (name.startsWith("is")) {
+            key = name.substring(2);
+          }
+          if (key.length() > 0 && Character.isUpperCase(key.charAt(0))
+              && method.getParameterTypes().length == 0) {
+            if (key.length() == 1) {
+              key = key.toLowerCase();
+            } else if (!Character.isUpperCase(key.charAt(1))) {
+              key = key.substring(0, 1).toLowerCase() + key.substring(1);
+            }
+            Object result = method.invoke(bean, (Object[]) null);
+            if (result != null) {
+              props.put(key, wrap(result));
+            } else if (!method.getReturnType().isArray()) {
+              props.put(key, JSONObject.NULL);
+            }
           }
-          target = nextTarget;
         }
-        target.put(path[last], bundle.getString((String) key));
+      } catch (Exception ignore) {
       }
     }
+    props.put("type-class", klass.getCanonicalName());
+    return props;
   }
 
-
-  /**
-   * Accumulate values under a key. It is similar to the put method except that if there is already
-   * an object stored under the key then a JSONArray is stored under the key to hold all of the
-   * accumulated values. If there is already a JSONArray, then the new value is appended to it. In
-   * contrast, the put method replaces the previous value.
-   *
-   * If only one value is accumulated that is not a JSONArray, then the result will be the same as
-   * using put. But if multiple values are accumulated, then the result will be like append.
-   * 
-   * @param key A key string.
-   * @param value An object to be accumulated under the key.
-   * @return this.
-   * @throws JSONException If the value is an invalid number or if the key is null.
-   */
-  public JSONObject accumulate(String key, Object value) throws JSONException {
-    testValidity(value);
-    Object object = this.opt(key);
-    if (object == null) {
-      this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
-    } else if (object instanceof JSONArray) {
-      ((JSONArray) object).put(value);
-    } else {
-      this.put(key, new JSONArray().put(object).put(value));
+  public static String[] getNames(JSONObject x) {
+    Set<String> names = x.keySet();
+    String[] r = new String[names.size()];
+    int i = 0;
+    for (String name : names) {
+      r[i++] = name;
     }
-    return this;
+    return r;
   }
 
-
   /**
-   * Append values to the array under a key. If the key does not exist in the JSONObject, then the
-   * key is put in the JSONObject with its value being a JSONArray containing the value parameter.
-   * If the key was already associated with a JSONArray, then the value parameter is appended to it.
-   * 
-   * @param key A key string.
-   * @param value An object to be accumulated under the key.
-   * @return this.
-   * @throws JSONException If the key is null or if the current value associated with the key is not
-   *         a JSONArray.
+   * Returns the number of name/value mappings in this object.
+   * @return the length of this.
    */
-  public JSONObject append(String key, Object value) throws JSONException {
-    testValidity(value);
-    Object object = this.opt(key);
-    if (object == null) {
-      this.put(key, new JSONArray().put(value));
-    } else if (object instanceof JSONArray) {
-      this.put(key, ((JSONArray) object).put(value));
-    } else {
-      throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
-    }
-    return this;
+  public int length() {
+    return nameValuePairs.size();
   }
 
-
   /**
-   * Produce a string from a double. The string "null" will be returned if the number is not finite.
-   * 
-   * @param d A double.
-   * @return A String.
+   * Maps {@code name} to {@code value}, clobbering any existing name/value
+   * mapping with the same name.
+   * @param name The name of the value to insert.
+   * @param value The value to insert.
+   * @return this object.
+   * @throws JSONException Should not be possible.
    */
-  public static String doubleToString(double d) {
-    if (Double.isInfinite(d) || Double.isNaN(d)) {
-      return "null";
-    }
-
-    // Shave off trailing zeros and decimal point, if possible.
-
-    String string = Double.toString(d);
-    if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) {
-      while (string.endsWith("0")) {
-        string = string.substring(0, string.length() - 1);
-      }
-      if (string.endsWith(".")) {
-        string = string.substring(0, string.length() - 1);
-      }
-    }
-    return string;
+  public JSONObject put(String name, boolean value) throws JSONException {
+    nameValuePairs.put(checkName(name), value);
+    return this;
   }
 
-
   /**
-   * Get the value object associated with a key.
-   *
-   * @param key A key string.
-   * @return The object associated with the key.
-   * @throws JSONException if the key is not found.
+   * Maps {@code name} to {@code value}, clobbering any existing name/value
+   * mapping with the same name.
+   * @param name The name for the new value.
+   * @param value a finite value. May not be {@link Double#isNaN() NaNs} or {@link
+   * Double#isInfinite() infinities}.
+   * @return this object.
+   * @throws JSONException if value is NaN or infinite.
    */
-  public Object get(String key) throws JSONException {
-    if (key == null) {
-      throw new JSONException("Null key.");
-    }
-    Object object = this.opt(key);
-    if (object == null) {
-      throw new JSONException("JSONObject[" + quote(key) + "] not found.");
-    }
-    return object;
+  public JSONObject put(String name, double value) throws JSONException {
+    nameValuePairs.put(checkName(name), JSON.checkDouble(value));
+    return this;
   }
 
-
   /**
-   * Get the boolean value associated with a key.
-   *
-   * @param key A key string.
-   * @return The truth.
-   * @throws JSONException if the value is not a Boolean or the String "true" or "false".
+   * Maps {@code name} to {@code value}, clobbering any existing name/value
+   * mapping with the same name.
+   * @param name The name for the new value.
+   * @param value The new value.
+   * @return this object.
+   * @throws JSONException Should not be possible.
    */
-  public boolean getBoolean(String key) throws JSONException {
-    Object object = this.get(key);
-    if (object.equals(Boolean.FALSE)
-        || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) {
-      return false;
-    } else if (object.equals(Boolean.TRUE)
-        || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) {
-      return true;
-    }
-    throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
+  public JSONObject put(String name, int value) throws JSONException {
+    nameValuePairs.put(checkName(name), value);
+    return this;
   }
 
-
   /**
-   * Get the double value associated with a key.
-   * 
-   * @param key A key string.
-   * @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.
+   * Maps {@code name} to {@code value}, clobbering any existing name/value
+   * mapping with the same name.
+   * @param name The name of the new value.
+   * @param value The new value to insert.
+   * @return this object.
+   * @throws JSONException Should not be possible.
    */
-  public double getDouble(String key) throws JSONException {
-    Object object = this.get(key);
-    try {
-      return object instanceof Number ? ((Number) object).doubleValue()
-          : Double.parseDouble((String) object);
-    } catch (Exception e) {
-      throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
-    }
+  public JSONObject put(String name, long value) throws JSONException {
+    nameValuePairs.put(checkName(name), value);
+    return this;
   }
 
-
   /**
-   * Get the int value associated with a key.
-   *
-   * @param key A key string.
-   * @return The integer value.
-   * @throws JSONException if the key is not found or if the value cannot be converted to an
-   *         integer.
+   * Maps {@code name} to {@code value}, clobbering any existing name/value
+   * mapping with the same name. If the value is {@code null}, any existing
+   * mapping for {@code name} is removed.
+   * @param name The name of the new value.
+   * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
+   * {@link #NULL}, or {@code null}. May not be {@link Double#isNaN() NaNs} or {@link
+   * Double#isInfinite() infinities}.
+   * @return this object.
+   * @throws JSONException if the value is an invalid double (infinite or NaN).
    */
-  public int getInt(String key) throws JSONException {
-    Object object = this.get(key);
-    try {
-      return object instanceof Number ? ((Number) object).intValue()
-          : Integer.parseInt((String) object);
-    } catch (Exception e) {
-      throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
+  public JSONObject put(String name, Object value) throws JSONException {
+    if (value == null) {
+      nameValuePairs.remove(name);
+      return this;
     }
-  }
-
-
-  /**
-   * Get the JSONArray value associated with a key.
-   *
-   * @param key A key string.
-   * @return A JSONArray which is the value.
-   * @throws JSONException if the key is not found or if the value is not a JSONArray.
-   */
-  public JSONArray getJSONArray(String key) throws JSONException {
-    Object object = this.get(key);
-    if (object instanceof JSONArray) {
-      return (JSONArray) object;
+    if (value instanceof Number) {
+      // deviate from the original by checking all Numbers, not just floats & doubles
+      JSON.checkDouble(((Number) value).doubleValue());
     }
-    throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
+    nameValuePairs.put(checkName(name), value);
+    return this;
   }
 
-
   /**
-   * Get the JSONObject value associated with a key.
+   * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced
+   * from a Collection.
    *
    * @param key A key string.
-   * @return A JSONObject which is the value.
-   * @throws JSONException if the key is not found or if the value is not a JSONObject.
+   * @param value A Collection value.
+   * @return this.
+   * @throws JSONException
    */
-  public JSONObject getJSONObject(String key) throws JSONException {
-    Object object = this.get(key);
-    if (object instanceof JSONObject) {
-      return (JSONObject) object;
-    }
-    throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
+  public JSONObject put(String key, Collection value) throws JSONException {
+    this.put(key, new JSONArray(value));
+    return this;
   }
 
-
   /**
-   * Get the long value associated with a key.
-   *
-   * @param key A key string.
-   * @return The long value.
-   * @throws JSONException if the key is not found or if the value cannot be converted to a long.
+   * Equivalent to {@code put(name, value)} when both parameters are non-null;
+   * does nothing otherwise.
+   * @param name The name of the value to insert.
+   * @param value The value to insert.
+   * @return this object.
+   * @throws JSONException if the value is an invalid double (infinite or NaN).
    */
-  public long getLong(String key) throws JSONException {
-    Object object = this.get(key);
-    try {
-      return object instanceof Number ? ((Number) object).longValue()
-          : Long.parseLong((String) object);
-    } catch (Exception e) {
-      throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
+  public JSONObject putOpt(String name, Object value) throws JSONException {
+    if (name == null || value == null) {
+      return this;
     }
+    return put(name, value);
   }
 
-
   /**
-   * Get an array of field names from a JSONObject.
+   * Appends {@code value} to the array already mapped to {@code name}. If
+   * this object has no mapping for {@code name}, this inserts a new mapping.
+   * If the mapping exists but its value is not an array, the existing
+   * and new values are inserted in order into a new array which is itself
+   * mapped to {@code name}. In aggregate, this allows values to be added to a
+   * mapping one at a time.
    *
-   * @return An array of field names, or null if there are no names.
+   * Note that {@code append(String, Object)} provides better semantics.
+   * In particular, the mapping for {@code name} will <b>always</b> be a
+   * {@link JSONArray}. Using {@code accumulate} will result in either a
+   * {@link JSONArray} or a mapping whose type is the type of {@code value}
+   * depending on the number of calls to it.
+   * @param name The name of the field to change.
+   * @param value a {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long, Double,
+   * {@link #NULL} or null. May not be {@link Double#isNaN() NaNs} or {@link Double#isInfinite()
+   * infinities}.
+   * @return this object after mutation.
+   * @throws JSONException If the object being added is an invalid number.
    */
-  public static String[] getNames(JSONObject jo) {
-    int length = jo.length();
-    if (length == 0) {
-      return null;
-    }
-    Iterator iterator = jo.keys();
-    String[] names = new String[length];
-    int i = 0;
-    while (iterator.hasNext()) {
-      names[i] = (String) iterator.next();
-      i += 1;
+  // TODO: Change {@code append) to {@link #append} when append is
+  // unhidden.
+  public JSONObject accumulate(String name, Object value) throws JSONException {
+    Object current = nameValuePairs.get(checkName(name));
+    if (current == null) {
+      return put(name, value);
     }
-    return names;
-  }
-
 
-  /**
-   * Get an array of field names from an Object.
-   *
-   * @return An array of field names, or null if there are no names.
-   */
-  public static String[] getNames(Object object) {
-    if (object == null) {
-      return null;
-    }
-    Class klass = object.getClass();
-    Field[] fields = klass.getFields();
-    int length = fields.length;
-    if (length == 0) {
-      return null;
-    }
-    String[] names = new String[length];
-    for (int i = 0; i < length; i += 1) {
-      names[i] = fields[i].getName();
+    if (current instanceof JSONArray) {
+      JSONArray array = (JSONArray) current;
+      array.checkedPut(value);
+    } else {
+      JSONArray array = new JSONArray();
+      array.checkedPut(current);
+      array.checkedPut(value);
+      nameValuePairs.put(name, array);
     }
-    return names;
+    return this;
   }
 
-
   /**
-   * Get the string associated with a key.
-   *
-   * @param key A key string.
-   * @return A string which is the value.
-   * @throws JSONException if there is no string value for the key.
+   * Appends values to the array mapped to {@code name}. A new {@link JSONArray}
+   * mapping for {@code name} will be inserted if no mapping exists. If the existing
+   * mapping for {@code name} is not a {@link JSONArray}, a {@link JSONException}
+   * will be thrown.
+   * @param name The name of the array to which the value should be appended.
+   * @param value The value to append.
+   * @return this object.
+   * @throws JSONException if {@code name} is {@code null} or if the mapping for {@code name} is
+   * non-null and is not a {@link JSONArray}.
    */
-  public String getString(String key) throws JSONException {
-    Object object = this.get(key);
-    if (object instanceof String) {
-      return (String) object;
+  public JSONObject append(String name, Object value) throws JSONException {
+    Object current = nameValuePairs.get(checkName(name));
+
+    final JSONArray array;
+    if (current instanceof JSONArray) {
+      array = (JSONArray) current;
+    } else if (current == null) {
+      JSONArray newArray = new JSONArray();
+      nameValuePairs.put(name, newArray);
+      array = newArray;
+    } else {
+      throw new JSONException("Key " + name + " is not a JSONArray");
     }
-    throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
-  }
 
+    array.checkedPut(value);
 
-  /**
-   * Determine if the JSONObject contains a specific key.
-   * 
-   * @param key A key string.
-   * @return true if the key exists in the JSONObject.
-   */
-  public boolean has(String key) {
-    return this.map.containsKey(key);
+    return this;
   }
 
-
-  /**
-   * Increment a property of a JSONObject. If there is no such property, create one with a value of
-   * 1. If there is such a property, and if it is an Integer, Long, Double, or Float, then add one
-   * to it.
-   * 
-   * @param key A key string.
-   * @return this.
-   * @throws JSONException If there is already a property with this name that is not an Integer,
-   *         Long, Double, or Float.
-   */
-  public JSONObject increment(String key) throws JSONException {
-    Object value = this.opt(key);
-    if (value == null) {
-      this.put(key, 1);
-    } else if (value instanceof Integer) {
-      this.put(key, ((Integer) value).intValue() + 1);
-    } else if (value instanceof Long) {
-      this.put(key, ((Long) value).longValue() + 1);
-    } else if (value instanceof Double) {
-      this.put(key, ((Double) value).doubleValue() + 1);
-    } else if (value instanceof Float) {
-      this.put(key, ((Float) value).floatValue() + 1);
-    } else {
-      throw new JSONException("Unable to increment [" + quote(key) + "].");
+  String checkName(String name) throws JSONException {
+    if (name == null) {
+      throw new JSONException("Names must be non-null");
     }
-    return this;
+    return name;
   }
 
-
   /**
-   * Determine if the value associated with the key is null or if there is no value.
-   * 
-   * @param key A key string.
-   * @return true if there is no value associated with the key or if the value is the
-   *         JSONObject.NULL object.
+   * Removes the named mapping if it exists; does nothing otherwise.
+   * @param name The name of the mapping to remove.
+   * @return the value previously mapped by {@code name}, or null if there was no such mapping.
    */
-  public boolean isNull(String key) {
-    return JSONObject.NULL.equals(this.opt(key));
+  public Object remove(String name) {
+    return nameValuePairs.remove(name);
   }
 
-
   /**
-   * Get an enumeration of the keys of the JSONObject.
-   *
-   * @return An iterator of the keys.
+   * Returns true if this object has no mapping for {@code name} or if it has
+   * a mapping whose value is {@link #NULL}.
+   * @param name The name of the value to check on.
+   * @return true if the field doesn't exist or is null.
    */
-  public Iterator keys() {
-    return this.map.keySet().iterator();
+  public boolean isNull(String name) {
+    Object value = nameValuePairs.get(name);
+    return value == null || value == NULL;
   }
 
-
   /**
-   * Get the number of keys stored in the JSONObject.
-   *
-   * @return The number of keys in the JSONObject.
+   * Returns true if this object has a mapping for {@code name}. The mapping
+   * may be {@link #NULL}.
+   * @param name The name of the value to check on.
+   * @return true if this object has a field named {@code name}
    */
-  public int length() {
-    return this.map.size();
+  public boolean has(String name) {
+    return nameValuePairs.containsKey(name);
   }
 
-
   /**
-   * Produce a JSONArray containing the names of the elements of this JSONObject.
-   * 
-   * @return A JSONArray containing the key strings, or null if the JSONObject is empty.
+   * Returns the value mapped by {@code name}, or throws if no such mapping exists.
+   * @param name The name of the value to get.
+   * @return The value.
+   * @throws JSONException if no such mapping exists.
    */
-  public JSONArray names() {
-    JSONArray ja = new JSONArray();
-    Iterator keys = this.keys();
-    while (keys.hasNext()) {
-      ja.put(keys.next());
+  public Object get(String name) throws JSONException {
+    Object result = nameValuePairs.get(name);
+    if (result == null) {
+      throw new JSONException("No value for " + name);
     }
-    return ja.length() == 0 ? null : ja;
+    return result;
   }
 
   /**
-   * Produce a string from a Number.
-   * 
-   * @param number A Number
-   * @return A String.
-   * @throws JSONException If n is a non-finite number.
+   * Returns the value mapped by {@code name}, or null if no such mapping
+   * exists.
+   * @param name The name of the value to get.
+   * @return The value.
    */
-  public static String numberToString(Number number) throws JSONException {
-    if (number == null) {
-      throw new JSONException("Null pointer");
-    }
-    testValidity(number);
-
-    // Shave off trailing zeros and decimal point, if possible.
-
-    String string = number.toString();
-    if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) {
-      while (string.endsWith("0")) {
-        string = string.substring(0, string.length() - 1);
-      }
-      if (string.endsWith(".")) {
-        string = string.substring(0, string.length() - 1);
-      }
-    }
-    return string;
+  public Object opt(String name) {
+    return nameValuePairs.get(name);
   }
 
-
   /**
-   * Get an optional value associated with a key.
-   * 
-   * @param key A key string.
-   * @return An object which is the value, or null if there is no value.
+   * Returns the value mapped by {@code name} if it exists and is a boolean or
+   * can be coerced to a boolean, or throws otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
+   * @throws JSONException if the mapping doesn't exist or cannot be coerced to a boolean.
    */
-  public Object opt(String key) {
-    return key == null ? null : this.map.get(key);
+  public boolean getBoolean(String name) throws JSONException {
+    Object object = get(name);
+    Boolean result = JSON.toBoolean(object);
+    if (result == null) {
+      throw JSON.typeMismatch(name, object, "boolean");
+    }
+    return result;
   }
 
-
   /**
-   * Get an optional boolean associated with a key. It returns false if there is no such key, or if
-   * the value is not Boolean.TRUE or the String "true".
-   *
-   * @param key A key string.
-   * @return The truth.
+   * Returns the value mapped by {@code name} if it exists and is a boolean or
+   * can be coerced to a boolean, or false otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
    */
-  public boolean optBoolean(String key) {
-    return this.optBoolean(key, false);
+  public boolean optBoolean(String name) {
+    return optBoolean(name, false);
   }
 
-
   /**
-   * Get an optional boolean associated with a key. It returns the defaultValue if there is no such
-   * key, or if it is not a Boolean or the String "true" or "false" (case insensitive).
-   *
-   * @param key A key string.
-   * @param defaultValue The default.
-   * @return The truth.
+   * Returns the value mapped by {@code name} if it exists and is a boolean or
+   * can be coerced to a boolean, or {@code fallback} otherwise.
+   * @param name The name of the field we want.
+   * @param fallback The value to return if the field isn't there.
+   * @return The selected value or the fallback.
    */
-  public boolean optBoolean(String key, boolean defaultValue) {
-    try {
-      return this.getBoolean(key);
-    } catch (Exception e) {
-      return defaultValue;
-    }
+  public boolean optBoolean(String name, boolean fallback) {
+    Object object = opt(name);
+    Boolean result = JSON.toBoolean(object);
+    return result != null ? result : fallback;
   }
 
-
   /**
-   * Get an optional double associated with a key, or NaN if there is no such key or if its value is
-   * not a number. If the value is a string, an attempt will be made to evaluate it as a number.
-   *
-   * @param key A string which is the key.
-   * @return An object which is the value.
+   * Returns the value mapped by {@code name} if it exists and is a double or
+   * can be coerced to a double, or throws otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
+   * @throws JSONException if the mapping doesn't exist or cannot be coerced to a double.
    */
-  public double optDouble(String key) {
-    return this.optDouble(key, Double.NaN);
+  public double getDouble(String name) throws JSONException {
+    Object object = get(name);
+    Double result = JSON.toDouble(object);
+    if (result == null) {
+      throw JSON.typeMismatch(name, object, "double");
+    }
+    return result;
   }
 
-
   /**
-   * Get an optional double associated with a key, or the defaultValue if there is no such key or if
-   * its value is not a number. If the value is a string, an attempt will be made to evaluate it as
-   * a number.
-   *
-   * @param key A key string.
-   * @param defaultValue The default.
-   * @return An object which is the value.
+   * Returns the value mapped by {@code name} if it exists and is a double or
+   * can be coerced to a double, or {@code NaN} otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
    */
-  public double optDouble(String key, double defaultValue) {
-    try {
-      return this.getDouble(key);
-    } catch (Exception e) {
-      return defaultValue;
-    }
+  public double optDouble(String name) {
+    return optDouble(name, Double.NaN);
   }
 
-
   /**
-   * Get an optional int value associated with a key, or zero if there is no such key or if the
-   * value is not a number. If the value is a string, an attempt will be made to evaluate it as a
-   * number.
-   *
-   * @param key A key string.
-   * @return An object which is the value.
+   * Returns the value mapped by {@code name} if it exists and is a double or
+   * can be coerced to a double, or {@code fallback} otherwise.
+   * @param name The name of the field we want.
+   * @param fallback The value to return if the field isn't there.
+   * @return The selected value or the fallback.
    */
-  public int optInt(String key) {
-    return this.optInt(key, 0);
+  public double optDouble(String name, double fallback) {
+    Object object = opt(name);
+    Double result = JSON.toDouble(object);
+    return result != null ? result : fallback;
   }
 
-
   /**
-   * Get an optional int 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.
-   *
-   * @param key A key string.
-   * @param defaultValue The default.
-   * @return An object which is the value.
+   * Returns the value mapped by {@code name} if it exists and is an int or
+   * can be coerced to an int, or throws otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
+   * @throws JSONException if the mapping doesn't exist or cannot be coerced to an int.
    */
-  public int optInt(String key, int defaultValue) {
-    try {
-      return this.getInt(key);
-    } catch (Exception e) {
-      return defaultValue;
+  public int getInt(String name) throws JSONException {
+    Object object = get(name);
+    Integer result = JSON.toInteger(object);
+    if (result == null) {
+      throw JSON.typeMismatch(name, object, "int");
     }
+    return result;
   }
 
-
   /**
-   * Get an optional JSONArray associated with a key. It returns null if there is no such key, or if
-   * its value is not a JSONArray.
-   *
-   * @param key A key string.
-   * @return A JSONArray which is the value.
+   * Returns the value mapped by {@code name} if it exists and is an int or
+   * can be coerced to an int, or 0 otherwise.
+   * @param name The name of the field we want.
+   * @return The selected value if it exists.
    */
-  public JSONArray optJSONArray(String key) {
-    Object o = this.opt(key);
-    return o instanceof JSONArray ? (JSONArray) o : null;
+  public int optInt(String name) {
+    return optInt(name, 0);
   }
 
-
   /**
-   * Get an optional JSONObject associated with a key. It returns null if there is no such key, or
-   * if its value is not a JSONObject.
-   *
-   * @param key A key string.
-   * @return A JSONObject which is the value.
+   * Returns the value mapped by {@code name} if it exists and is an int or
+   * can be coerced to an int, or {@code fallback} otherwise.
+   * @param name The name of the field we want.
+   * @param fallback The value to return if the field isn't there.
+   * @return The selected value or the fallback.
    */
-  public JSONObject optJSONObject(String key) {
-    Object object = this.opt(key);
-    return object instanceof JSONObject ? (JSONObject) object : null;
+  public int optInt(String name, int fallback) {
+    Object object = opt(name);
+    Integer result = JSON.toInteger(object);
+    return result != null ? result : fallback;
   }
 
-
   /**
-   * Get an optional long value associated with a key, or zero if there is no such key or if the
-   * value is not a number. If the value is a string, an attempt will be made to evaluate it as a
-   * number.
+   * Returns the value mapped by {@code name} if it exists and is a long or
+   * can be coerced to a long, or throws otherwise.
+   * Note that JSON represents numbers as doubles,
    *
-   * @param key A key string.
-   * @return An object which is the value.
+   * so this is <a href="#lossy">lossy</a>; use strings to transfer numbers
+   * via JSON without loss.
+   * @param name The name of the field that we want.
+   * @return The value of the field.
+   * @throws JSONException if the mapping doesn't exist or cannot be coerced to a long.
    */
-  public long optLong(String key) {
-    return this.optLong(key, 0);
+  public long getLong(String name) throws JSONException {
+    Object object = get(name);
+    Long result = JSON.toLong(object);
+    if (result == null) {
+      throw JSON.typeMismatch(name, object, "long");
+    }
+    return result;
   }
 
-
   /**
-   * Get an optional long 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.
-   *
-   * @param key A key string.
-   * @param defaultValue The default.
-   * @return An object which is the value.
+   * Returns the value mapped by {@code name} if it exists and is a long or
+   * can be coerced to a long, or 0 otherwise. Note that JSON represents numbers as doubles,
+   * so this is <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON.
+   * @param name The name of the field we want.
+   * @return The selected value.
    */
-  public long optLong(String key, long defaultValue) {
-    try {
-      return this.getLong(key);
-    } catch (Exception e) {
-      return defaultValue;
-    }
+  public long optLong(String name) {
+    return optLong(name, 0L);
   }
 
-
   /**
-   * Get an optional string associated with a key. It returns an empty string if there is no such
-   * key. If the value is not a string and is not null, then it is converted to a string.
-   *
-   * @param key A key string.
-   * @return A string which is the value.
+   * Returns the value mapped by {@code name} if it exists and is a long or
+   * can be coerced to a long, or {@code fallback} otherwise. Note that JSON represents
+   * numbers as doubles, so this is <a href="#lossy">lossy</a>; use strings to transfer
+   * numbers via JSON.
+   * @param name The name of the field we want.
+   * @param fallback The value to return if the field isn't there.
+   * @return The selected value or the fallback.
    */
-  public String optString(String key) {
-    return this.optString(key, "");
+  public long optLong(String name, long fallback) {
+    Object object = opt(name);
+    Long result = JSON.toLong(object);
+    return result != null ? result : fallback;
   }
 
-
   /**
-   * Get an optional string associated with a key. It returns the defaultValue if there is no such
-   * key.
-   *
-   * @param key A key string.
-   * @param defaultValue The default.
-   * @return A string which is the value.
+   * Returns the value mapped by {@code name} if it exists, coercing it if
+   * necessary, or throws if no such mapping exists.
+   * @param name The name of the field we want.
+   * @return The value of the field.
+   * @throws JSONException if no such mapping exists.
    */
-  public String optString(String key, String defaultValue) {
-    Object object = this.opt(key);
-    return NULL.equals(object) ? defaultValue : object.toString();
-  }
-
-
-  private void populateMap(Object bean) {
-    Class klass = bean.getClass();
-
-    // If klass is a System class then set includeSuperClass to false.
-
-    boolean includeSuperClass = klass.getClassLoader() != null;
-
-    Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
-    for (int i = 0; i < methods.length; i += 1) {
-      try {
-        Method method = methods[i];
-        if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
-          String name = method.getName();
-          String key = "";
-          if (name.startsWith("get")) {
-            if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
-              key = "";
-            } else {
-              key = name.substring(3);
-            }
-          } else if (name.startsWith("is")) {
-            key = name.substring(2);
-          }
-          if (key.length() > 0 && Character.isUpperCase(key.charAt(0))
-              && method.getParameterTypes().length == 0) {
-            if (key.length() == 1) {
-              key = key.toLowerCase();
-            } else if (!Character.isUpperCase(key.charAt(1))) {
-              key = key.substring(0, 1).toLowerCase() + key.substring(1);
-            }
-            Object result = method.invoke(bean, (Object[]) null);
-            if (result != null) {
-              this.map.put(key, wrap(result));
-            } else if (!method.getReturnType().isArray()) {
-              this.map.put(key, JSONObject.NULL);
-            }
-          }
-        }
-      } catch (Exception ignore) {
-      }
+  public String getString(String name) throws JSONException {
+    Object object = get(name);
+    String result = JSON.toString(object);
+    if (result == null) {
+      throw JSON.typeMismatch(name, object, "String");
     }
-    this.map.put("type-class", klass.getCanonicalName());
+    return result;
   }
 
-
   /**
-   * Put a key/boolean pair in the JSONObject.
-   *
-   * @param key A key string.
-   * @param value A boolean which is the value.
-   * @return this.
-   * @throws JSONException If the key is null.
+   * Returns the value mapped by {@code name} if it exists, coercing it if
+   * necessary, or the empty string if no such mapping exists.
+   * @param name The name of the field we want.
+   * @return The value of the field.
    */
-  public JSONObject put(String key, boolean value) throws JSONException {
-    this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
-    return this;
+  public String optString(String name) {
+    return optString(name, "");
   }
 
-
   /**
-   * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced
-   * from a Collection.
-   * 
-   * @param key A key string.
-   * @param value A Collection value.
-   * @return this.
-   * @throws JSONException
+   * Returns the value mapped by {@code name} if it exists, coercing it if
+   * necessary, or {@code fallback} if no such mapping exists.
+   * @param name The name of the field that we want.
+   * @param fallback The value to return if the field doesn't exist.
+   * @return The value of the field or fallback.
    */
-  public JSONObject put(String key, Collection value) throws JSONException {
-    this.put(key, new JSONArray(value));
-    return this;
+  public String optString(String name, String fallback) {
+    Object object = opt(name);
+    String result = JSON.toString(object);
+    return result != null ? result : fallback;
   }
 
-
   /**
-   * Put a key/double pair in the JSONObject.
-   *
-   * @param key A key string.
-   * @param value A double which is the value.
-   * @return this.
-   * @throws JSONException If the key is null or if the number is invalid.
+   * Returns the value mapped by {@code name} if it exists and is a {@code
+   * JSONArray}, or throws otherwise.
+   * @param name The field we want to get.
+   * @return The value of the field (if it is a JSONArray.
+   * @throws JSONException if the mapping doesn't exist or is not a {@code JSONArray}.
    */
-  public JSONObject put(String key, double value) throws JSONException {
-    this.put(key, new Double(value));
-    return this;
+  public JSONArray getJSONArray(String name) throws JSONException {
+    Object object = get(name);
+    if (object instanceof JSONArray) {
+      return (JSONArray) object;
+    } else {
+      throw JSON.typeMismatch(name, object, "JSONArray");
+    }
   }
 
-
   /**
-   * Put a key/int pair in the JSONObject.
-   *
-   * @param key A key string.
-   * @param value An int which is the value.
-   * @return this.
-   * @throws JSONException If the key is null.
+   * Returns the value mapped by {@code name} if it exists and is a {@code
+   * JSONArray}, or null otherwise.
+   * @param name The name of the field we want.
+   * @return The value of the specified field (assuming it is a JSNOArray
    */
-  public JSONObject put(String key, int value) throws JSONException {
-    this.put(key, new Integer(value));
-    return this;
+  public JSONArray optJSONArray(String name) {
+    Object object = opt(name);
+    return object instanceof JSONArray ? (JSONArray) object : null;
   }
 
-
   /**
-   * Put a key/long pair in the JSONObject.
-   *
-   * @param key A key string.
-   * @param value A long which is the value.
-   * @return this.
-   * @throws JSONException If the key is null.
+   * Returns the value mapped by {@code name} if it exists and is a {@code
+   * JSONObject}, or throws otherwise.
+   * @param name The name of the field that we want.
+   * @return a specified field value (if it is a JSONObject)
+   * @throws JSONException if the mapping doesn't exist or is not a {@code JSONObject}.
    */
-  public JSONObject put(String key, long value) throws JSONException {
-    this.put(key, new Long(value));
-    return this;
+  public JSONObject getJSONObject(String name) throws JSONException {
+    Object object = get(name);
+    if (object instanceof JSONObject) {
+      return (JSONObject) object;
+    } else {
+      throw JSON.typeMismatch(name, object, "JSONObject");
+    }
   }
 
-
   /**
-   * Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced
-   * from a Map.
-   * 
-   * @param key A key string.
-   * @param value A Map value.
-   * @return this.
-   * @throws JSONException
+   * Returns the value mapped by {@code name} if it exists and is a {@code
+   * JSONObject}, or null otherwise.
+   * @param name The name of the value we want.
+   * @return The specified value.
    */
-  public JSONObject put(String key, Map value) throws JSONException {
-    this.put(key, new JSONObject(value));
-    return this;
+  public JSONObject optJSONObject(String name) {
+    Object object = opt(name);
+    return object instanceof JSONObject ? (JSONObject) object : null;
   }
 
-
   /**
-   * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from
-   * the JSONObject if it is present.
-   * 
-   * @param key A key string.
-   * @param value An object which is the value. It should be of one of these types: Boolean, Double,
-   *        Integer, JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
-   * @return this.
-   * @throws JSONException If the value is non-finite number or if the key is null.
+   * Returns an array with the values corresponding to {@code names}. The
+   * array contains null for names that aren't mapped. This method returns
+   * null if {@code names} is either null or empty.
+   * @param names The names of the fields that we want the values for.
+   * @return The selected values.
+   * @throws JSONException On internal errors. Shouldn't happen.
    */
-  public JSONObject put(String key, Object value) throws JSONException {
-    if (key == null) {
-      throw new JSONException("Null key.");
+  public JSONArray toJSONArray(JSONArray names) throws JSONException {
+    JSONArray result = new JSONArray();
+    if (names == null) {
+      return null;
     }
-    if (value != null) {
-      testValidity(value);
-      this.map.put(key, value);
-    } else {
-      this.remove(key);
+    int length = names.length();
+    if (length == 0) {
+      return null;
     }
-    return this;
+    for (int i = 0; i < length; i++) {
+      String name = JSON.toString(names.opt(i));
+      result.put(opt(name));
+    }
+    return result;
   }
 
-
   /**
-   * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null,
-   * and only if there is not already a member with that name.
-   * 
-   * @param key
-   * @param value
-   * @return his.
-   * @throws JSONException if the key is a duplicate
+   * Returns an iterator of the {@code String} names in this object. The
+   * returned iterator supports {@link Iterator#remove() remove}, which will
+   * remove the corresponding mapping from this object. If this object is
+   * modified after the iterator is returned, the iterator's behavior is
+   * undefined. The order of the keys is undefined.
+   * @return an iterator over the keys.
    */
-  public JSONObject putOnce(String key, Object value) throws JSONException {
-    if (key != null && value != null) {
-      if (this.opt(key) != null) {
-        throw new JSONException("Duplicate key \"" + key + "\"");
-      }
-      this.put(key, value);
-    }
-    return this;
+  public Iterator<String> keys() {
+    return nameValuePairs.keySet().iterator();
   }
 
-
   /**
-   * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null.
-   * 
-   * @param key A key string.
-   * @param value An object which is the value. It should be of one of these types: Boolean, Double,
-   *        Integer, JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
-   * @return this.
-   * @throws JSONException If the value is a non-finite number.
+   * Returns the set of {@code String} names in this object. The returned set
+   * is a view of the keys in this object. {@link Set#remove(Object)} will remove
+   * the corresponding mapping from this object and set iterator behaviour
+   * is undefined if this object is modified after it is returned.
+   *
+   * See {@link #keys()}.
+   * @return The names in this object.
    */
-  public JSONObject putOpt(String key, Object value) throws JSONException {
-    if (key != null && value != null) {
-      this.put(key, value);
-    }
-    return this;
+  public Set<String> keySet() {
+    return nameValuePairs.keySet();
   }
 
-
   /**
-   * Produce a string in double quotes with backslash sequences in all the right places. A backslash
-   * will be inserted within </, producing <\/, allowing JSON text to be delivered in HTML. In JSON
-   * text, a string cannot contain a control character or an unescaped quote or backslash.
-   * 
-   * @param string A String
-   * @return A String correctly formatted for insertion in a JSON text.
+   * Returns an array containing the string names in this object. This method
+   * returns null if this object contains no mappings.
+   * @return the names.
    */
-  public static String quote(String string) {
-    StringWriter sw = new StringWriter();
-    synchronized (sw.getBuffer()) {
-      try {
-        return quote(string, sw).toString();
-      } catch (IOException ignored) {
-        // will never happen - we are writing to a string writer
-        return "";
-      }
-    }
-  }
-
-  public static Writer quote(String string, Writer w) throws IOException {
-    if (string == null || string.length() == 0) {
-      w.write("\"\"");
-      return w;
-    }
-
-    char b;
-    char c = 0;
-    String hhhh;
-    int i;
-    int len = string.length();
-
-    w.write('"');
-    for (i = 0; i < len; i += 1) {
-      b = c;
-      c = string.charAt(i);
-      switch (c) {
-        case '\\':
-        case '"':
-          w.write('\\');
-          w.write(c);
-          break;
-        case '/':
-          if (b == '<') {
-            w.write('\\');
-          }
-          w.write(c);
-          break;
-        case '\b':
-          w.write("\\b");
-          break;
-        case '\t':
-          w.write("\\t");
-          break;
-        case '\n':
-          w.write("\\n");
-          break;
-        case '\f':
-          w.write("\\f");
-          break;
-        case '\r':
-          w.write("\\r");
-          break;
-        default:
-          if (c < ' ' || (c >= '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) {
-            hhhh = "000" + Integer.toHexString(c);
-            w.write("\\u" + hhhh.substring(hhhh.length() - 4));
-          } else {
-            w.write(c);
-          }
-      }
-    }
-    w.write('"');
-    return w;
+  public JSONArray names() {
+    return nameValuePairs.isEmpty()
+        ? null
+        : new JSONArray(new ArrayList<String>(nameValuePairs.keySet()));
   }
 
   /**
-   * Remove a name and its value, if present.
-   * 
-   * @param key The name to be removed.
-   * @return The value that was associated with the name, or null if there was no value.
+   * Encodes this object as a compact JSON string, such as:
+   * <pre>{"query":"Pizza","locations":[94043,90210]}</pre>
    */
-  public Object remove(String key) {
-    return this.map.remove(key);
+  @Override
+  public String toString() {
+    try {
+      JSONStringer stringer = new JSONStringer();
+      writeTo(stringer);
+      return stringer.toString();
+    } catch (JSONException e) {
+      return null;
+    }
   }
 
   /**
-   * Try to convert a string into a number, boolean, or null. If the string can't be converted,
-   * return the string.
-   * 
-   * @param string A String.
-   * @return A simple JSON value.
+   * Encodes this object as a human readable JSON string for debugging, such
+   * as:
+   * <pre>
+   * {
+   *     "query": "Pizza",
+   *     "locations": [
+   *         94043,
+   *         90210
+   *     ]
+   * }</pre>
+   * @param indentSpaces the number of spaces to indent for each level of nesting.
+   * @return The string containing the pretty form of this.
+   * @throws JSONException On internal errors. Shouldn't happen.
    */
-  public static Object stringToValue(String string) {
-    Double d;
-    if (string.equals("")) {
-      return string;
-    }
-    if (string.equalsIgnoreCase("true")) {
-      return Boolean.TRUE;
-    }
-    if (string.equalsIgnoreCase("false")) {
-      return Boolean.FALSE;
-    }
-    if (string.equalsIgnoreCase("null")) {
-      return JSONObject.NULL;
-    }
-
-    /*
-     * If it might be a number, try converting it. If a number cannot be produced, then the value
-     * will just be a string. Note that the plus and implied string conventions are non-standard. A
-     * JSON parser may accept non-JSON forms as long as it accepts all correct JSON forms.
-     */
+  public String toString(int indentSpaces) throws JSONException {
+    JSONStringer stringer = new JSONStringer(indentSpaces);
+    writeTo(stringer);
+    return stringer.toString();
+  }
 
-    char b = string.charAt(0);
-    if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
-      try {
-        if (string.indexOf('.') > -1 || string.indexOf('e') > -1 || string.indexOf('E') > -1) {
-          d = Double.valueOf(string);
-          if (!d.isInfinite() && !d.isNaN()) {
-            return d;
-          }
-        } else {
-          Long myLong = new Long(string);
-          if (myLong.longValue() == myLong.intValue()) {
-            return new Integer(myLong.intValue());
-          } else {
-            return myLong;
-          }
-        }
-      } catch (Exception ignore) {
-      }
+  void writeTo(JSONStringer stringer) throws JSONException {
+    stringer.object();
+    for (Map.Entry<String, Object> entry : nameValuePairs.entrySet()) {
+      stringer.key(entry.getKey()).value(entry.getValue());
     }
-    return string;
+    stringer.endObject();
   }
 
-
   /**
-   * Throw an exception if the object is a NaN or infinite number.
-   * 
-   * @param o The object to test.
-   * @throws JSONException If o is a non-finite number.
+   * Encodes the number as a JSON string.
+   * @param number a finite value. May not be {@link Double#isNaN() NaNs} or {@link
+   * Double#isInfinite() infinities}.
+   * @return The encoded number in string form.
+   * @throws JSONException On internal errors. Shouldn't happen.
    */
-  public static void testValidity(Object o) throws JSONException {
-    if (o != null) {
-      if (o instanceof Double) {
-        if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
-          throw new JSONException("JSON does not allow non-finite numbers.");
-        }
-      } else if (o instanceof Float) {
-        if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
-          throw new JSONException("JSON does not allow non-finite numbers.");
-        }
-      }
+  public static String numberToString(Number number) throws JSONException {
+    if (number == null) {
+      throw new JSONException("Number must be non-null");
     }
-  }
 
+    double doubleValue = number.doubleValue();
+    JSON.checkDouble(doubleValue);
 
-  /**
-   * Produce a JSONArray containing the values of the members of this JSONObject.
-   * 
-   * @param names A JSONArray containing a list of key strings. This determines the sequence of the
-   *        values in the result.
-   * @return A JSONArray of values.
-   * @throws JSONException If any of the values are non-finite numbers.
-   */
-  public JSONArray toJSONArray(JSONArray names) throws JSONException {
-    if (names == null || names.length() == 0) {
-      return null;
+    // the original returns "-0" instead of "-0.0" for negative zero
+    if (number.equals(NEGATIVE_ZERO)) {
+      return "-0";
     }
-    JSONArray ja = new JSONArray();
-    for (int i = 0; i < names.length(); i += 1) {
-      ja.put(this.opt(names.getString(i)));
-    }
-    return ja;
-  }
 
-  /**
-   * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not
-   * result in a syntactically correct JSON text, then null will be returned instead.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   *
-   * @return a printable, displayable, portable, transmittable representation of the object,
-   *         beginning with <code>{</code>&nbsp;<small>(left brace)</small> and ending with
-   *         <code>}</code>&nbsp;<small>(right brace)</small>.
-   */
-  public String toString() {
-    try {
-      return this.toString(0);
-    } catch (Exception e) {
-      return null;
+    long longValue = number.longValue();
+    if (doubleValue == (double) longValue) {
+      return Long.toString(longValue);
     }
-  }
 
+    return number.toString();
+  }
 
   /**
-   * Make a prettyprinted JSON text of this JSONObject.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   * 
-   * @param indentFactor The number of spaces to add to each level of indentation.
-   * @return a printable, displayable, portable, transmittable representation of the object,
-   *         beginning with <code>{</code>&nbsp;<small>(left brace)</small> and ending with
-   *         <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @throws JSONException If the object contains an invalid number.
+   * Encodes {@code data} as a JSON string. This applies quotes and any
+   * necessary character escaping.
+   * @param data the string to encode. Null will be interpreted as an empty string.
+   * @return the quoted string.
    */
-  public String toString(int indentFactor) throws JSONException {
-    StringWriter w = new StringWriter();
-    synchronized (w.getBuffer()) {
-      return this.write(w, indentFactor, 0).toString();
+  public static String quote(String data) {
+    if (data == null) {
+      return "\"\"";
+    }
+    try {
+      JSONStringer stringer = new JSONStringer();
+      stringer.open(JSONStringer.Scope.NULL, "");
+      stringer.value(data);
+      stringer.close(JSONStringer.Scope.NULL, JSONStringer.Scope.NULL, "");
+      return stringer.toString();
+    } catch (JSONException e) {
+      throw new AssertionError();
     }
   }
 
   /**
-   * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then
-   * that method will be used to produce the JSON text. The method is required to produce a strictly
-   * conforming text. If the object does not contain a toJSONString method (which is the most common
-   * case), then a text will be produced by other means. If the value is an array or Collection,
-   * then a JSONArray will be made from it and its toJSONString method will be called. If the value
-   * is a MAP, then a JSONObject will be made from it and its toJSONString method will be called.
-   * Otherwise, the value's toString method will be called, and the result will be quoted.
+   * Wraps the given object if necessary.
    *
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   * 
-   * @param value The value to be serialized.
-   * @return a printable, displayable, transmittable representation of the object, beginning with
-   *         <code>{</code>&nbsp;<small>(left brace)</small> and ending with
-   *         <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @throws JSONException If the value is or contains an invalid number.
+   * <p>If the object is null or , returns {@link #NULL}. If the object is a {@code JSONArray} or
+   * {@code JSONObject}, no wrapping is necessary. If the object is {@code NULL}, no wrapping is
+   * necessary. If the object is an array or {@code Collection}, returns an equivalent {@code
+   * JSONArray}. If the object is a {@code Map}, returns an equivalent {@code JSONObject}. If the
+   * object is a primitive wrapper type or {@code String}, returns the object. If the object is from
+   * a {@code java} package, returns the result of {@code toString}. If the object is some other
+   * kind of object then it is assumed to be a bean and is converted to a JSONObject. If wrapping
+   * fails, returns null.
+   * @param o The object to wrap.
+   * @return The wrapped (if necessary) form of the object {$code o}
    */
-  public static String valueToString(Object value) throws JSONException {
-    if (value == null || value.equals(null)) {
-      return "null";
-    }
-    if (value instanceof JSONString) {
-      Object object;
-      try {
-        object = ((JSONString) value).toJSONString();
-      } catch (Exception e) {
-        throw new JSONException(e);
-      }
-      if (object instanceof String) {
-        return (String) object;
-      }
-      throw new JSONException("Bad value from toJSONString: " + object);
-    }
-    if (value instanceof Number) {
-      return numberToString((Number) value);
-    }
-    if (value instanceof Boolean || value instanceof JSONObject || value instanceof JSONArray) {
-      return value.toString();
+  public static Object wrap(Object o) {
+    if (o == null) {
+      return NULL;
     }
-    if (value instanceof Map) {
-      return new JSONObject((Map) value).toString();
+    if (o instanceof JSONArray || o instanceof JSONObject) {
+      return o;
     }
-    if (value instanceof Collection) {
-      return new JSONArray((Collection) value).toString();
+    if (o.equals(NULL)) {
+      return o;
     }
-    if (value.getClass().isArray()) {
-      return new JSONArray(value).toString();
-    }
-    return quote(value.toString());
-  }
-
-  /**
-   * Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array
-   * or collection, wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a
-   * standard property (Double, String, et al) then it is already wrapped. Otherwise, if it comes
-   * from one of the java packages, turn it into a string. And if it doesn't, try to wrap it in a
-   * JSONObject. If the wrapping fails, then null is returned.
-   *
-   * @param object The object to wrap
-   * @return The wrapped value
-   */
-  public static Object wrap(Object object) {
     try {
-      if (object == null) {
-        return NULL;
+      if (o instanceof Collection) {
+        return new JSONArray((Collection) o);
+      } else if (o.getClass().isArray()) {
+        return new JSONArray(o);
       }
-      if (object instanceof JSONObject || object instanceof JSONArray || NULL.equals(object)
-          || object instanceof JSONString || object instanceof Byte || object instanceof Character
-          || object instanceof Short || object instanceof Integer || object instanceof Long
-          || object instanceof Boolean || object instanceof Float || object instanceof Double
-          || object instanceof String) {
-        return object;
+      if (o instanceof Map) {
+        return new JSONObject((Map) o);
       }
-
-      if (object instanceof Collection) {
-        return new JSONArray((Collection) object);
-      }
-      if (object.getClass().isArray()) {
-        return new JSONArray(object);
+      if (o instanceof Boolean ||
+          o instanceof Byte ||
+          o instanceof Character ||
+          o instanceof Double ||
+          o instanceof Float ||
+          o instanceof Integer ||
+          o instanceof Long ||
+          o instanceof Short ||
+          o instanceof String) {
+        return o;
       }
-      if (object instanceof Map) {
-        return new JSONObject((Map) object);
-      }
-      Package objectPackage = object.getClass().getPackage();
+      // GEODE-2142: Added check to ignore GemFireCacheImpl
+//      if (o.getClass().getPackage().getName().startsWith("java.") || o instanceof Enum<?>) {
+//        return o.toString();
+//      }
+      Package objectPackage = o.getClass().getPackage();
       String objectPackageName = objectPackage != null ? objectPackage.getName() : "";
-      if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.")
-          || object.getClass().getClassLoader() == null
-          || object.getClass().getName().contains("GemFireCacheImpl")) {
-        return object.toString();
+      if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || o instanceof Enum<?>
+          || o.getClass().getClassLoader() == null
+          || o.getClass().getName().contains("GemFireCacheImpl")) {
+        return o.toString();
       }
-
+//      if (o.getClass().getPackage().getName().startsWith("java.") || o instanceof Enum<?> ||
+//          || objectPackageName.startsWith("javax.")
+//          || o.getClass().getClassLoader() == null
+//          o.getClass().getName().contains("GemFireCacheImpl")) {
+//        return o.toString();
+//      }
+      // GEODE-2142: Added the cyclicalDepCheck
       if (cyclicDepChkEnabled.get() != null && cyclicDependencySet.get() != null) {
-        if (cyclicDepChkEnabled.get() && cyclicDependencySet.get().contains(object)) {
+        if (cyclicDepChkEnabled.get() && cyclicDependencySet.get().contains(o)) {
           // break cyclic reference
-          return object.getClass().getCanonicalName();
+          return o.getClass().getCanonicalName();
         } else {
-          cyclicDependencySet.get().add(object);
-          return new JSONObject(object);
-        }
-      } else
-        return new JSONObject(object);
-
-    } catch (Exception exception) {
-      return null;
-    }
-  }
-
-
-  /**
-   * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace
-   * is added.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   *
-   * @return The writer.
-   * @throws JSONException
-   */
-  public Writer write(Writer writer) throws JSONException {
-    return this.write(writer, 0, 0);
-  }
-
-
-  static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent)
-      throws JSONException, IOException {
-    if (value == null || value.equals(null)) {
-      writer.write("null");
-    } else if (value instanceof JSONObject) {
-      ((JSONObject) value).write(writer, indentFactor, indent);
-    } else if (value instanceof JSONArray) {
-      ((JSONArray) value).write(writer, indentFactor, indent);
-    } else if (value instanceof Map) {
-      new JSONObject((Map) value).write(writer, indentFactor, indent);
-    } else if (value instanceof Collection) {
-      new JSONArray((Collection) value).write(writer, indentFactor, indent);
-    } else if (value.getClass().isArray()) {
-      new JSONArray(value).write(writer, indentFactor, indent);
-    } else if (value instanceof Number) {
-      writer.write(numberToString((Number) value));
-    } else if (value instanceof Boolean) {
-      writer.write(value.toString());
-    } else if (value instanceof JSONString) {
-      Object o;
-      try {
-        o = ((JSONString) value).toJSONString();
-      } catch (Exception e) {
-        throw new JSONException(e);
-      }
-      writer.write(o != null ? o.toString() : quote(value.toString()));
-    } else {
-      quote(value.toString(), writer);
-    }
-    return writer;
-  }
-
-  static final void indent(Writer writer, int indent) throws IOException {
-    for (int i = 0; i < indent; i += 1) {
-      writer.write(' ');
-    }
-  }
-
-  /**
-   * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace
-   * is added.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   *
-   * @return The writer.
-   * @throws JSONException
-   */
-  Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
-    try {
-      boolean commanate = false;
-      final int length = this.length();
-      Iterator keys = this.keys();
-      writer.write('{');
-
-      if (length == 1) {
-        Object key = keys.next();
-        writer.write(quote(key.toString()));
-        writer.write(':');
-        if (indentFactor > 0) {
-          writer.write(' ');
-        }
-        writeValue(writer, this.map.get(key), indentFactor, indent);
-      } else if (length != 0) {
-        final int newindent = indent + indentFactor;
-        while (keys.hasNext()) {
-          Object key = keys.next();
-          if (commanate) {
-            writer.write(',');
-          }
-          if (indentFactor > 0) {
-            writer.write('\n');
-          }
-          indent(writer, newindent);
-          writer.write(quote(key.toString()));
-          writer.write(':');
-          if (indentFactor > 0) {
-            writer.write(' ');
-          }
-          writeValue(writer, this.map.get(key), indentFactor, newindent);
-          commanate = true;
-        }
-        if (indentFactor > 0) {
-          writer.write('\n');
+          cyclicDependencySet.get().add(o);
+          return new JSONObject(o);
         }
-        indent(writer, indent);
+      } else {
+        return new JSONObject(o);
       }
-      writer.write('}');
-      return writer;
-    } catch (IOException exception) {
-      throw new JSONException(exception);
+    } catch (Exception ignored) {
     }
+    return null;
   }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode/blob/b3ec80bc/geode-json/src/main/java/org/json/JSONString.java
----------------------------------------------------------------------
diff --git a/geode-json/src/main/java/org/json/JSONString.java b/geode-json/src/main/java/org/json/JSONString.java
index 4a09d89..34815a8 100755
--- a/geode-json/src/main/java/org/json/JSONString.java
+++ b/geode-json/src/main/java/org/json/JSONString.java
@@ -1,17 +1,18 @@
 package org.json;
-
 /**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class
- * can change the behavior of <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
- * and <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will
- * be used instead of the default behavior of using the Object's <code>toString()</code> method and
- * quoting the result.
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code> 
+ * method so that a class can change the behavior of 
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
+ * and <code>JSONWriter.value(</code>Object<code>)</code>. The 
+ * <code>toJSONString</code> method will be used instead of the default behavior 
+ * of using the Object's <code>toString()</code> method and quoting the result.
  */
 public interface JSONString {
   /**
-   * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
+   * The <code>toJSONString</code> method allows a class to produce its own JSON 
+   * serialization. 
    * 
    * @return A strictly syntactically correct JSON text.
    */
   public String toJSONString();
-}
+}
\ No newline at end of file


Mime
View raw message