Merge pull request stleary#271 from johnjaylward/EnumCleanup

stleary · web-flow · commit ebe69df8e4d3 · 2016-08-19T10:28:04.000-05:00
Update enum support to be more fully featured.
diff --git a/JSONObject.java b/JSONObject.java
@@ -1710,6 +1710,9 @@ public static String valueToString(Object value) throws JSONException {
         if (value.getClass().isArray()) {
             return new JSONArray(value).toString();
         }
+        if(value instanceof Enum<?>){
+            return quote(((Enum<?>)value).name());
+        }
         return quote(value.toString());
     }
 
@@ -1737,7 +1740,7 @@ public static Object wrap(Object object) {
                     || object instanceof Long || object instanceof Boolean
                     || object instanceof Float || object instanceof Double
                     || object instanceof String || object instanceof BigInteger
-                    || object instanceof BigDecimal) {
+                    || object instanceof BigDecimal || object instanceof Enum) {
                 return object;
             }
 
@@ -1799,6 +1802,8 @@ static final Writer writeValue(Writer writer, Object value,
             writer.write(numberToString((Number) value));
         } else if (value instanceof Boolean) {
             writer.write(value.toString());
+        } else if (value instanceof Enum<?>) {
+            writer.write(quote(((Enum<?>)value).name()));
         } else if (value instanceof JSONString) {
             Object o;
             try {
