Recursive serialize/deserialize, resolves #15

ason.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="ason" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.afollestad" external.system.module.version="1.4.14" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

build.gradle

@@ -1,5 +1,5 @@
 group 'com.afollestad'
-version '1.4.13'
+version '1.4.14'
 
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -15,7 +15,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.novoda:bintray-release:+'
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.4.0"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.4.1"
     }
 }
 
@@ -35,7 +35,7 @@ publish {
     userOrg = 'drummer-aidan'
     groupId = 'com.afollestad'
     artifactId = 'ason'
-    publishVersion = '1.4.13'
+    publishVersion = '1.4.14'
     website = 'https://github.com/afollestad/ason'
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

src/main/java/com/afollestad/ason/Ason.java

@@ -20,7 +20,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/** @author Aidan Follestad (afollestad) */
+/**
+ * @author Aidan Follestad (afollestad)
+ */
 @SuppressWarnings({"WeakerAccess", "unused", "unchecked", "SameParameterValue"})
 public class Ason {
 
@@ -58,49 +60,83 @@ public Ason(@Nullable String json) {
   }
 
   public static Ason serialize(@Nullable Object object) {
-    return AsonSerializer.get().serialize(object);
+    return serialize(object, false);
+  }
+
+  public static Ason serialize(@Nullable Object object, boolean recursive) {
+    return AsonSerializer.get().serialize(object, recursive);
   }
 
   public static <T> AsonArray<T> serializeArray(@Nullable Object object) {
-    return AsonSerializer.get().serializeArray(object);
+    return serializeArray(object, false);
+  }
+
+  public static <T> AsonArray<T> serializeArray(@Nullable Object object, boolean recursive) {
+    return AsonSerializer.get().serializeArray(object, recursive);
   }
 
   public static <T> AsonArray<T> serializeList(@Nullable List<T> object) {
-    return AsonSerializer.get().serializeList(object);
+    return serializeList(object, false);
+  }
+
+  public static <T> AsonArray<T> serializeList(@Nullable List<T> object, boolean recursive) {
+    return AsonSerializer.get().serializeList(object, recursive);
   }
 
   public static <T> T deserialize(@Nullable String json, @NotNull Class<T> cls) {
+    return deserialize(json, cls, false);
+  }
+
+  public static <T> T deserialize(@Nullable String json, @NotNull Class<T> cls, boolean recursive) {
     if (isJsonArray(json)) {
       AsonArray ason = new AsonArray(json);
-      return AsonSerializer.get().deserializeArray(ason, cls);
+      return AsonSerializer.get().deserializeArray(ason, cls, recursive);
     } else {
       Ason ason = new Ason(json);
-      return AsonSerializer.get().deserialize(ason, cls);
+      return AsonSerializer.get().deserialize(ason, cls, recursive);
     }
   }
 
   public static <T> T deserialize(@Nullable Ason json, @NonNls Class<T> cls) {
-    return AsonSerializer.get().deserialize(json, cls);
+    return deserialize(json, cls, false);
+  }
+
+  public static <T> T deserialize(@Nullable Ason json, @NonNls Class<T> cls, boolean recursive) {
+    return AsonSerializer.get().deserialize(json, cls, recursive);
   }
 
   public static <T> T deserialize(@Nullable AsonArray json, @NonNls Class<T> cls) {
-    return AsonSerializer.get().deserializeArray(json, cls);
+    return deserialize(json, cls, false);
+  }
+
+  public static <T> T deserialize(@Nullable AsonArray json, @NonNls Class<T> cls,
+      boolean recursive) {
+    return AsonSerializer.get().deserializeArray(json, cls, recursive);
   }
 
   public static <T> List<T> deserializeList(@Nullable String json, @NotNull Class<T> cls) {
+    return deserializeList(json, cls, false);
+  }
+
+  public static <T> List<T> deserializeList(@Nullable String json, @NotNull Class<T> cls,
+      boolean recursive) {
     AsonArray array = new AsonArray(json);
-    return AsonSerializer.get().deserializeList(array, cls);
+    return AsonSerializer.get().deserializeList(array, cls, recursive);
   }
 
   public static <T> List<T> deserializeList(@Nullable AsonArray json, @NotNull Class<T> cls) {
-    return AsonSerializer.get().deserializeList(json, cls);
+    return deserializeList(json, cls, false);
   }
 
-  private Ason putInternal(JSONArray intoArray, JSONObject intoObject, String key, Object value) {
+  public static <T> List<T> deserializeList(@Nullable AsonArray json, @NotNull Class<T> cls,
+      boolean recursive) {
+    return AsonSerializer.get().deserializeList(json, cls, recursive);
+  }
+
+  private void putInternal(JSONArray intoArray, JSONObject intoObject, String key, Object value) {
     invalidateLoadedFields();
     if (value == null || JSONObject.NULL.equals(value) || JSONObject.NULL == value) {
       json.put(key, JSONObject.NULL);
-      return this;
     } else if (isPrimitive(value) || value instanceof JSONObject || value instanceof JSONArray) {
       if (value instanceof Byte) {
         value = ((Byte) value).intValue();
@@ -123,7 +159,6 @@ private Ason putInternal(JSONArray intoArray, JSONObject intoObject, String key,
     } else {
       putInternal(intoArray, intoObject, key, serializer.serialize(value));
     }
-    return this;
   }
 
   public Ason putNull(@NotNull String key) {
@@ -442,4 +477,8 @@ public String toString(int indentSpaces) {
   public <T> T deserialize(@NonNls Class<T> cls) {
     return deserialize(this, cls);
   }
+
+  public <T> T deserialize(@NonNls Class<T> cls, boolean recursive) {
+    return deserialize(this, cls, recursive);
+  }
 }