From ff418a3b524267887215f4ea59c1a040b2c4f9b1 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 11:44:06 +0530
Subject: [PATCH 001/159] Sample app changes

---
 .../vimeo/sample/model/AbstractDataList.java  |  6 ++++--
 .../vimeo/sample/model/AccessModifiers.java   | 10 ++++++----
 .../com/vimeo/sample/model/ConcreteClass.java |  9 +++++----
 .../com/vimeo/sample/model/GenericClass.java  |  9 +++++----
 .../sample/model/IdenticalFieldTypes.java     | 18 +++++++++--------
 .../com/vimeo/sample/model/NestedModel.java   |  6 ++++--
 .../java/com/vimeo/sample/model/Paging.java   |  6 ++++--
 .../vimeo/sample/model/RecursiveClass.java    | 20 ++++++++++---------
 .../java/com/vimeo/sample/model/Stats.java    |  6 ++++--
 .../sample/model/SuperAbstractDataList.java   |  8 +++++---
 .../sample/model/TypeTokenBasedModels.java    |  8 +++++---
 .../java/com/vimeo/sample/model/User.java     |  8 +++++---
 .../java/com/vimeo/sample/model/Video.java    | 16 +++++++--------
 .../com/vimeo/sample/model/VideoList.java     |  4 ++--
 14 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
index 1a2a42c4..bfff20b0 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
@@ -23,7 +23,8 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
 
@@ -35,9 +36,10 @@
  *
  * @param <T> the type of the list.
  */
+@UseStag
 public abstract class AbstractDataList<T> extends SuperAbstractDataList<Paging, ArrayList<T>> {
 
-    @GsonAdapterKey
+    @SerializedName("page")
     public int page;
 
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index 66746521..6c2d840a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -23,24 +23,26 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * Entity ensuring that all supported modifiers are allowed.
  * Public, protected, and package-private modifiers are allowed.
  * Private modifier is not allowed.
  */
+@UseStag
 public class AccessModifiers {
 
     // private modifier is not allowed
 
-    @GsonAdapterKey
+    @SerializedName("defaultModifier")
     String defaultModifier;
 
-    @GsonAdapterKey
+    @SerializedName("protectedModifier")
     protected String protectedModifier;
 
-    @GsonAdapterKey
+    @SerializedName("publicModifier")
     public String publicModifier;
 
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java b/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
index 5066c43c..f97f841f 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
@@ -23,7 +23,8 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * This class provides an example of using
@@ -31,17 +32,17 @@
  */
 public class ConcreteClass {
 
-    @GsonAdapterKey
+    @SerializedName("doublyNestedModel")
     NestedModel.DoublyNestedModel doublyNestedModel;
 
     public static class NestedModel {
 
-        @GsonAdapterKey
+        @SerializedName("message")
         public String message;
 
         public static class DoublyNestedModel {
 
-            @GsonAdapterKey
+            @SerializedName("message")
             public String message;
         }
     }
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
index f772d3a1..8a55d962 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
@@ -1,18 +1,19 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.Map;
 
 /**
  * Created by anirudh.r on 30/11/16.
  */
-
+@UseStag
 public class GenericClass<T> {
 
-    @GsonAdapterKey
+    @SerializedName("name")
     public T name;
 
-    @GsonAdapterKey
+    @SerializedName("map")
     public Map<String, Map<String, T>> mapField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
index 421f57e8..e51ba010 100644
--- a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
@@ -23,7 +23,8 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,26 +38,27 @@
  * generated for the same type within the
  * type adapter factory.
  */
+@UseStag
 public class IdenticalFieldTypes {
 
-    @GsonAdapterKey
+    @SerializedName("mUser")
     User mUser;
 
-    @GsonAdapterKey
+    @SerializedName("mSecondUser")
     User mSecondUser;
 
-    @GsonAdapterKey
+    @SerializedName("mUsersList")
     ArrayList<User> mUsersList;
 
-    @GsonAdapterKey
+    @SerializedName("mSecondUsersList")
     ArrayList<User> mSecondUsersList;
 
-    @GsonAdapterKey
+    @SerializedName("mStatsArrayList")
     ArrayList<Stats> mStatsArrayList;
 
-    @GsonAdapterKey("mListOfList")
+    @SerializedName("mListOfList")
     List<List<Stats>> mListOfList;
 
-    @GsonAdapterKey("mStats")
+    @SerializedName("mStats")
     Stats mStats;
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
index e9f0a76e..b90e88dd 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
@@ -23,15 +23,17 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * This class simulates a scenario where a class with the same
  * name is also present as a static inner class of another class
  * in the same package, see {@link ConcreteClass.NestedModel}.
  */
+@UseStag
 public class NestedModel {
 
-    @GsonAdapterKey
+    @SerializedName("test1")
     public String test1;
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/Paging.java b/sample/src/main/java/com/vimeo/sample/model/Paging.java
index 1590867c..77726060 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Paging.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Paging.java
@@ -23,14 +23,16 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * Simple paging info model used by the sample.
  */
+@UseStag
 public class Paging {
 
-    @GsonAdapterKey
+    @SerializedName("first")
     public String first;
 
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
index 9fca64d8..503306bc 100644
--- a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
@@ -1,7 +1,8 @@
 package com.vimeo.sample.model;
 
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.Collection;
 import java.util.List;
@@ -11,25 +12,26 @@
  * This can be inside the same class or could be in a class referenced by
  * this class which again refers back to this class
  */
+@UseStag
 public class RecursiveClass {
-    @GsonAdapterKey
+    @SerializedName("checkSum")
     public String checkSum;
 
-    @GsonAdapterKey
+    @SerializedName("stringNativeArray")
     public String[] stringNativeArray;
 
-    @GsonAdapterKey
+    @SerializedName("integerObject")
     public Integer integerObject;
 
-    @GsonAdapterKey
+    @SerializedName("integerArray")
     public List<Integer> integerArray;
 
-    @GsonAdapterKey
+    @SerializedName("collection")
     public Collection<Integer> collection;
 
-    @GsonAdapterKey
+    @SerializedName("nativeIntegerArray")
     public int[] nativeIntegerArray;
 
-    @GsonAdapterKey
+    @SerializedName("innerSum")
     public RecursiveClass innerSum;
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/Stats.java b/sample/src/main/java/com/vimeo/sample/model/Stats.java
index 52211fe6..19bbcfef 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Stats.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Stats.java
@@ -23,14 +23,16 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * Simple stats model used by the sample app.
  */
+@UseStag
 public class Stats {
 
-    @GsonAdapterKey("plays")
+    @SerializedName("plays")
     public int mPlays;
 
 
diff --git a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
index ba9cb431..c35147ad 100644
--- a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
@@ -23,7 +23,8 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * Ensures that retrieving fields from
@@ -35,12 +36,13 @@
  * @param <T> the paging type.
  * @param <K> the data type.
  */
+@UseStag
 public abstract class SuperAbstractDataList<T, K> {
 
-    @GsonAdapterKey
+    @SerializedName("paging")
     public T paging;
 
-    @GsonAdapterKey
+    @SerializedName("data")
     public K data;
 
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java b/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java
index 2ac1e4f7..793f8d5b 100644
--- a/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java
+++ b/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java
@@ -23,7 +23,8 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.List;
 import java.util.Map;
@@ -34,11 +35,12 @@
  * the interface fields for Map and List,
  * according to what stag supports.
  */
+@UseStag
 public class TypeTokenBasedModels {
 
-    @GsonAdapterKey("videoMap")
+    @SerializedName("videoMap")
     public Map<String, Video> videoMap;
 
-    @GsonAdapterKey("videoList")
+    @SerializedName("videoList")
     public List<Video> videoList;
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/User.java b/sample/src/main/java/com/vimeo/sample/model/User.java
index 7d7fdcd8..8cccce52 100644
--- a/sample/src/main/java/com/vimeo/sample/model/User.java
+++ b/sample/src/main/java/com/vimeo/sample/model/User.java
@@ -23,17 +23,19 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 /**
  * Simple user model used by the sample app.
  */
+@UseStag
 public class User {
 
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     public String mName;
 
-    @GsonAdapterKey("location")
+    @SerializedName("location")
     public String mLocation;
 
     @Override
diff --git a/sample/src/main/java/com/vimeo/sample/model/Video.java b/sample/src/main/java/com/vimeo/sample/model/Video.java
index e0fb5914..08111617 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Video.java
@@ -23,30 +23,30 @@
  */
 package com.vimeo.sample.model;
 
-import android.support.annotation.NonNull;
-
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
 import java.util.Date;
 
 /**
  * Simple video model used by the sample app.
  */
+@UseStag
 public class Video {
 
-    @GsonAdapterKey("user")
+    @SerializedName("user")
     public User mUser;
 
-    @GsonAdapterKey("link")
+    @SerializedName("link")
     public String mLink;
 
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     public String mName;
 
-    @GsonAdapterKey("created_time")
+    @SerializedName("created_time")
     public Date mCreatedTime;
 
-    @GsonAdapterKey("stats")
+    @SerializedName("stats")
     public Stats mStats;
 
     @Override
diff --git a/sample/src/main/java/com/vimeo/sample/model/VideoList.java b/sample/src/main/java/com/vimeo/sample/model/VideoList.java
index 2386542c..4bccce43 100644
--- a/sample/src/main/java/com/vimeo/sample/model/VideoList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/VideoList.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
 
 /**
  * Since this class has no annotated fields,
@@ -34,7 +34,7 @@
  * the abstraction hierarchy and to resolve
  * parameterized fields.
  */
-@GsonAdapterKey
+@UseStag
 public class VideoList extends AbstractDataList<Video> {
 
 }

From 5b03f6ae5cac4a928e4cb3754b365448c527986a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 11:44:55 +0530
Subject: [PATCH 002/159] serialized Name support for JsonName + renamed
 GsonAdapter to UseStag

---
 .../generators/TypeAdapterGenerator.java      | 21 ++++++++++++++-----
 .../vimeo/stag/processor/utils/TypeUtils.java |  4 ++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index bda751b4..1037f395 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -35,7 +35,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
-import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -250,11 +250,17 @@ private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
      */
     @NotNull
     private static String getJsonName(@NotNull Element element) {
-        String name = element.getAnnotation(GsonAdapterKey.class).value();
+        SerializedName annotation = element.getAnnotation(SerializedName.class);
+        String name = null;
 
-        if (name.isEmpty()) {
+        if (annotation != null) {
+            name = annotation.value();
+        }
+
+        if (name == null) {
             name = element.getSimpleName().toString();
         }
+
         return name;
     }
 
@@ -537,8 +543,13 @@ private String getWriteType(@NotNull Element key, @NotNull TypeMirror type, @Not
     @NotNull
     private String getAdapterWrite(@NotNull Element key, @NotNull TypeMirror type, @NotNull String variableName,
                                    @NotNull AdapterFieldInfo adapterFieldInfo) {
-        String adapterField = adapterFieldInfo.getAdapter(type);
-        return adapterField + ".write(writer, " + variableName + ")";
+        if (key.getAnnotation(WriteRuntimeType.class) != null) {
+            mGsonVariableUsed = true;
+            return "((TypeAdapter) mGson.getAdapter(" + variableName + ".getClass())).write(writer, " + variableName + ")";
+        } else {
+            String adapterField = adapterFieldInfo.getAdapter(type);
+            return adapterField + ".write(writer, " + variableName + ")";
+        }
     }
 
     @NotNull
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index be2b3bf0..3412412c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -195,7 +195,7 @@ public static TypeMirror getInheritedType(@Nullable Element element) {
      * {@code
      * Factory<T> {
      *
-     *  @literal @GsonAdapterKey
+     *  @literal @UseStag
      *   public T data;
      *
      * }
@@ -208,7 +208,7 @@ public static TypeMirror getInheritedType(@Nullable Element element) {
      * }
      * </pre>
      * In this example, VideoFactory has a public member variable T that is of type Video.
-     * Since the Factory class has the GsonAdapterKey annotation, we cannot just generate
+     * Since the Factory class has the UseStag annotation, we cannot just generate
      * parsing code for the Factory class, since it is generic and we need concrete types.
      * Instead when we generate the adapter for VideoFactory, we crawl the inheritance
      * hierarchy gathering the member variables. When we get to VideoFactory, we see it

From fb6188c94de4a4ce7f9875bc7b725bc94cee81a8 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 11:45:31 +0530
Subject: [PATCH 003/159] write runtime type annotation support + artifactory +
 renamed to UseStag

---
 stag-library/build.gradle                     | 77 +++++++++++++++++++
 .../{GsonAdapterKey.java => UseStag.java}     |  4 +-
 .../java/com/vimeo/stag/WriteRuntimeType.java | 16 ++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 rename stag-library/src/main/java/com/vimeo/stag/{GsonAdapterKey.java => UseStag.java} (97%)
 create mode 100644 stag-library/src/main/java/com/vimeo/stag/WriteRuntimeType.java

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 5b3c1ea5..463f7413 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -72,4 +72,81 @@ allprojects {
             }
         }
     }
+}
+
+
+group = ARTIFACTORY_GROUP
+version = VERSION_NAME_STAG
+status = STATUS
+
+apply plugin: 'artifactory'
+apply plugin: 'com.github.dcendents.android-maven'
+
+configurations {
+    published
+}
+
+task sourceJar(type: Jar) {
+    from 'src/main/java'
+    classifier "sources"
+}
+
+artifactoryPublish {
+    dependsOn sourceJar
+}
+
+artifacts {
+    published sourceJar
+}
+
+configure(install.repositories.mavenInstaller) {
+    pom.project {
+        licenses {
+            license {
+                name 'The Apache Software License, Version 2.0'
+                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution 'repo'
+            }
+        }
+    }
+}
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+artifactory {
+    contextUrl = ARTIFACTORY_REPO_URL
+    publish {
+        repository {
+            repoKey = REPO_KEY //The Artifactory repository key to publish to
+            //username = artifactory_user //The publisher user name, property taken from gradle.properties
+            //password = artifactory_password //The publisher password, property taken from gradle.properties
+        }
+        defaults {
+            publishConfigs('archives', 'published')
+            properties = ['build.status': "$it.project.status".toString()]
+            publishPom = true //Publish generated POM files to Artifactory (true by default)
+            publishIvy = false
+            //Publish generated Ivy descriptor files to Artifactory (true by default)
+        }
+    }
+    resolve {
+        repository {
+            repoKey = REPO_KEY //The Artifactory (preferably virtual) repository key to resolve from
+            //username = artifactory_user //Optional resolver user name (leave out to use anonymous resolution), property taken from gradle.properties
+            //password = artifactory_password //The resolver password, property taken from gradle.properties
+        }
+    }
 }
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
similarity index 97%
rename from stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
rename to stag-library/src/main/java/com/vimeo/stag/UseStag.java
index 389bb434..1d80f685 100644
--- a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
+++ b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
@@ -50,8 +50,8 @@
  * <p/>
  * See the sample code for examples of each.
  */
-@Target({ElementType.FIELD, ElementType.TYPE})
-public @interface GsonAdapterKey {
+@Target({ElementType.TYPE})
+public @interface UseStag {
 
     /**
      * The optional value for the JSON key
diff --git a/stag-library/src/main/java/com/vimeo/stag/WriteRuntimeType.java b/stag-library/src/main/java/com/vimeo/stag/WriteRuntimeType.java
new file mode 100644
index 00000000..388e3f41
--- /dev/null
+++ b/stag-library/src/main/java/com/vimeo/stag/WriteRuntimeType.java
@@ -0,0 +1,16 @@
+package com.vimeo.stag;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Use this annotation for a field, if you want gson to pick up the runtime type, instead of compile time type.
+ * This will work only while serializing, not for deserialization.
+ *
+ * Eg:
+ *
+ *
+ */
+@Target({ElementType.FIELD})
+public @interface WriteRuntimeType {
+}
\ No newline at end of file

From 7bbc3123df104e9e50113abb79ab058ba4aafcce Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 11:46:17 +0530
Subject: [PATCH 004/159] changed to class level parsing + artifactory publish
 support

---
 stag-library-compiler/build.gradle            | 77 ++++++++++++++++++-
 .../vimeo/stag/processor/StagProcessor.java   | 62 +++++++++++++--
 2 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 7e66c659..34778e37 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -11,7 +11,6 @@ dependencies {
     testCompile 'com.google.testing.compile:compile-testing:0.8'
 
     compile project(':stag-library')
-
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.squareup:javapoet:1.7.0'
     compile 'com.intellij:annotations:12.0@jar'
@@ -85,4 +84,80 @@ allprojects {
             }
         }
     }
+}
+
+group = ARTIFACTORY_GROUP
+version = VERSION_NAME_STAG_COMPILER
+status = STATUS
+
+apply plugin: 'artifactory'
+apply plugin: 'com.github.dcendents.android-maven'
+
+configurations {
+    published
+}
+
+task sourceJar(type: Jar) {
+    from 'src/main/java'
+    classifier "sources"
+}
+
+artifactoryPublish {
+    dependsOn sourceJar
+}
+
+artifacts {
+    published sourceJar
+}
+
+configure(install.repositories.mavenInstaller) {
+    pom.project {
+        licenses {
+            license {
+                name 'The Apache Software License, Version 2.0'
+                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution 'repo'
+            }
+        }
+    }
+}
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+artifactory {
+    contextUrl = ARTIFACTORY_REPO_URL
+    publish {
+        repository {
+            repoKey = REPO_KEY //The Artifactory repository key to publish to
+            //username = artifactory_user //The publisher user name, property taken from gradle.properties
+            //password = artifactory_password //The publisher password, property taken from gradle.properties
+        }
+        defaults {
+            publishConfigs('archives', 'published')
+            properties = ['build.status': "$it.project.status".toString()]
+            publishPom = true //Publish generated POM files to Artifactory (true by default)
+            publishIvy = false
+            //Publish generated Ivy descriptor files to Artifactory (true by default)
+        }
+    }
+    resolve {
+        repository {
+            repoKey = REPO_KEY //The Artifactory (preferably virtual) repository key to resolve from
+            //username = artifactory_user //Optional resolver user name (leave out to use anonymous resolution), property taken from gradle.properties
+            //password = artifactory_password //The resolver password, property taken from gradle.properties
+        }
+    }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 4554da2f..7df209eb 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -25,7 +25,7 @@
 
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.JavaFile;
-import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.StagGenerator;
 import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.TypeTokenConstantsGenerator;
@@ -65,7 +65,7 @@
 import javax.lang.model.type.TypeMirror;
 
 @AutoService(Processor.class)
-@SupportedAnnotationTypes("com.vimeo.stag.GsonAdapterKey")
+@SupportedAnnotationTypes("com.vimeo.stag.UseStag")
 @SupportedOptions(value = {"stagGeneratedPackageName"})
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
 public final class StagProcessor extends AbstractProcessor {
@@ -94,7 +94,7 @@ private static void addToListMap(@NotNull Map<Element, List<VariableElement>> ma
     @Override
     public Set<String> getSupportedAnnotationTypes() {
         Set<String> set = new HashSet<>();
-        set.add(GsonAdapterKey.class.getCanonicalName());
+        set.add(UseStag.class.getCanonicalName());
         return set;
     }
 
@@ -103,6 +103,22 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.RELEASE_7;
     }
 
+    private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
+        if (modifiers.contains(Modifier.FINAL)) {
+            if (!modifiers.contains(Modifier.STATIC)) {
+                throw new RuntimeException("Unable to access field \"" +
+                        variableElement.getSimpleName().toString() + "\" in class " +
+                        variableElement.getEnclosingElement().asType() +
+                        ", field must not be final.");
+            }
+        } else if (modifiers.contains(Modifier.PRIVATE)) {
+            throw new RuntimeException("Unable to access field \"" +
+                    variableElement.getSimpleName().toString() + "\" in class " +
+                    variableElement.getEnclosingElement().asType() +
+                    ", field must not be private.");
+        }
+    }
+
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (mHasBeenProcessed) {
@@ -117,11 +133,45 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         TypeUtils.initialize(processingEnv.getTypeUtils());
         ElementUtils.initialize(processingEnv.getElementUtils());
 
-        DebugLog.log("\nBeginning @GsonAdapterKey annotation processing\n");
+        DebugLog.log("\nBeginning @UseStag annotation processing\n");
 
         mHasBeenProcessed = true;
         Map<Element, List<VariableElement>> variableMap = new HashMap<>();
-        for (Element element : roundEnv.getElementsAnnotatedWith(GsonAdapterKey.class)) {
+
+        Set<? extends Element> rootElements = roundEnv.getRootElements();
+        for (Element rootElement : rootElements) {
+            if (rootElement.getAnnotation(UseStag.class) != null) {
+                List<? extends Element> enclosedElements = rootElement.getEnclosedElements();
+                for (Element enclosedElement : enclosedElements) {
+                    if (enclosedElement instanceof VariableElement) {
+                        final VariableElement variableElement = (VariableElement) enclosedElement;
+                        Element enclosingElement = variableElement.getEnclosingElement();
+                        if (!ElementUtils.isEnum(enclosingElement) && !TypeUtils.isAbstract(enclosingElement)) {
+                            Set<Modifier> modifiers = variableElement.getModifiers();
+                            TypeMirror enclosingClass = enclosingElement.asType();
+                            if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
+                                if(!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) {
+                                    if (!TypeUtils.isAbstract(enclosingElement)) {
+                                        checkModifiers(variableElement, modifiers);
+                                        mSupportedTypes.add(enclosingClass);
+                                    }
+                                    addToListMap(variableMap, enclosingElement, variableElement);
+                                }
+                            }
+                        }
+                    } else if (enclosedElement instanceof TypeElement) {
+                        if (!ElementUtils.isEnum(enclosedElement)) {
+                            if(!TypeUtils.isAbstract(enclosedElement)) {
+                                mSupportedTypes.add(enclosedElement.asType());
+                            }
+                            addToListMap(variableMap, enclosedElement, null);
+                        }
+                    }
+                }
+            }
+        }
+
+        for (Element element : roundEnv.getElementsAnnotatedWith(UseStag.class)) {
             if (element instanceof VariableElement) {
                 final VariableElement variableElement = (VariableElement) element;
 
@@ -188,7 +238,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             throw new RuntimeException(e);
         }
 
-        DebugLog.log("\nSuccessfully processed @GsonAdapterKey annotations\n");
+        DebugLog.log("\nSuccessfully processed @UseStag annotations\n");
 
         return true;
     }

From 52632e9a87849a5f8b1a62e908e8801795d5cc5a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 11:49:02 +0530
Subject: [PATCH 005/159] fixed a bug in generation of abstract classes

---
 .../src/main/java/com/vimeo/stag/processor/StagProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 7df209eb..54fa8bcc 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -146,7 +146,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                     if (enclosedElement instanceof VariableElement) {
                         final VariableElement variableElement = (VariableElement) enclosedElement;
                         Element enclosingElement = variableElement.getEnclosingElement();
-                        if (!ElementUtils.isEnum(enclosingElement) && !TypeUtils.isAbstract(enclosingElement)) {
+                        if (!ElementUtils.isEnum(enclosingElement)) {
                             Set<Modifier> modifiers = variableElement.getModifiers();
                             TypeMirror enclosingClass = enclosingElement.asType();
                             if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {

From ad8326e7e21b12393abe56e8a96f63f101f9f14c Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 16:04:26 +0530
Subject: [PATCH 006/159] bumped gson library version to 2.8.0

# Conflicts:
#	stag-library-compiler/build.gradle
---
 sample/build.gradle                | 2 +-
 stag-library-compiler/build.gradle | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sample/build.gradle b/sample/build.gradle
index 7beea728..c75f1adc 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
     compile project(':stag-library')
     apt project(':stag-library-compiler')
-    compile 'com.google.code.gson:gson:2.7'
+    compile 'com.google.code.gson:gson:2.8.0'
 }
 
 apt {
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 34778e37..54ea9a7b 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -11,7 +11,8 @@ dependencies {
     testCompile 'com.google.testing.compile:compile-testing:0.8'
 
     compile project(':stag-library')
-    compile 'com.google.code.gson:gson:2.7'
+
+    compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.squareup:javapoet:1.7.0'
     compile 'com.intellij:annotations:12.0@jar'
     compile 'com.google.auto.service:auto-service:1.0-rc2'

From be6bbc4e0a2c7bf69cf10eb8339d6d5f77a7c7ef Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 16:05:10 +0530
Subject: [PATCH 007/159] removed ParameterizedTypeUtil, since it is now public
 in 2.8.0 version of gson

---
 stag-library/build.gradle                     |  1 -
 .../stag/utils/ParameterizedTypeUtil.java     | 85 -------------------
 2 files changed, 86 deletions(-)
 delete mode 100644 stag-library/src/main/java/com/vimeo/stag/utils/ParameterizedTypeUtil.java

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 463f7413..4868209b 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -7,7 +7,6 @@ compileJava {
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.7'
 }
 
 // custom tasks for creating source/javadoc jars
diff --git a/stag-library/src/main/java/com/vimeo/stag/utils/ParameterizedTypeUtil.java b/stag-library/src/main/java/com/vimeo/stag/utils/ParameterizedTypeUtil.java
deleted file mode 100644
index 617e145a..00000000
--- a/stag-library/src/main/java/com/vimeo/stag/utils/ParameterizedTypeUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.vimeo.stag.utils;
-
-import com.google.gson.reflect.TypeToken;
-
-import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-public final class ParameterizedTypeUtil {
-    static void checkArgument(boolean condition) {
-        if (!condition) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    public static ParameterizedType newParameterizedTypeWithOwner(Type ownerType, Type rawType, Type... typeArguments) {
-        return new ParameterizedTypeImpl(ownerType, rawType, typeArguments);
-    }
-
-    static Type canonicalize(Type type) {
-        if (type instanceof Class) {
-            Class<?> c = (Class<?>) type;
-            return c;
-        }
-        if (type instanceof ParameterizedType) {
-            ParameterizedType p = (ParameterizedType) type;
-            return new ParameterizedTypeImpl(p.getOwnerType(), p.getRawType(), p.getActualTypeArguments());
-        }
-        return null;
-    }
-
-    static void checkNotPrimitive(Type type) {
-        checkArgument(!(type instanceof Class<?>) || !((Class<?>) type).isPrimitive());
-    }
-
-    public static TypeToken getTypeToken(Type rawType, Type... typeArguments) {
-        return TypeToken.get(new ParameterizedTypeImpl(null, rawType, typeArguments));
-    }
-
-    static <T> T checkNotNull(T obj) {
-        if (obj == null) {
-            throw new NullPointerException();
-        }
-        return obj;
-    }
-
-    private static final class ParameterizedTypeImpl implements ParameterizedType {
-        private final Type ownerType;
-
-        private final Type rawType;
-
-        private final Type[] typeArguments;
-
-        public ParameterizedTypeImpl(Type ownerType, Type rawType, Type[] typeArguments) {
-            if (rawType instanceof Class<?>) {
-                Class<?> rawTypeAsClass = (Class<?>) rawType;
-                boolean isStaticOrTopLevelClass = java.lang.reflect.Modifier.isStatic(rawTypeAsClass.getModifiers()) || rawTypeAsClass.getEnclosingClass() == null;
-                checkArgument(ownerType != null || isStaticOrTopLevelClass);
-            }
-            this.ownerType = ownerType == null ? null : canonicalize(ownerType);
-            this.rawType = canonicalize(rawType);
-            this.typeArguments = typeArguments.clone();
-            for (int t = 0; t < this.typeArguments.length; t++) {
-                checkNotNull(this.typeArguments[t]);
-                checkNotPrimitive(this.typeArguments[t]);
-                this.typeArguments[t] = canonicalize(this.typeArguments[t]);
-            }
-        }
-
-        @Override
-        public Type getOwnerType() {
-            return ownerType;
-        }
-
-        @Override
-        public Type getRawType() {
-            return rawType;
-        }
-
-        @Override
-        public Type[] getActualTypeArguments() {
-            return typeArguments.clone();
-        }
-    }
-}
\ No newline at end of file

From ac5c49edf8df19358a44ee1401c6c8d46d5a89c8 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 16:05:34 +0530
Subject: [PATCH 008/159] using TypeToken.getParameterizedType from 2.8.0 API

---
 .../vimeo/stag/processor/generators/TypeAdapterGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 1037f395..1c79f621 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -173,7 +173,7 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
                     String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                     TypeName typeName = getAdapterFieldTypeName(fieldType);
                     adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(fieldName + " = gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+                    constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
                 }
             }
         }
@@ -195,7 +195,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                result = "com.vimeo.stag.utils.ParameterizedTypeUtil.getTypeToken(" + declaredFieldType.asElement().toString() + ".class";
+                result = "com.google.gson.reflect.TypeToken.getParameterized(" + declaredFieldType.asElement().toString() + ".class";
                 /**
                  * Iterate through all the types from the typeArguments and generate typetoken code accordingly
                  */

From 00f9e47f638e8b05e5569d03bb71e4568e34d665 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 8 Dec 2016 23:39:49 +0530
Subject: [PATCH 009/159] Parsing Maps the Stag way

---
 .../vimeo/sample/model/ClassWithMapTypes.java | 26 +++++++
 .../generators/TypeAdapterGenerator.java      | 70 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
new file mode 100644
index 00000000..e7759934
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
@@ -0,0 +1,26 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.GsonAdapterKey;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ClassWithMapTypes {
+    @GsonAdapterKey
+    public HashMap<String, Video> videoHashMap;
+
+    @GsonAdapterKey
+    public LinkedHashMap<String, Integer> stringIntegerMap;
+
+    @GsonAdapterKey
+    public Map<Integer, String> integerStringMap;
+
+    @GsonAdapterKey
+    public Map<Video, String> complexTypeMap;
+
+    @GsonAdapterKey
+    public Map<String, List<Video>> mapOfLists;
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 1c79f621..f1b0ebad 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -51,6 +51,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -147,6 +148,15 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
                 if (isSupportedNative(fieldType.toString())) {
                     continue;
                 }
+            } else if (isMap(fieldType)
+                    && fieldType instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) fieldType).getTypeArguments();
+                if(typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
+                    fieldType = typeArguments.get(1);
+                    if (isSupportedNative(fieldType.toString())) {
+                        continue;
+                    }
+                }
             }
             exclusiveTypeSet.add(fieldType);
         }
@@ -239,6 +249,14 @@ static boolean isArray(@NotNull TypeMirror type) {
                 outerClassType.equals(Collection.class.getName());
     }
 
+    static boolean isMap(@NotNull TypeMirror type) {
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(Map.class.getName()) ||
+                outerClassType.equals(HashMap.class.getName())  ||
+                outerClassType.equals(LinkedHashMap.class.getName());
+    }
+
+
     @NotNull
     private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
         TypeName typeName = TypeVariableName.get(type);
@@ -481,6 +499,45 @@ private String getReadCode(@NotNull String prefix, @NotNull String variableName,
             }
             return result;
         } else {
+            if(isMap(type) && type instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
+                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
+                    String keyRead = getReadType(type, typeArguments.get(0), adapterFieldInfo);
+                    String valueRead = getReadType(type, typeArguments.get(1), adapterFieldInfo);
+                    String result =  prefix + "if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
+                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" :  type.toString()) + "();\n" +
+                            prefix + "\treader.beginObject();\n" +
+                            prefix + "\twhile (reader.hasNext()) {\n" +
+                            prefix + "\t\tcom.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);\n" +
+                            prefix + "\t\t" +  typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
+                            prefix + "\t\t" +  typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
+                            prefix + "\t\t" +  typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
+                            prefix + "\t\tif (replaced != null) {\n" +
+                            prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
+                            prefix + "\t\t}\n" +
+                            prefix + "\t}\n" +
+                            prefix + "\treader.endObject();\n" +
+                            prefix + "} else if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {\n" +
+                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" :  type.toString()) + "();\n" +
+                            prefix + "\treader.beginArray();\n" +
+                            prefix + "\twhile (reader.hasNext()) {\n" +
+                            prefix + "\t\treader.beginArray();\n" +
+                            prefix + "\t\t" +  typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
+                            prefix + "\t\t" +  typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
+                            prefix + "\t\t" +  typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
+                            prefix + "\t\tif (replaced != null) {\n" +
+                            prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
+                            prefix + "\t\t}\n" +
+                            prefix + "\t\treader.endArray();\n" +
+                            prefix + "\t}\n" +
+                            prefix + "\treader.endArray();\n" +
+                            prefix + "} else {\n" +
+                            prefix + "\treader.skipValue();\n" +
+                            prefix + "}";
+
+                    return result;
+                }
+            }
             return prefix + "object." + variableName + " = " +
                     getReadType(type, type, adapterFieldInfo) + ";";
         }
@@ -525,6 +582,19 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
                     prefix + "}\n" +
                     prefix + "writer.endArray();\n";
         } else {
+            if(isMap(type) && type instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
+                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
+                    String valueWrite = getWriteType(key, typeArguments.get(1), "entry.getValue()", adapterFieldInfo);
+                    return prefix + "writer.name(\"" + jsonName + "\");\n" +
+                            prefix + "writer.beginObject();\n" +
+                            prefix + "for (" + type.toString().replaceFirst("<", ".Entry<") + " entry : " + variableName + ".entrySet()) {\n" +
+                            prefix + "\twriter.name(String.valueOf(entry.getKey()));\n" +
+                            prefix + "\t" + valueWrite + "\n" +
+                            prefix + "}\n" +
+                            prefix + "writer.endObject();\n";
+                }
+            }
             return prefix + "writer.name(\"" + jsonName + "\");\n" +
                     prefix + getWriteType(key, type, variableName, adapterFieldInfo) + '\n';
         }

From cdfe7d5b407a1c72d3c370a21a54cbf3601998e0 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 8 Dec 2016 23:48:23 +0530
Subject: [PATCH 010/159] replaced gsonadapterkey with usestag

---
 .../java/com/vimeo/sample/model/ClassWithMapTypes.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
index e7759934..2e49ca87 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
@@ -1,26 +1,23 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+
+import com.vimeo.stag.UseStag;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+@UseStag
 public class ClassWithMapTypes {
-    @GsonAdapterKey
     public HashMap<String, Video> videoHashMap;
 
-    @GsonAdapterKey
     public LinkedHashMap<String, Integer> stringIntegerMap;
 
-    @GsonAdapterKey
     public Map<Integer, String> integerStringMap;
 
-    @GsonAdapterKey
     public Map<Video, String> complexTypeMap;
 
-    @GsonAdapterKey
     public Map<String, List<Video>> mapOfLists;
 
 }

From 17a5f42477ef16e394052929e0ad1be1983a1167 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 9 Dec 2016 01:16:24 +0530
Subject: [PATCH 011/159] Support for Enumerations

# Conflicts:
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
---
 .../com/vimeo/sample/model/EnumExample.java   |  15 ++
 .../vimeo/stag/processor/StagProcessor.java   |  46 +-----
 .../generators/AdapterGenerator.java          |  30 ++++
 .../generators/EnumTypeAdapterGenerator.java  | 142 ++++++++++++++++++
 .../generators/TypeAdapterGenerator.java      |  27 +---
 .../processor/generators/model/ClassInfo.java |  10 ++
 6 files changed, 206 insertions(+), 64 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/EnumExample.java
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/EnumExample.java b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
new file mode 100644
index 00000000..e2aba04d
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
@@ -0,0 +1,15 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.GsonAdapterKey;
+
+@GsonAdapterKey
+public enum EnumExample {
+    ENUM_VALUE1,
+    ENUM_VALUE2,
+    ENUM_VALUE3,
+    @GsonAdapterKey("CUSTOM_ENUM_VALUE4")
+    ENUM_VALUE4,
+    ENUM_VALUE5,
+    ENUM_VALUE6
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 54fa8bcc..d769b11d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -26,6 +26,9 @@
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.JavaFile;
 import com.vimeo.stag.UseStag;
+import com.squareup.javapoet.TypeSpec;
+import com.vimeo.stag.processor.generators.AdapterGenerator;
+import com.vimeo.stag.processor.generators.EnumTypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.StagGenerator;
 import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.TypeTokenConstantsGenerator;
@@ -59,6 +62,7 @@
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
@@ -160,51 +164,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                             }
                         }
                     } else if (enclosedElement instanceof TypeElement) {
-                        if (!ElementUtils.isEnum(enclosedElement)) {
                             if(!TypeUtils.isAbstract(enclosedElement)) {
                                 mSupportedTypes.add(enclosedElement.asType());
                             }
                             addToListMap(variableMap, enclosedElement, null);
-                        }
-                    }
-                }
-            }
-        }
-
-        for (Element element : roundEnv.getElementsAnnotatedWith(UseStag.class)) {
-            if (element instanceof VariableElement) {
-                final VariableElement variableElement = (VariableElement) element;
-
-                Element enclosingClassElement = variableElement.getEnclosingElement();
-                TypeMirror enclosingClass = enclosingClassElement.asType();
-
-                if (!ElementUtils.isEnum(enclosingClassElement)) {
-                    Set<Modifier> modifiers = variableElement.getModifiers();
-                    if (modifiers.contains(Modifier.FINAL)) {
-                        throw new RuntimeException("Unable to access field \"" +
-                                variableElement.getSimpleName().toString() + "\" in class " +
-                                variableElement.getEnclosingElement().asType() +
-                                ", field must not be final.");
-                    } else if (modifiers.contains(Modifier.PRIVATE)) {
-                        throw new RuntimeException("Unable to access field \"" +
-                                variableElement.getSimpleName().toString() + "\" in class " +
-                                variableElement.getEnclosingElement().asType() +
-                                ", field must not be private.");
-                    }
-
-                    if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
-                        if(!TypeUtils.isAbstract(enclosingClassElement)) {
-                            mSupportedTypes.add(enclosingClass);
-                        }
-                        addToListMap(variableMap, enclosingClassElement, variableElement);
-                    }
-                }
-            } else if (element instanceof TypeElement) {
-                if (!ElementUtils.isEnum(element)) {
-                    if(!TypeUtils.isAbstract(element)) {
-                        mSupportedTypes.add(element.asType());
                     }
-                    addToListMap(variableMap, element, null);
                 }
             }
         }
@@ -225,7 +189,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) &&
                         !TypeUtils.isAbstract(element)) {
                     ClassInfo classInfo = new ClassInfo(element.asType());
-                    TypeAdapterGenerator independentAdapter = new TypeAdapterGenerator(classInfo);
+                    AdapterGenerator independentAdapter = element.getKind() == ElementKind.ENUM ? new EnumTypeAdapterGenerator(classInfo, element) : new TypeAdapterGenerator(classInfo);
                     JavaFile javaFile = JavaFile.builder(classInfo.getPackageName(), independentAdapter.getTypeAdapterSpec(typeTokenConstantsGenerator, adapterGenerator)).build();
                     FileGenUtils.writeToFile(javaFile, filer);
                 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
new file mode 100644
index 00000000..16ebfa0c
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -0,0 +1,30 @@
+package com.vimeo.stag.processor.generators;
+
+
+import com.squareup.javapoet.TypeSpec;
+import com.vimeo.stag.GsonAdapterKey;
+
+import org.jetbrains.annotations.NotNull;
+
+import javax.lang.model.element.Element;
+
+public abstract class AdapterGenerator {
+
+    /**
+     * If the element is not annotated with {@link GsonAdapterKey}, the variable name is used.
+     */
+    @NotNull
+    protected static String getJsonName(@NotNull Element element) {
+        String name = (null != element.getAnnotation(GsonAdapterKey.class)) ?
+                element.getAnnotation(GsonAdapterKey.class).value() : null;
+
+        if (null == name || name.isEmpty()) {
+            name = element.getSimpleName().toString();
+        }
+        return name;
+    }
+
+    @NotNull
+    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                                @NotNull StagGenerator stagGenerator);
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
new file mode 100644
index 00000000..1c230e59
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
@@ -0,0 +1,142 @@
+package com.vimeo.stag.processor.generators;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.TypeVariableName;
+import com.vimeo.stag.processor.generators.model.ClassInfo;
+import com.vimeo.stag.processor.utils.FileGenUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.type.TypeMirror;
+
+public class EnumTypeAdapterGenerator extends AdapterGenerator {
+
+    @NotNull
+    private final ClassInfo mInfo;
+
+    @NotNull
+    private final Element mElement;
+
+
+    public EnumTypeAdapterGenerator(@NotNull ClassInfo info, @NotNull Element element) {
+        mInfo = info;
+        mElement = element;
+    }
+
+    /**
+     * Generates the TypeSpec for the TypeAdapter
+     * that this enum generates.
+     *
+     * @return a valid TypeSpec that can be written
+     * to a file or added to another class.
+     */
+    @Override
+    @NotNull
+    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                       @NotNull StagGenerator stagGenerator) {
+        TypeMirror typeMirror = mInfo.getType();
+        TypeName typeVariableName = TypeVariableName.get(typeMirror);
+
+        MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder()
+                .addModifiers(Modifier.PUBLIC)
+                .addParameter(Gson.class, "gson")
+                .addParameter(stagGenerator.getGeneratedClassName(), "stagFactory");
+
+        String className = FileGenUtils.unescapeEscapedString(mInfo.getTypeAdapterClassName());
+        TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(className)
+                .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+                .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
+
+
+        Map<String, Element> nameToConstant = new HashMap<>();
+        Map<Element, String> constantToName = new HashMap<>();
+
+        for(Element enclosingElement : mElement.getEnclosedElements()) {
+            if(enclosingElement.getKind() == ElementKind.ENUM_CONSTANT) {
+                String name = getJsonName(enclosingElement);
+                nameToConstant.put(name, enclosingElement);
+                constantToName.put(enclosingElement, name);
+            }
+        }
+
+        MethodSpec writeMethod = getWriteMethodSpec(typeVariableName);
+        MethodSpec readMethod = getReadMethodSpec(typeVariableName);
+
+        TypeName typeName = ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(String.class), TypeVariableName.get(typeMirror));
+        adapterBuilder.addField(typeName, "NAME_TO_CONSTANT", Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
+
+        typeName = ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(typeMirror), TypeVariableName.get(String.class));
+        adapterBuilder.addField(typeName, "CONSTANT_TO_NAME", Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
+
+        CodeBlock.Builder staticBlockBuilder = CodeBlock.builder();
+        staticBlockBuilder.addStatement("NAME_TO_CONSTANT = new HashMap<>(" + nameToConstant.size() + ")");
+        for(Map.Entry<String, Element> entry : nameToConstant.entrySet()) {
+            staticBlockBuilder.addStatement("NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + mInfo.getClassName() + "." + entry.getValue().getSimpleName().toString() + ")");
+        }
+
+        staticBlockBuilder.add("\n");
+        staticBlockBuilder.addStatement("CONSTANT_TO_NAME = new HashMap<>(" + constantToName.size() + ")");
+        for(Map.Entry<Element, String> entry : constantToName.entrySet()) {
+            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + mInfo.getClassName() + "." + entry.getKey().getSimpleName().toString() + ", \""  + entry.getValue() + "\")");
+        }
+
+
+        adapterBuilder.addStaticBlock(staticBlockBuilder.build());
+
+        adapterBuilder.addMethod(constructorBuilder.build());
+        adapterBuilder.addMethod(writeMethod);
+        adapterBuilder.addMethod(readMethod);
+
+
+        return adapterBuilder.build();
+    }
+
+    @NotNull
+    private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+                .addParameter(JsonWriter.class, "writer")
+                .addParameter(typeName, "object")
+                .returns(void.class)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.addStatement("writer.value(object == null ? null : CONSTANT_TO_NAME.get(object))");
+        return builder.build();
+    }
+
+    @NotNull
+    private MethodSpec getReadMethodSpec(@NotNull TypeName typeName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
+                .addParameter(JsonReader.class, "reader")
+                .returns(typeName)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.beginControlFlow("if (reader.peek() == com.google.gson.stream.JsonToken.NULL)");
+        builder.addStatement("reader.nextNull()");
+        builder.addStatement("return null");
+        builder.endControlFlow();
+        builder.addStatement("return NAME_TO_CONSTANT.get(reader.nextString())");
+        return builder.build();
+    }
+
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index f1b0ebad..43df3a2b 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -25,8 +25,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.squareup.javapoet.ClassName;
@@ -36,6 +34,7 @@
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
 import com.vimeo.stag.WriteRuntimeType;
+import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -65,7 +64,7 @@
 import javax.lang.model.type.TypeVariable;
 
 @SuppressWarnings("StringConcatenationMissingWhitespace")
-public class TypeAdapterGenerator {
+public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
     @NotNull
@@ -197,7 +196,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
-                result = "(" + ClassName.get(TypeToken.class) + "<" + fieldType + ">)" + ClassName.get(TypeToken.class) + ".get(" + typeVarsMap.get(fieldType) + ")";
+                result = " com.google.gson.reflect.TypeToken.get(" + typeVarsMap.get(fieldType) + ")";
             } else if (fieldType instanceof DeclaredType) {
                 /**
                  * If it is of ParameterizedType, {@link com.vimeo.stag.utils.ParameterizedTypeUtil} is used to get the
@@ -263,25 +262,6 @@ private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
         return ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
     }
 
-    /**
-     * If the element is not annotated with {@link SerializedName}, the variable name is used.
-     */
-    @NotNull
-    private static String getJsonName(@NotNull Element element) {
-        SerializedName annotation = element.getAnnotation(SerializedName.class);
-        String name = null;
-
-        if (annotation != null) {
-            name = annotation.value();
-        }
-
-        if (name == null) {
-            name = element.getSimpleName().toString();
-        }
-
-        return name;
-    }
-
     static boolean isSupportedNative(@NotNull String type) {
         return isSupportedPrimitive(type)
                 || type.equals(String.class.getName())
@@ -387,6 +367,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<E
      * @return a valid TypeSpec that can be written
      * to a file or added to another class.
      */
+    @Override
     @NotNull
     public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
     @NotNull StagGenerator stagGenerator) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
index 019bc8cb..7365c35f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
@@ -77,6 +77,16 @@ public String getPackageName() {
         return mPackageName;
     }
 
+    /**
+     * The name of the class.
+     *
+     * @return a valid package name.
+     */
+    @NotNull
+    public String getClassName() {
+        return mClassName;
+    }
+
     /**
      * The simple class name of the {@link com.google.gson.TypeAdapter} class for this model class.
      *

From f22545c20bb690ef4249ecbddc8bddedfd263bae Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 9 Dec 2016 02:32:29 +0530
Subject: [PATCH 012/159] support to parse enum

---
 .../vimeo/stag/processor/StagProcessor.java   | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index d769b11d..6d59771e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -26,7 +26,6 @@
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.JavaFile;
 import com.vimeo.stag.UseStag;
-import com.squareup.javapoet.TypeSpec;
 import com.vimeo.stag.processor.generators.AdapterGenerator;
 import com.vimeo.stag.processor.generators.EnumTypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.StagGenerator;
@@ -95,18 +94,6 @@ private static void addToListMap(@NotNull Map<Element, List<VariableElement>> ma
         map.put(key, list);
     }
 
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        Set<String> set = new HashSet<>();
-        set.add(UseStag.class.getCanonicalName());
-        return set;
-    }
-
-    @Override
-    public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.RELEASE_7;
-    }
-
     private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
         if (modifiers.contains(Modifier.FINAL)) {
             if (!modifiers.contains(Modifier.STATIC)) {
@@ -123,6 +110,18 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         }
     }
 
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        Set<String> set = new HashSet<>();
+        set.add(UseStag.class.getCanonicalName());
+        return set;
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.RELEASE_7;
+    }
+
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (mHasBeenProcessed) {
@@ -145,29 +144,34 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         Set<? extends Element> rootElements = roundEnv.getRootElements();
         for (Element rootElement : rootElements) {
             if (rootElement.getAnnotation(UseStag.class) != null) {
-                List<? extends Element> enclosedElements = rootElement.getEnclosedElements();
-                for (Element enclosedElement : enclosedElements) {
-                    if (enclosedElement instanceof VariableElement) {
-                        final VariableElement variableElement = (VariableElement) enclosedElement;
-                        Element enclosingElement = variableElement.getEnclosingElement();
-                        if (!ElementUtils.isEnum(enclosingElement)) {
-                            Set<Modifier> modifiers = variableElement.getModifiers();
-                            TypeMirror enclosingClass = enclosingElement.asType();
-                            if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
-                                if(!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) {
-                                    if (!TypeUtils.isAbstract(enclosingElement)) {
-                                        checkModifiers(variableElement, modifiers);
-                                        mSupportedTypes.add(enclosingClass);
+                if (ElementUtils.isEnum(rootElement)) {
+                    mSupportedTypes.add(rootElement.asType());
+                    addToListMap(variableMap, rootElement, null);
+                } else {
+                    List<? extends Element> enclosedElements = rootElement.getEnclosedElements();
+                    for (Element enclosedElement : enclosedElements) {
+                        if (enclosedElement instanceof VariableElement) {
+                            final VariableElement variableElement = (VariableElement) enclosedElement;
+                            Element enclosingElement = variableElement.getEnclosingElement();
+                            if (!ElementUtils.isEnum(enclosingElement)) {
+                                Set<Modifier> modifiers = variableElement.getModifiers();
+                                TypeMirror enclosingClass = enclosingElement.asType();
+                                if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
+                                    if (!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) {
+                                        if (!TypeUtils.isAbstract(enclosingElement)) {
+                                            checkModifiers(variableElement, modifiers);
+                                            mSupportedTypes.add(enclosingClass);
+                                        }
+                                        addToListMap(variableMap, enclosingElement, variableElement);
                                     }
-                                    addToListMap(variableMap, enclosingElement, variableElement);
                                 }
                             }
-                        }
-                    } else if (enclosedElement instanceof TypeElement) {
-                            if(!TypeUtils.isAbstract(enclosedElement)) {
+                        } else if (enclosedElement instanceof TypeElement) {
+                            if (!TypeUtils.isAbstract(enclosedElement)) {
                                 mSupportedTypes.add(enclosedElement.asType());
                             }
                             addToListMap(variableMap, enclosedElement, null);
+                        }
                     }
                 }
             }
@@ -179,7 +183,9 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 SupportedTypesModel.getInstance()
                         .addSupportedType(new AnnotatedClass(entry.getKey(), entry.getValue()));
             }
-            mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
+            try {
+                mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
+            } catch (Exception e){}
 
             StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes);
             TypeTokenConstantsGenerator typeTokenConstantsGenerator = new TypeTokenConstantsGenerator(filer, packageName);

From 49e66ac1012170c95540163e35fa6697cbb1597d Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 9 Dec 2016 02:32:58 +0530
Subject: [PATCH 013/159] use serializedname

---
 .../src/main/java/com/vimeo/sample/model/EnumExample.java | 7 ++++---
 .../vimeo/stag/processor/generators/AdapterGenerator.java | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/EnumExample.java b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
index e2aba04d..b6c5e861 100644
--- a/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
@@ -1,13 +1,14 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
 
-@GsonAdapterKey
+@UseStag
 public enum EnumExample {
     ENUM_VALUE1,
     ENUM_VALUE2,
     ENUM_VALUE3,
-    @GsonAdapterKey("CUSTOM_ENUM_VALUE4")
+    @SerializedName("CUSTOM_ENUM_VALUE4")
     ENUM_VALUE4,
     ENUM_VALUE5,
     ENUM_VALUE6
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index 16ebfa0c..1ba16844 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -1,8 +1,8 @@
 package com.vimeo.stag.processor.generators;
 
 
+import com.google.gson.annotations.SerializedName;
 import com.squareup.javapoet.TypeSpec;
-import com.vimeo.stag.GsonAdapterKey;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -11,12 +11,12 @@
 public abstract class AdapterGenerator {
 
     /**
-     * If the element is not annotated with {@link GsonAdapterKey}, the variable name is used.
+     * If the element is not annotated with {@link SerializedName}, the variable name is used.
      */
     @NotNull
     protected static String getJsonName(@NotNull Element element) {
-        String name = (null != element.getAnnotation(GsonAdapterKey.class)) ?
-                element.getAnnotation(GsonAdapterKey.class).value() : null;
+        String name = (null != element.getAnnotation(SerializedName.class)) ?
+                element.getAnnotation(SerializedName.class).value() : null;
 
         if (null == name || name.isEmpty()) {
             name = element.getSimpleName().toString();

From d47fff06e21880b3e7e397e677a83bf376600f9a Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 9 Dec 2016 02:14:21 +0530
Subject: [PATCH 014/159] Handling the case where the enum was nested in a
 class

---
 .../main/java/com/vimeo/sample/model/NestedModel.java  | 10 ++++++++++
 .../processor/generators/EnumTypeAdapterGenerator.java |  6 +++---
 .../stag/processor/generators/model/ClassInfo.java     |  9 ---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
index b90e88dd..2ffb3d54 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
@@ -36,4 +36,14 @@ public class NestedModel {
 
     @SerializedName("test1")
     public String test1;
+
+    @GsonAdapterKey
+    public NestedEnum nestedEnum;
+
+    @GsonAdapterKey
+    public enum NestedEnum {
+        NESTED_ENUM_VAL1,
+        NESTED_ENUM_VAL2,
+        NESTED_ENUM_VAL3
+    }
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
index 1c230e59..93e0ae5d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
@@ -75,6 +75,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
             }
         }
 
+
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName);
 
@@ -87,16 +88,15 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         CodeBlock.Builder staticBlockBuilder = CodeBlock.builder();
         staticBlockBuilder.addStatement("NAME_TO_CONSTANT = new HashMap<>(" + nameToConstant.size() + ")");
         for(Map.Entry<String, Element> entry : nameToConstant.entrySet()) {
-            staticBlockBuilder.addStatement("NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + mInfo.getClassName() + "." + entry.getValue().getSimpleName().toString() + ")");
+            staticBlockBuilder.addStatement("NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + typeVariableName + "." + entry.getValue().getSimpleName().toString() + ")");
         }
 
         staticBlockBuilder.add("\n");
         staticBlockBuilder.addStatement("CONSTANT_TO_NAME = new HashMap<>(" + constantToName.size() + ")");
         for(Map.Entry<Element, String> entry : constantToName.entrySet()) {
-            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + mInfo.getClassName() + "." + entry.getKey().getSimpleName().toString() + ", \""  + entry.getValue() + "\")");
+            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + typeVariableName + "." + entry.getKey().getSimpleName().toString() + ", \""  + entry.getValue() + "\")");
         }
 
-
         adapterBuilder.addStaticBlock(staticBlockBuilder.build());
 
         adapterBuilder.addMethod(constructorBuilder.build());
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
index 7365c35f..a30f00be 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
@@ -77,15 +77,6 @@ public String getPackageName() {
         return mPackageName;
     }
 
-    /**
-     * The name of the class.
-     *
-     * @return a valid package name.
-     */
-    @NotNull
-    public String getClassName() {
-        return mClassName;
-    }
 
     /**
      * The simple class name of the {@link com.google.gson.TypeAdapter} class for this model class.

From 59c16500c9e36bfb61f2762cac4066b8a15a1f4d Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 13:01:22 +0530
Subject: [PATCH 015/159] included gson in stag-library

---
 stag-library/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 4868209b..097996db 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -7,6 +7,7 @@ compileJava {
 }
 
 dependencies {
+    compile 'com.google.code.gson:gson:2.8.0'
 }
 
 // custom tasks for creating source/javadoc jars

From 0712ed0d65cb353122c6853fd0a62be4ac8340ba Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 13:01:38 +0530
Subject: [PATCH 016/159] all known typeadapters

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 374 ++++++++++++++++++
 1 file changed, 374 insertions(+)
 create mode 100644 stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
new file mode 100644
index 00000000..3f160ed5
--- /dev/null
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -0,0 +1,374 @@
+package com.vimeo.stag;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class KnownTypeAdapters {
+
+    private static TypeAdapter stringMapTypeAdapter;
+    private static TypeAdapter mapTypeAdapter;
+    private static TypeAdapter stringToIntegerMapTypeAdapter;
+
+    public static <V> TypeAdapter getStringMapTypeAdapter(TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
+        if (null == stringMapTypeAdapter) {
+            stringMapTypeAdapter = new StringMapTypeAdapter<>(valueTypeAdapter, instantiater);
+        }
+        return stringMapTypeAdapter;
+    }
+
+    public static <K, V> TypeAdapter getMapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
+        if (null == mapTypeAdapter) {
+            mapTypeAdapter = new MapTypeAdapter<>(keyTypeAdapter, valueTypeAdapter, instantiater);
+        }
+        return mapTypeAdapter;
+    }
+
+    public static TypeAdapter getStringToIntegerMapTypeAdapter(Instantiater<Map> instantiater) {
+        if (null == stringToIntegerMapTypeAdapter) {
+            stringToIntegerMapTypeAdapter = new StringToIntegerMapTypeAdapter(instantiater);
+        }
+        return stringToIntegerMapTypeAdapter;
+    }
+
+    private static class StringToIntegerMapTypeAdapter extends MapTypeAdapter<String, Integer> {
+
+        StringToIntegerMapTypeAdapter(Instantiater<Map> instantiater) {
+            super(null, null, instantiater);
+        }
+
+        @Override
+        public void write(JsonWriter writer, Map<String, Integer> value) throws IOException {
+            writer.beginObject();
+            for (java.util.HashMap.Entry<String, Integer> entry : value.entrySet()) {
+                writer.name(entry.getKey());
+                writer.value(entry.getValue());
+            }
+            writer.endObject();
+        }
+
+        @Override
+        public Map<String, Integer> read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            Map<String, Integer> object = new LinkedHashMap<>();
+            if (instantiater != null) {
+                object = instantiater.instantiate();
+            }
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                    reader.beginObject();
+                    while (reader.hasNext()) {
+                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
+                        String key = reader.nextString();
+                        Integer value = reader.nextInt();
+                        Integer replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                    }
+                    reader.endObject();
+                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        reader.beginArray();
+                        String key = reader.nextString();
+                        Integer value = reader.nextInt();
+                        Integer replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                        reader.endArray();
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+            return object;
+        }
+    }
+
+    private static class StringMapTypeAdapter<V> extends MapTypeAdapter<String, V> {
+
+        StringMapTypeAdapter(TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
+            super(null, valueTypeAdapter, instantiater);
+        }
+
+        @Override
+        public void write(JsonWriter writer, Map<String, V> value) throws IOException {
+            writer.beginObject();
+            for (java.util.HashMap.Entry<String, V> entry : value.entrySet()) {
+                writer.name(entry.getKey());
+                valueTypeAdapter.write(writer, entry.getValue());
+            }
+            writer.endObject();
+        }
+
+        @Override
+        public Map<String, V> read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            Map<String, V> object = new LinkedHashMap<>();
+            if (instantiater != null) {
+                object = instantiater.instantiate();
+            }
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                    reader.beginObject();
+                    while (reader.hasNext()) {
+                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
+                        String key = reader.nextString();
+                        V value = valueTypeAdapter.read(reader);
+                        V replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                    }
+                    reader.endObject();
+                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        reader.beginArray();
+                        String key = reader.nextString();
+                        V value = valueTypeAdapter.read(reader);
+                        V replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                        reader.endArray();
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+            return object;
+        }
+    }
+
+    public static class MapTypeAdapter<K, V> extends TypeAdapter<Map<K, V>> {
+
+        protected Instantiater<Map> instantiater;
+        protected TypeAdapter<V> valueTypeAdapter;
+        private TypeAdapter<K> keyTypeAdapter;
+
+        MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
+            this.keyTypeAdapter = keyTypeAdapter;
+            this.valueTypeAdapter = valueTypeAdapter;
+            this.instantiater = instantiater;
+        }
+
+        @Override
+        public void write(JsonWriter writer, Map<K, V> value) throws IOException {
+            boolean hasComplexKeys = false;
+            List<JsonElement> keys = new ArrayList<JsonElement>(value.size());
+
+            List<V> values = new ArrayList<>(value.size());
+            for (Map.Entry<K, V> entry : value.entrySet()) {
+                JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
+                keys.add(keyElement);
+                values.add(entry.getValue());
+                hasComplexKeys |= keyElement.isJsonArray() || keyElement.isJsonObject();
+            }
+
+            if (hasComplexKeys) {
+                writer.beginArray();
+                for (int i = 0; i < keys.size(); i++) {
+                    writer.beginArray(); // entry array
+                    Streams.write(keys.get(i), writer);
+                    valueTypeAdapter.write(writer, values.get(i));
+                    writer.endArray();
+                }
+                writer.endArray();
+            } else {
+                writer.beginObject();
+                for (int i = 0; i < keys.size(); i++) {
+                    JsonElement keyElement = keys.get(i);
+                    writer.name(keyToString(keyElement));
+                    valueTypeAdapter.write(writer, values.get(i));
+                }
+                writer.endObject();
+            }
+        }
+
+        @Override
+        public Map<K, V> read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            Map<K, V> object = new LinkedHashMap<>();
+            if (instantiater != null) {
+                object = instantiater.instantiate();
+            }
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                    reader.beginObject();
+                    while (reader.hasNext()) {
+                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
+                        K key = keyTypeAdapter.read(reader);
+                        V value = valueTypeAdapter.read(reader);
+                        V replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                    }
+                    reader.endObject();
+                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        reader.beginArray();
+                        K key = keyTypeAdapter.read(reader);
+                        V value = valueTypeAdapter.read(reader);
+                        V replaced = object.put(key, value);
+                        if (replaced != null) {
+                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
+                        }
+                        reader.endArray();
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+            return object;
+        }
+
+        private String keyToString(JsonElement keyElement) {
+            if (keyElement.isJsonPrimitive()) {
+                JsonPrimitive primitive = keyElement.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    return String.valueOf(primitive.getAsNumber());
+                } else if (primitive.isBoolean()) {
+                    return Boolean.toString(primitive.getAsBoolean());
+                } else if (primitive.isString()) {
+                    return primitive.getAsString();
+                } else {
+                    throw new AssertionError();
+                }
+            } else if (keyElement.isJsonNull()) {
+                return "null";
+            } else {
+                throw new AssertionError();
+            }
+        }
+    }
+
+    public static class ListTypeAdapter<T> extends TypeAdapter<List<T>> {
+
+        private TypeAdapter<T> valueTypeAdapter;
+        private Instantiater<List> instantiater;
+
+        public ListTypeAdapter(TypeAdapter<T> valueTypeAdapter, Instantiater<List> instantiater) {
+            this.valueTypeAdapter = valueTypeAdapter;
+            this.instantiater = instantiater;
+        }
+
+        @Override
+        public void write(JsonWriter writer, List<T> value) throws IOException {
+            writer.beginArray();
+            for (T item : value) {
+                valueTypeAdapter.write(writer, item);
+            }
+            writer.endArray();
+        }
+
+        @Override
+        public List<T> read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            List<T> object = new ArrayList<>();
+            if (instantiater != null) {
+                object = instantiater.instantiate();
+            }
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        object.add(valueTypeAdapter.read(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+            return object;
+        }
+    }
+}
\ No newline at end of file

From ee628dbf1f8b4edaa1ff1ca3f3ba53f7dc3c4467 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 13:02:10 +0530
Subject: [PATCH 017/159] instantiater interface to to specify the type of
 object

---
 stag-library/src/main/java/com/vimeo/stag/Instantiater.java | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 stag-library/src/main/java/com/vimeo/stag/Instantiater.java

diff --git a/stag-library/src/main/java/com/vimeo/stag/Instantiater.java b/stag-library/src/main/java/com/vimeo/stag/Instantiater.java
new file mode 100644
index 00000000..332cbf58
--- /dev/null
+++ b/stag-library/src/main/java/com/vimeo/stag/Instantiater.java
@@ -0,0 +1,5 @@
+package com.vimeo.stag;
+
+public interface Instantiater<T> {
+    T instantiate();
+}
\ No newline at end of file

From ea4d8cd486b6a53cc66b43afccc41face25b8968 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 13:03:22 +0530
Subject: [PATCH 018/159] replaced annotations with correct one

---
 sample/src/main/java/com/vimeo/sample/model/NestedModel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
index 2ffb3d54..e487b490 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
@@ -37,10 +37,10 @@ public class NestedModel {
     @SerializedName("test1")
     public String test1;
 
-    @GsonAdapterKey
+    @SerializedName("nestedEnum")
     public NestedEnum nestedEnum;
 
-    @GsonAdapterKey
+    @UseStag
     public enum NestedEnum {
         NESTED_ENUM_VAL1,
         NESTED_ENUM_VAL2,

From 28a7204f7e10cda842c5a8e82734aeae24e15d40 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 16:36:00 +0530
Subject: [PATCH 019/159] check for string and number

---
 .../generators/TypeAdapterGenerator.java      | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 43df3a2b..bd3206e8 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -34,7 +34,6 @@
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
 import com.vimeo.stag.WriteRuntimeType;
-import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -48,6 +47,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -288,16 +288,22 @@ private static boolean isNumberType(@NotNull String typeString) {
     }
 
     @Nullable
-    private static String getReadTokenType(@NotNull TypeMirror type) {
+    private static List<String> getReadTokenType(@NotNull TypeMirror type) {
         String typeString = type.toString();
         if (isNumberType(typeString)) {
-            return "com.google.gson.stream.JsonToken.NUMBER";
+            List<String> tokenType = new ArrayList<>(2);
+            tokenType.add("com.google.gson.stream.JsonToken.NUMBER");
+            tokenType.add("com.google.gson.stream.JsonToken.STRING");
+            return tokenType;
         } else if (type.toString().equals(boolean.class.getName())) {
-            return "com.google.gson.stream.JsonToken.BOOLEAN";
+            return Collections.singletonList("com.google.gson.stream.JsonToken.BOOLEAN");
         } else if (type.toString().equals(String.class.getName())) {
-            return "com.google.gson.stream.JsonToken.STRING";
+            List<String> tokenType = new ArrayList<>(2);
+            tokenType.add("com.google.gson.stream.JsonToken.STRING");
+            tokenType.add("com.google.gson.stream.JsonToken.NUMBER");
+            return tokenType;
         } else if (isArray(type)) {
-            return "com.google.gson.stream.JsonToken.BEGIN_ARRAY";
+            return Collections.singletonList("com.google.gson.stream.JsonToken.BEGIN_ARRAY");
         } else {
             return null;
         }
@@ -650,12 +656,23 @@ private MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull Map<El
         for (Map.Entry<Element, TypeMirror> element : elements.entrySet()) {
             String name = getJsonName(element.getKey());
             String variableName = element.getKey().getSimpleName().toString();
-            String jsonTokenType = getReadTokenType(element.getValue());
+            List<String> jsonTokenType = getReadTokenType(element.getValue());
+
+            StringBuilder jsonTokenCode = new StringBuilder();
+            jsonTokenCode.append("if (");
+            int size = jsonTokenType != null ? jsonTokenType.size() : 0;
+            for (int i = 0; i < size; i++) {
+                jsonTokenCode.append("jsonToken == ");
+                jsonTokenCode.append(jsonTokenType.get(i));
+                if (i != size - 1) {
+                    jsonTokenCode.append(" || ");
+                }
+            }
+            jsonTokenCode.append(")");
 
-            if (jsonTokenType != null) {
+            if (size != 0) {
                 builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                        "\t\t\t\tif (jsonToken == " + jsonTokenType +
-                        ") {\n" +
+                        "\t\t\t\t" + jsonTokenCode.toString() + " {\n" +
                         getReadCode("\t\t\t\t\t", variableName, element.getKey(), element.getValue(),
                                 adapterFieldInfo) +
                         "\n\t\t\t\t} else {" +

From 805bd991771558d35cf7436c57d736e630cb42ff Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 12 Dec 2016 16:47:35 +0530
Subject: [PATCH 020/159] reverted some code back

---
 stag-library/build.gradle                     |   1 -
 .../java/com/vimeo/stag/Instantiater.java     |   5 -
 .../com/vimeo/stag/KnownTypeAdapters.java     | 374 ------------------
 3 files changed, 380 deletions(-)
 delete mode 100644 stag-library/src/main/java/com/vimeo/stag/Instantiater.java
 delete mode 100644 stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 097996db..4868209b 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -7,7 +7,6 @@ compileJava {
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.8.0'
 }
 
 // custom tasks for creating source/javadoc jars
diff --git a/stag-library/src/main/java/com/vimeo/stag/Instantiater.java b/stag-library/src/main/java/com/vimeo/stag/Instantiater.java
deleted file mode 100644
index 332cbf58..00000000
--- a/stag-library/src/main/java/com/vimeo/stag/Instantiater.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vimeo.stag;
-
-public interface Instantiater<T> {
-    T instantiate();
-}
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
deleted file mode 100644
index 3f160ed5..00000000
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.vimeo.stag;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.TypeAdapter;
-import com.google.gson.internal.Streams;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class KnownTypeAdapters {
-
-    private static TypeAdapter stringMapTypeAdapter;
-    private static TypeAdapter mapTypeAdapter;
-    private static TypeAdapter stringToIntegerMapTypeAdapter;
-
-    public static <V> TypeAdapter getStringMapTypeAdapter(TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
-        if (null == stringMapTypeAdapter) {
-            stringMapTypeAdapter = new StringMapTypeAdapter<>(valueTypeAdapter, instantiater);
-        }
-        return stringMapTypeAdapter;
-    }
-
-    public static <K, V> TypeAdapter getMapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
-        if (null == mapTypeAdapter) {
-            mapTypeAdapter = new MapTypeAdapter<>(keyTypeAdapter, valueTypeAdapter, instantiater);
-        }
-        return mapTypeAdapter;
-    }
-
-    public static TypeAdapter getStringToIntegerMapTypeAdapter(Instantiater<Map> instantiater) {
-        if (null == stringToIntegerMapTypeAdapter) {
-            stringToIntegerMapTypeAdapter = new StringToIntegerMapTypeAdapter(instantiater);
-        }
-        return stringToIntegerMapTypeAdapter;
-    }
-
-    private static class StringToIntegerMapTypeAdapter extends MapTypeAdapter<String, Integer> {
-
-        StringToIntegerMapTypeAdapter(Instantiater<Map> instantiater) {
-            super(null, null, instantiater);
-        }
-
-        @Override
-        public void write(JsonWriter writer, Map<String, Integer> value) throws IOException {
-            writer.beginObject();
-            for (java.util.HashMap.Entry<String, Integer> entry : value.entrySet()) {
-                writer.name(entry.getKey());
-                writer.value(entry.getValue());
-            }
-            writer.endObject();
-        }
-
-        @Override
-        public Map<String, Integer> read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            Map<String, Integer> object = new LinkedHashMap<>();
-            if (instantiater != null) {
-                object = instantiater.instantiate();
-            }
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                    reader.beginObject();
-                    while (reader.hasNext()) {
-                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
-                        String key = reader.nextString();
-                        Integer value = reader.nextInt();
-                        Integer replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                    }
-                    reader.endObject();
-                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        reader.beginArray();
-                        String key = reader.nextString();
-                        Integer value = reader.nextInt();
-                        Integer replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                        reader.endArray();
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-            return object;
-        }
-    }
-
-    private static class StringMapTypeAdapter<V> extends MapTypeAdapter<String, V> {
-
-        StringMapTypeAdapter(TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
-            super(null, valueTypeAdapter, instantiater);
-        }
-
-        @Override
-        public void write(JsonWriter writer, Map<String, V> value) throws IOException {
-            writer.beginObject();
-            for (java.util.HashMap.Entry<String, V> entry : value.entrySet()) {
-                writer.name(entry.getKey());
-                valueTypeAdapter.write(writer, entry.getValue());
-            }
-            writer.endObject();
-        }
-
-        @Override
-        public Map<String, V> read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            Map<String, V> object = new LinkedHashMap<>();
-            if (instantiater != null) {
-                object = instantiater.instantiate();
-            }
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                    reader.beginObject();
-                    while (reader.hasNext()) {
-                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
-                        String key = reader.nextString();
-                        V value = valueTypeAdapter.read(reader);
-                        V replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                    }
-                    reader.endObject();
-                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        reader.beginArray();
-                        String key = reader.nextString();
-                        V value = valueTypeAdapter.read(reader);
-                        V replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                        reader.endArray();
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-            return object;
-        }
-    }
-
-    public static class MapTypeAdapter<K, V> extends TypeAdapter<Map<K, V>> {
-
-        protected Instantiater<Map> instantiater;
-        protected TypeAdapter<V> valueTypeAdapter;
-        private TypeAdapter<K> keyTypeAdapter;
-
-        MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, Instantiater<Map> instantiater) {
-            this.keyTypeAdapter = keyTypeAdapter;
-            this.valueTypeAdapter = valueTypeAdapter;
-            this.instantiater = instantiater;
-        }
-
-        @Override
-        public void write(JsonWriter writer, Map<K, V> value) throws IOException {
-            boolean hasComplexKeys = false;
-            List<JsonElement> keys = new ArrayList<JsonElement>(value.size());
-
-            List<V> values = new ArrayList<>(value.size());
-            for (Map.Entry<K, V> entry : value.entrySet()) {
-                JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
-                keys.add(keyElement);
-                values.add(entry.getValue());
-                hasComplexKeys |= keyElement.isJsonArray() || keyElement.isJsonObject();
-            }
-
-            if (hasComplexKeys) {
-                writer.beginArray();
-                for (int i = 0; i < keys.size(); i++) {
-                    writer.beginArray(); // entry array
-                    Streams.write(keys.get(i), writer);
-                    valueTypeAdapter.write(writer, values.get(i));
-                    writer.endArray();
-                }
-                writer.endArray();
-            } else {
-                writer.beginObject();
-                for (int i = 0; i < keys.size(); i++) {
-                    JsonElement keyElement = keys.get(i);
-                    writer.name(keyToString(keyElement));
-                    valueTypeAdapter.write(writer, values.get(i));
-                }
-                writer.endObject();
-            }
-        }
-
-        @Override
-        public Map<K, V> read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            Map<K, V> object = new LinkedHashMap<>();
-            if (instantiater != null) {
-                object = instantiater.instantiate();
-            }
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                    reader.beginObject();
-                    while (reader.hasNext()) {
-                        com.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);
-                        K key = keyTypeAdapter.read(reader);
-                        V value = valueTypeAdapter.read(reader);
-                        V replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                    }
-                    reader.endObject();
-                } else if (reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        reader.beginArray();
-                        K key = keyTypeAdapter.read(reader);
-                        V value = valueTypeAdapter.read(reader);
-                        V replaced = object.put(key, value);
-                        if (replaced != null) {
-                            throw new com.google.gson.JsonSyntaxException("duplicate key: " + key);
-                        }
-                        reader.endArray();
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-            return object;
-        }
-
-        private String keyToString(JsonElement keyElement) {
-            if (keyElement.isJsonPrimitive()) {
-                JsonPrimitive primitive = keyElement.getAsJsonPrimitive();
-                if (primitive.isNumber()) {
-                    return String.valueOf(primitive.getAsNumber());
-                } else if (primitive.isBoolean()) {
-                    return Boolean.toString(primitive.getAsBoolean());
-                } else if (primitive.isString()) {
-                    return primitive.getAsString();
-                } else {
-                    throw new AssertionError();
-                }
-            } else if (keyElement.isJsonNull()) {
-                return "null";
-            } else {
-                throw new AssertionError();
-            }
-        }
-    }
-
-    public static class ListTypeAdapter<T> extends TypeAdapter<List<T>> {
-
-        private TypeAdapter<T> valueTypeAdapter;
-        private Instantiater<List> instantiater;
-
-        public ListTypeAdapter(TypeAdapter<T> valueTypeAdapter, Instantiater<List> instantiater) {
-            this.valueTypeAdapter = valueTypeAdapter;
-            this.instantiater = instantiater;
-        }
-
-        @Override
-        public void write(JsonWriter writer, List<T> value) throws IOException {
-            writer.beginArray();
-            for (T item : value) {
-                valueTypeAdapter.write(writer, item);
-            }
-            writer.endArray();
-        }
-
-        @Override
-        public List<T> read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            List<T> object = new ArrayList<>();
-            if (instantiater != null) {
-                object = instantiater.instantiate();
-            }
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        object.add(valueTypeAdapter.read(reader));
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-            return object;
-        }
-    }
-}
\ No newline at end of file

From ab212b87e45696a3451a0d47b24739e92c70fb57 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 19 Dec 2016 14:39:56 +0530
Subject: [PATCH 021/159] Merge remote-tracking branch 'remotes/origin/dev'
 into release/v5.8

# Conflicts:
#	sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
#	sample/src/main/java/com/vimeo/sample/model/EnumExample.java
#	sample/src/main/java/com/vimeo/sample/model/NestedModel.java
#	sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
#	stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
---
 .../generators/AdapterGenerator.java          |   2 +-
 .../generators/TypeAdapterGenerator.java      | 747 +++++++++---------
 2 files changed, 375 insertions(+), 374 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index fcac530e..cc5ecade 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -48,6 +48,6 @@ protected static String getJsonName(@NotNull Element element) {
     }
 
     @NotNull
-    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+    protected abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
                                                 @NotNull StagGenerator stagGenerator);
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 0163c797..b170773e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -47,6 +47,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -62,7 +63,6 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
-@SuppressWarnings("StringConcatenationMissingWhitespace")
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
@@ -76,127 +76,6 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
     }
 
-    private static class AdapterFieldInfo {
-
-        @NotNull
-        private final Map<String, String> mAdapterFields;
-
-        @Nullable
-        private Map<String, String> mKnownAdapterStagFunctionCalls;
-
-        AdapterFieldInfo(int capacity) {
-            mAdapterFields = new HashMap<>(capacity);
-        }
-
-        /**
-         * Used to get the stag adapter for a typeMirror if it is already generated in Stag.Factory
-         */
-        @Nullable
-        String getKnownAdapterStagFunctionCalls(@NotNull TypeMirror typeMirror) {
-            return mKnownAdapterStagFunctionCalls != null ? mKnownAdapterStagFunctionCalls.get(
-                    typeMirror.toString()) : null;
-        }
-
-        /**
-         * Add the getter method name against a field name
-         */
-        void addTypeToFunctionName(@NotNull String name, @NotNull String functionName) {
-            if (null == mKnownAdapterStagFunctionCalls) {
-                mKnownAdapterStagFunctionCalls = new HashMap<>();
-            }
-            mKnownAdapterStagFunctionCalls.put(name, functionName);
-        }
-
-        String getAdapter(@NotNull TypeMirror typeMirror) {
-            String typeName = typeMirror.toString();
-            String result = null != mKnownAdapterStagFunctionCalls ? mKnownAdapterStagFunctionCalls.get(
-                    typeName) : null;
-            if (null == result) {
-                result = mAdapterFields.get(typeName);
-            }
-            return result;
-        }
-
-        String getFieldName(@NotNull TypeMirror fieldType) {
-            return mAdapterFields.get(fieldType.toString());
-        }
-
-        int size() {
-            return mAdapterFields.size();
-        }
-
-        void addField(@NotNull TypeMirror fieldType, @NotNull String fieldName) {
-            mAdapterFields.put(fieldType.toString(), fieldName);
-        }
-    }
-
-    @NotNull
-    private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
-                                              @NotNull MethodSpec.Builder constructorBuilder,
-                                              @NotNull Map<Element, TypeMirror> memberVariables,
-                                              @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                              @NotNull Map<TypeVariable, String> typeVarsMap,
-                                              @NotNull StagGenerator stagGenerator) {
-
-        HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
-        AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
-        HashSet<TypeMirror> exclusiveTypeSet = new HashSet<>();
-
-        for (TypeMirror fieldType : typeSet) {
-            if (isSupportedNative(fieldType.toString())) {
-                continue;
-            }
-            if (isArray(fieldType)) {
-                fieldType = getArrayInnerType(fieldType);
-                if (isSupportedNative(fieldType.toString())) {
-                    continue;
-                }
-            } else if (isMap(fieldType) && fieldType instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) fieldType).getTypeArguments();
-                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    fieldType = typeArguments.get(1);
-                    if (isSupportedNative(fieldType.toString())) {
-                        continue;
-                    }
-                }
-            }
-            exclusiveTypeSet.add(fieldType);
-        }
-
-        for (TypeMirror fieldType : exclusiveTypeSet) {
-            String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
-            if (null != getterField) {
-                /**
-                 * If we already have the adapter generated for the fieldType in Stag.Factory class
-                 */
-                result.addTypeToFunctionName(fieldType.toString(),
-                                             "mStagFactory.get" + getterField + "(mGson)");
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-            } else if (TypeUtils.isConcreteType(fieldType)) {
-                getterField = stagGenerator.addFieldType(fieldType);
-                result.addTypeToFunctionName(fieldType.toString(),
-                                             "mStagFactory.get" + getterField + "(mGson)");
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-            } else {
-                String fieldName = result.getFieldName(fieldType);
-                if (null == fieldName) {
-                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
-                    result.addField(fieldType, fieldName);
-                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                    TypeName typeName = getAdapterFieldTypeName(fieldType);
-                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(
-                            fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" +
-                            getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
-                }
-            }
-        }
-
-        return result;
-    }
-
     @Nullable
     private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                                            @NotNull Map<TypeVariable, String> typeVarsMap,
@@ -213,7 +92,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
                 result = "com.google.gson.reflect.TypeToken.getParameterized(" +
-                         declaredFieldType.asElement().toString() + ".class";
+                        declaredFieldType.asElement().toString() + ".class";
                 /**
                  * Iterate through all the types from the typeArguments and generate type token code accordingly
                  */
@@ -224,7 +103,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                         result += ", " + typeVarsMap.get(parameterTypeMirror);
                     } else {
                         result += ",\n" + getTypeTokenCode(parameterTypeMirror, typeVarsMap,
-                                                           typeTokenConstantsGenerator) + ".getType()";
+                                typeTokenConstantsGenerator) + ".getType()";
                     }
                 }
                 result += ")";
@@ -257,8 +136,8 @@ static boolean isArray(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(ArrayList.class.getName()) ||
-               outerClassType.equals(List.class.getName()) ||
-               outerClassType.equals(Collection.class.getName());
+                outerClassType.equals(List.class.getName()) ||
+                outerClassType.equals(Collection.class.getName());
     }
 
     static boolean isMap(@Nullable TypeMirror type) {
@@ -267,11 +146,10 @@ static boolean isMap(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(Map.class.getName()) ||
-               outerClassType.equals(HashMap.class.getName()) ||
-               outerClassType.equals(LinkedHashMap.class.getName());
+                outerClassType.equals(HashMap.class.getName()) ||
+                outerClassType.equals(LinkedHashMap.class.getName());
     }
 
-
     @NotNull
     private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
         TypeName typeName = TypeVariableName.get(type);
@@ -327,153 +205,25 @@ private static List<String> getReadTokenType(@NotNull TypeMirror type) {
 
     @NotNull
     private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
-        return (type instanceof ArrayType) ? ((ArrayType)type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
-    }
-
-    @NotNull
-    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
-                                                 @NotNull Map<Element, TypeMirror> memberVariables,
-                                                 @NotNull AdapterFieldInfo adapterFieldInfo) {
-        final MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
-                .addParameter(JsonWriter.class, "writer")
-                .addParameter(typeName, "object")
-                .returns(void.class)
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(Override.class)
-                .addException(IOException.class);
-
-        builder.addCode("\twriter.beginObject();\n" +
-                        "\tif (object == null) {\n" +
-                        "\t\twriter.endObject();\n" +
-                        "\t\treturn;\n" +
-                        "\t}\n");
-
-        for (Map.Entry<Element, TypeMirror> element : memberVariables.entrySet()) {
-            String name = getJsonName(element.getKey());
-            final String variableName = element.getKey().getSimpleName().toString();
-            String variableType = element.getValue().toString();
-
-            boolean isPrimitive = isSupportedPrimitive(variableType);
-
-            String prefix = isPrimitive ? "\t" : "\t\t";
-            if (!isPrimitive) {
-                builder.addCode("\tif (object." + variableName + " != null) {\n");
-            }
-            builder.addCode(getWriteCode(prefix, element.getValue(), name, "object." + variableName,
-                                         adapterFieldInfo));
-            if (!isPrimitive) {
-                builder.addCode("\t}\n");
-            }
-
-            /**
-             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
-             */
-            runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
-                @Override
-                public void run() {
-                    builder.addCode("\n\telse if (object." + variableName + " == null) {");
-                    builder.addCode("\n\t\tthrow new java.io.IOException(\"" + variableName +
-                                    " cannot be null\");");
-                    builder.addCode("\n\t}\n\n");
-                }
-            });
-        }
-
-        builder.addCode("\twriter.endObject();\n");
-
-        return builder.build();
-    }
-
-    /**
-     * Generates the TypeSpec for the TypeAdapter
-     * that this class generates.
-     *
-     * @return a valid TypeSpec that can be written
-     * to a file or added to another class.
-     */
-    @Override
-    @NotNull
-    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                       @NotNull StagGenerator stagGenerator) {
-        mGsonVariableUsed = false;
-        mStagFactoryUsed = false;
-        TypeMirror typeMirror = mInfo.getType();
-        TypeName typeVariableName = TypeVariableName.get(typeMirror);
-
-        List<? extends TypeMirror> typeArguments = mInfo.getTypeArguments();
-
-        TypeVariableName stagFactoryTypeName = stagGenerator.getGeneratedClassName();
-        MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder()
-                .addModifiers(Modifier.PUBLIC)
-                .addParameter(Gson.class, "gson")
-                .addParameter(stagFactoryTypeName, "stagFactory");
-
-        String className = FileGenUtils.unescapeEscapedString(mInfo.getTypeAdapterClassName());
-        TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(className)
-                .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-                .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
-
-        Map<TypeVariable, String> typeVarsMap = new HashMap<>();
-
-        int idx = 0;
-        if (null != typeArguments) {
-
-            for (TypeMirror argType : typeArguments) {
-                if (argType.getKind() == TypeKind.TYPEVAR) {
-                    TypeVariable typeVariable = (TypeVariable) argType;
-                    String simpleName = typeVariable.asElement().getSimpleName().toString();
-                    adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
-
-                    String paramName = "type" + "[" + String.valueOf(idx) + "]";
-                    typeVarsMap.put(typeVariable, paramName);
-                    idx++;
-                }
-            }
-
-            if (idx > 0) {
-                constructorBuilder.addParameter(Type[].class, "type");
-                constructorBuilder.varargs(true);
-            }
-        }
-
-        AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
-        Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
-
-        AdapterFieldInfo adapterFieldInfo = addAdapterFields(adapterBuilder, constructorBuilder, memberVariables,
-                typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
-
-        MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
-        MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
-
-        if (mGsonVariableUsed) {
-            adapterBuilder.addField(Gson.class, "mGson", Modifier.FINAL, Modifier.PRIVATE);
-            constructorBuilder.addStatement("this.mGson = gson");
-        }
-
-        if (mStagFactoryUsed) {
-            adapterBuilder.addField(stagFactoryTypeName, "mStagFactory", Modifier.FINAL, Modifier.PRIVATE);
-            constructorBuilder.addStatement("this.mStagFactory = stagFactory");
-        }
-
-        adapterBuilder.addMethod(constructorBuilder.build());
-        adapterBuilder.addMethod(writeMethod);
-        adapterBuilder.addMethod(readMethod);
-
-        return adapterBuilder.build();
+        return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
     }
 
     @NotNull
     private static String getArrayListType(@NotNull TypeMirror innerArrayType) {
         String innerArrayTypeString = innerArrayType.toString();
-        if(innerArrayTypeString.equals(long.class.getName())) {
+        if (innerArrayTypeString.equals(long.class.getName())) {
             return Long.class.getName();
-        } if(innerArrayTypeString.equals(double.class.getName())) {
+        }
+        if (innerArrayTypeString.equals(double.class.getName())) {
             return Double.class.getName();
-        } if(innerArrayTypeString.equals(Boolean.class.getName())) {
+        }
+        if (innerArrayTypeString.equals(Boolean.class.getName())) {
             return Boolean.class.getName();
-        } if(innerArrayTypeString.equals(float.class.getName())) {
+        }
+        if (innerArrayTypeString.equals(float.class.getName())) {
             return Float.class.getName();
-        } if(innerArrayTypeString.equals(int.class.getName())) {
+        }
+        if (innerArrayTypeString.equals(int.class.getName())) {
             return Integer.class.getName();
         } else {
             return innerArrayType.toString();
@@ -489,47 +239,47 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
             String innerRead = getReadType(type, innerType, adapterFieldInfo);
             String arrayListVariableName = isNativeArray ? "tmpArray" : "object." + variableName;
             String stagGetterName = adapterFieldInfo.getKnownAdapterStagFunctionCalls(innerType);
-            String result =  prefix + "reader.beginArray();\n" +
-                    prefix + (isNativeArray ? "java.util.ArrayList<" + getArrayListType(innerType) + "> " : "") +  arrayListVariableName + " = new java.util.ArrayList<>();\n" +
+            String result = prefix + "reader.beginArray();\n" +
+                    prefix + (isNativeArray ? "java.util.ArrayList<" + getArrayListType(innerType) + "> " : "") + arrayListVariableName + " = new java.util.ArrayList<>();\n" +
                     (stagGetterName != null ? prefix + "TypeAdapter<" + innerType + "> adapter = " + stagGetterName + ";\n" : "") +
                     prefix + "while (reader.hasNext()) {\n" +
                     prefix + "\t" + arrayListVariableName + ".add(" + innerRead + ");\n" +
                     prefix + "}\n" +
                     prefix + "reader.endArray();\n";
-            if(isNativeArray) {
-                result += prefix + "object." + variableName + "= new "+  innerType.toString() + "[" + arrayListVariableName + ".size()];\n";
+            if (isNativeArray) {
+                result += prefix + "object." + variableName + "= new " + innerType.toString() + "[" + arrayListVariableName + ".size()];\n";
                 result += prefix + "for(int idx = 0; idx < " + arrayListVariableName + ".size(); idx++) {\n";
                 result += prefix + "\tobject." + variableName + "[idx] = " + arrayListVariableName + ".get(idx);\n";
                 result += prefix + "}\n";
             }
             return result;
         } else {
-            if(isMap(type) && type instanceof DeclaredType) {
+            if (isMap(type) && type instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
                 if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
                     String keyRead = getReadType(type, typeArguments.get(0), adapterFieldInfo);
                     String valueRead = getReadType(type, typeArguments.get(1), adapterFieldInfo);
-                    String result =  prefix + "if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
-                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" :  type.toString()) + "();\n" +
+                    String result = prefix + "if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
+                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" : type.toString()) + "();\n" +
                             prefix + "\treader.beginObject();\n" +
                             prefix + "\twhile (reader.hasNext()) {\n" +
                             prefix + "\t\tcom.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);\n" +
-                            prefix + "\t\t" +  typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
-                            prefix + "\t\t" +  typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
-                            prefix + "\t\t" +  typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
+                            prefix + "\t\t" + typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
+                            prefix + "\t\t" + typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
+                            prefix + "\t\t" + typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
                             prefix + "\t\tif (replaced != null) {\n" +
                             prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
                             prefix + "\t\t}\n" +
                             prefix + "\t}\n" +
                             prefix + "\treader.endObject();\n" +
                             prefix + "} else if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {\n" +
-                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" :  type.toString()) + "();\n" +
+                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" : type.toString()) + "();\n" +
                             prefix + "\treader.beginArray();\n" +
                             prefix + "\twhile (reader.hasNext()) {\n" +
                             prefix + "\t\treader.beginArray();\n" +
-                            prefix + "\t\t" +  typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
-                            prefix + "\t\t" +  typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
-                            prefix + "\t\t" +  typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
+                            prefix + "\t\t" + typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
+                            prefix + "\t\t" + typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
+                            prefix + "\t\t" + typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
                             prefix + "\t\tif (replaced != null) {\n" +
                             prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
                             prefix + "\t\t}\n" +
@@ -544,7 +294,7 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
                 }
             }
             return prefix + "object." + variableName + " = " +
-                   getReadType(type, type, adapterFieldInfo) + ";";
+                    getReadType(type, type, adapterFieldInfo) + ";";
         }
     }
 
@@ -570,67 +320,11 @@ private static String getReadType(@NotNull TypeMirror parentType, @NotNull TypeM
     }
 
     @NotNull
-    private static String getWriteCode(@NotNull String prefix, @NotNull TypeMirror type,
-                                       @NotNull String jsonName, @NotNull String variableName,
-                                       @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isArray(type)) {
-            TypeMirror innerType = getArrayInnerType(type);
-            String innerWrite = getWriteType(innerType, "item", adapterFieldInfo);
-            return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                   prefix + "writer.beginArray();\n" +
-                   prefix + "for (" + innerType + " item : " + variableName + ") {\n" +
-                   prefix + "\t" + innerWrite + "\n" +
-                   prefix + "}\n" +
-                   prefix + "writer.endArray();\n";
-        } else {
-            if (isMap(type) && type instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
-                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    String valueWrite =
-                            getWriteType(typeArguments.get(1), "entry.getValue()", adapterFieldInfo);
-                    return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                           prefix + "writer.beginObject();\n" +
-                           prefix + "for (" + type.toString().replaceFirst("<", ".Entry<") + " entry : " +
-                           variableName + ".entrySet()) {\n" +
-                           prefix + "\twriter.name(String.valueOf(entry.getKey()));\n" +
-                           prefix + "\t" + valueWrite + "\n" +
-                           prefix + "}\n" +
-                           prefix + "writer.endObject();\n";
-                }
-            }
-            return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                   prefix + getWriteType(type, variableName, adapterFieldInfo) + '\n';
-        }
-    }
-
-    @NotNull
-    private static String getWriteType(@NotNull TypeMirror type, @NotNull String variableName,
-                                       @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isSupportedNative(type.toString())) {
-            return "writer.value(" + variableName + ");";
-        } else {
-            return getAdapterWrite(type, variableName, adapterFieldInfo) + ";";
-        }
-    }
-
-    @NotNull
-    private static String getAdapterWrite(@NotNull TypeMirror type, @NotNull String variableName,
-                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (key.getAnnotation(WriteRuntimeType.class) != null) {
-            mGsonVariableUsed = true;
-            return "((TypeAdapter) mGson.getAdapter(" + variableName + ".getClass())).write(writer, " + variableName + ")";
-        } else {
-            String adapterField = adapterFieldInfo.getAdapter(type);
-            return adapterField + ".write(writer, " + variableName + ")";
-        }
-    }
-
-    @NotNull
-    private static String getAdapterRead(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
-                                         @NotNull AdapterFieldInfo adapterFieldInfo) {
-        String adapterCode;
-        if (adapterFieldInfo.getKnownAdapterStagFunctionCalls(type) != null && isArray(parentType)) {
-            adapterCode = "adapter.read(reader)";
+    private static String getAdapterRead(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
+                                         @NotNull AdapterFieldInfo adapterFieldInfo) {
+        String adapterCode;
+        if (adapterFieldInfo.getKnownAdapterStagFunctionCalls(type) != null && isArray(parentType)) {
+            adapterCode = "adapter.read(reader)";
         } else {
             adapterCode = adapterFieldInfo.getAdapter(type) + ".read(reader)";
         }
@@ -649,31 +343,31 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
                 .addException(IOException.class);
 
         builder.addCode("\tif (reader.peek() == com.google.gson.stream.JsonToken.NULL) {\n" +
-                        "\t\treader.nextNull();\n" +
-                        "\t\treturn null;\n" +
-                        "\t}\n" +
-                        "\tif (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
-                        "\t\treader.skipValue();\n" +
-                        "\t\treturn null;\n" +
-                        "\t}\n" +
-                        "\treader.beginObject();\n" +
-                        '\n' +
-                        '\t' + typeName + " object = new " + typeName +
-                        "();\n" +
-                        "\twhile (reader.hasNext()) {\n" +
-                        "\t\tString name = reader.nextName();\n" +
-                        "\t\tcom.google.gson.stream.JsonToken jsonToken = reader.peek();\n" +
-                        "\t\tif (jsonToken == com.google.gson.stream.JsonToken.NULL) {\n" +
-                        "\t\t\treader.skipValue();\n" +
-                        "\t\t\tcontinue;\n" +
-                        "\t\t}\n" +
-                        "\t\tswitch (name) {\n");
+                "\t\treader.nextNull();\n" +
+                "\t\treturn null;\n" +
+                "\t}\n" +
+                "\tif (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
+                "\t\treader.skipValue();\n" +
+                "\t\treturn null;\n" +
+                "\t}\n" +
+                "\treader.beginObject();\n" +
+                '\n' +
+                '\t' + typeName + " object = new " + typeName +
+                "();\n" +
+                "\twhile (reader.hasNext()) {\n" +
+                "\t\tString name = reader.nextName();\n" +
+                "\t\tcom.google.gson.stream.JsonToken jsonToken = reader.peek();\n" +
+                "\t\tif (jsonToken == com.google.gson.stream.JsonToken.NULL) {\n" +
+                "\t\t\treader.skipValue();\n" +
+                "\t\t\tcontinue;\n" +
+                "\t\t}\n" +
+                "\t\tswitch (name) {\n");
 
         final List<String> nonNullFields = new ArrayList<>();
 
         for (Map.Entry<Element, TypeMirror> element : elements.entrySet()) {
             String name = getJsonName(element.getKey());
-            String variableName = element.getKey().getSimpleName().toString();
+            final String variableName = element.getKey().getSimpleName().toString();
             List<String> jsonTokenType = getReadTokenType(element.getValue());
 
             StringBuilder jsonTokenCode = new StringBuilder();
@@ -691,15 +385,13 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
             if (size != 0) {
                 builder.addCode("\t\t\tcase \"" + name + "\":\n" +
                         "\t\t\t\t" + jsonTokenCode.toString() + " {\n" +
-                        getReadCode("\t\t\t\t\t", variableName, element.getKey(), element.getValue(),
-                                adapterFieldInfo) +
+                        getReadCode("\t\t\t\t\t", variableName, element.getValue(), adapterFieldInfo) +
                         "\n\t\t\t\t} else {" +
                         "\n\t\t\t\t\treader.skipValue();" +
                         "\n\t\t\t\t}");
             } else {
                 builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                                getReadCode("\t\t\t\t\t", variableName, element.getValue(),
-                                            adapterFieldInfo));
+                        getReadCode("\t\t\t\t\t", variableName, element.getValue(), adapterFieldInfo));
             }
 
             builder.addCode("\n\t\t\t\tbreak;\n");
@@ -712,12 +404,12 @@ public void run() {
         }
 
         builder.addCode("\t\t\tdefault:\n" +
-                        "\t\t\t\treader.skipValue();\n" +
-                        "\t\t\t\tbreak;\n" +
-                        "\t\t}\n" +
-                        "\t}\n" +
-                        '\n' +
-                        "\treader.endObject();\n");
+                "\t\t\t\treader.skipValue();\n" +
+                "\t\t\t\tbreak;\n" +
+                "\t\t}\n" +
+                "\t}\n" +
+                '\n' +
+                "\treader.endObject();\n");
 
         for (String nonNullField : nonNullFields) {
             builder.addCode("\n\tif (object." + nonNullField + " == null) {");
@@ -746,4 +438,313 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
             }
         }
     }
+
+    @NotNull
+    private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
+                                              @NotNull MethodSpec.Builder constructorBuilder,
+                                              @NotNull Map<Element, TypeMirror> memberVariables,
+                                              @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                              @NotNull Map<TypeVariable, String> typeVarsMap,
+                                              @NotNull StagGenerator stagGenerator) {
+
+        HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
+        AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
+        HashSet<TypeMirror> exclusiveTypeSet = new HashSet<>();
+
+        for (TypeMirror fieldType : typeSet) {
+            if (isSupportedNative(fieldType.toString())) {
+                continue;
+            }
+            if (isArray(fieldType)) {
+                fieldType = getArrayInnerType(fieldType);
+                if (isSupportedNative(fieldType.toString())) {
+                    continue;
+                }
+            } else if (isMap(fieldType) && fieldType instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) fieldType).getTypeArguments();
+                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
+                    fieldType = typeArguments.get(1);
+                    if (isSupportedNative(fieldType.toString())) {
+                        continue;
+                    }
+                }
+            }
+            exclusiveTypeSet.add(fieldType);
+        }
+
+        for (TypeMirror fieldType : exclusiveTypeSet) {
+            String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
+            if (null != getterField) {
+                /**
+                 * If we already have the adapter generated for the fieldType in Stag.Factory class
+                 */
+                result.addTypeToFunctionName(fieldType.toString(),
+                        "mStagFactory.get" + getterField + "(mGson)");
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
+            } else if (TypeUtils.isConcreteType(fieldType)) {
+                getterField = stagGenerator.addFieldType(fieldType);
+                result.addTypeToFunctionName(fieldType.toString(),
+                        "mStagFactory.get" + getterField + "(mGson)");
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
+            } else {
+                String fieldName = result.getFieldName(fieldType);
+                if (null == fieldName) {
+                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
+                    result.addField(fieldType, fieldName);
+                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                    TypeName typeName = getAdapterFieldTypeName(fieldType);
+                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                    constructorBuilder.addStatement(
+                            fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" +
+                                    getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @NotNull
+    private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
+                                          @NotNull Map<Element, TypeMirror> memberVariables,
+                                          @NotNull AdapterFieldInfo adapterFieldInfo) {
+        final MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+                .addParameter(JsonWriter.class, "writer")
+                .addParameter(typeName, "object")
+                .returns(void.class)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.addCode("\twriter.beginObject();\n" +
+                "\tif (object == null) {\n" +
+                "\t\twriter.endObject();\n" +
+                "\t\treturn;\n" +
+                "\t}\n");
+
+        for (Map.Entry<Element, TypeMirror> element : memberVariables.entrySet()) {
+            String name = getJsonName(element.getKey());
+            final String variableName = element.getKey().getSimpleName().toString();
+            String variableType = element.getValue().toString();
+
+            boolean isPrimitive = isSupportedPrimitive(variableType);
+
+            String prefix = isPrimitive ? "\t" : "\t\t";
+            if (!isPrimitive) {
+                builder.addCode("\tif (object." + variableName + " != null) {\n");
+            }
+            builder.addCode(getWriteCode(element.getKey(), prefix, element.getValue(), name, "object." + variableName,
+                    adapterFieldInfo));
+            if (!isPrimitive) {
+                builder.addCode("\t}\n");
+            }
+
+            /**
+             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+             */
+            runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
+                @Override
+                public void run() {
+                    builder.addCode("\n\telse if (object." + variableName + " == null) {");
+                    builder.addCode("\n\t\tthrow new java.io.IOException(\"" + variableName +
+                            " cannot be null\");");
+                    builder.addCode("\n\t}\n\n");
+                }
+            });
+        }
+
+        builder.addCode("\twriter.endObject();\n");
+
+        return builder.build();
+    }
+
+    /**
+     * Generates the TypeSpec for the TypeAdapter
+     * that this class generates.
+     *
+     * @return a valid TypeSpec that can be written
+     * to a file or added to another class.
+     */
+    @Override
+    @NotNull
+    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                       @NotNull StagGenerator stagGenerator) {
+        mGsonVariableUsed = false;
+        mStagFactoryUsed = false;
+        TypeMirror typeMirror = mInfo.getType();
+        TypeName typeVariableName = TypeVariableName.get(typeMirror);
+
+        List<? extends TypeMirror> typeArguments = mInfo.getTypeArguments();
+
+        TypeVariableName stagFactoryTypeName = stagGenerator.getGeneratedClassName();
+        MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder()
+                .addModifiers(Modifier.PUBLIC)
+                .addParameter(Gson.class, "gson")
+                .addParameter(stagFactoryTypeName, "stagFactory");
+
+        String className = FileGenUtils.unescapeEscapedString(mInfo.getTypeAdapterClassName());
+        TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(className)
+                .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+                .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
+
+        Map<TypeVariable, String> typeVarsMap = new HashMap<>();
+
+        int idx = 0;
+        if (null != typeArguments) {
+
+            for (TypeMirror argType : typeArguments) {
+                if (argType.getKind() == TypeKind.TYPEVAR) {
+                    TypeVariable typeVariable = (TypeVariable) argType;
+                    String simpleName = typeVariable.asElement().getSimpleName().toString();
+                    adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
+
+                    String paramName = "type" + "[" + String.valueOf(idx) + "]";
+                    typeVarsMap.put(typeVariable, paramName);
+                    idx++;
+                }
+            }
+
+            if (idx > 0) {
+                constructorBuilder.addParameter(Type[].class, "type");
+                constructorBuilder.varargs(true);
+            }
+        }
+
+        AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
+        Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
+
+        AdapterFieldInfo adapterFieldInfo = addAdapterFields(adapterBuilder, constructorBuilder, memberVariables,
+                typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
+
+        MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
+        MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
+
+        if (mGsonVariableUsed) {
+            adapterBuilder.addField(Gson.class, "mGson", Modifier.FINAL, Modifier.PRIVATE);
+            constructorBuilder.addStatement("this.mGson = gson");
+        }
+
+        if (mStagFactoryUsed) {
+            adapterBuilder.addField(stagFactoryTypeName, "mStagFactory", Modifier.FINAL, Modifier.PRIVATE);
+            constructorBuilder.addStatement("this.mStagFactory = stagFactory");
+        }
+
+        adapterBuilder.addMethod(constructorBuilder.build());
+        adapterBuilder.addMethod(writeMethod);
+        adapterBuilder.addMethod(readMethod);
+
+        return adapterBuilder.build();
+    }
+
+    @NotNull
+    private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNull TypeMirror type,
+                                @NotNull String jsonName, @NotNull String variableName,
+                                @NotNull AdapterFieldInfo adapterFieldInfo) {
+        if (isArray(type)) {
+            TypeMirror innerType = getArrayInnerType(type);
+            String innerWrite = getWriteType(key, innerType, "item", adapterFieldInfo);
+            return prefix + "writer.name(\"" + jsonName + "\");\n" +
+                    prefix + "writer.beginArray();\n" +
+                    prefix + "for (" + innerType + " item : " + variableName + ") {\n" +
+                    prefix + "\t" + innerWrite + "\n" +
+                    prefix + "}\n" +
+                    prefix + "writer.endArray();\n";
+        } else {
+            if (isMap(type) && type instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
+                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
+                    String valueWrite =
+                            getWriteType(key, typeArguments.get(1), "entry.getValue()", adapterFieldInfo);
+                    return prefix + "writer.name(\"" + jsonName + "\");\n" +
+                            prefix + "writer.beginObject();\n" +
+                            prefix + "for (" + type.toString().replaceFirst("<", ".Entry<") + " entry : " +
+                            variableName + ".entrySet()) {\n" +
+                            prefix + "\twriter.name(String.valueOf(entry.getKey()));\n" +
+                            prefix + "\t" + valueWrite + "\n" +
+                            prefix + "}\n" +
+                            prefix + "writer.endObject();\n";
+                }
+            }
+            return prefix + "writer.name(\"" + jsonName + "\");\n" +
+                    prefix + getWriteType(key, type, variableName, adapterFieldInfo) + '\n';
+        }
+    }
+
+    @NotNull
+    private String getWriteType(@NotNull Element key, @NotNull TypeMirror type, @NotNull String variableName,
+                                @NotNull AdapterFieldInfo adapterFieldInfo) {
+        if (isSupportedNative(type.toString())) {
+            return "writer.value(" + variableName + ");";
+        } else {
+            return getAdapterWrite(key, type, variableName, adapterFieldInfo) + ";";
+        }
+    }
+
+    @NotNull
+    private String getAdapterWrite(@NotNull Element key, @NotNull TypeMirror type, @NotNull String variableName,
+                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
+        if (key.getAnnotation(WriteRuntimeType.class) != null) {
+            mGsonVariableUsed = true;
+            return "((TypeAdapter) mGson.getAdapter(" + variableName + ".getClass())).write(writer, " + variableName + ")";
+        } else {
+            String adapterField = adapterFieldInfo.getAdapter(type);
+            return adapterField + ".write(writer, " + variableName + ")";
+        }
+    }
+
+    private static class AdapterFieldInfo {
+
+        @NotNull
+        private final Map<String, String> mAdapterFields;
+
+        @Nullable
+        private Map<String, String> mKnownAdapterStagFunctionCalls;
+
+        AdapterFieldInfo(int capacity) {
+            mAdapterFields = new HashMap<>(capacity);
+        }
+
+        /**
+         * Used to get the stag adapter for a typeMirror if it is already generated in Stag.Factory
+         */
+        @Nullable
+        String getKnownAdapterStagFunctionCalls(@NotNull TypeMirror typeMirror) {
+            return mKnownAdapterStagFunctionCalls != null ? mKnownAdapterStagFunctionCalls.get(
+                    typeMirror.toString()) : null;
+        }
+
+        /**
+         * Add the getter method name against a field name
+         */
+        void addTypeToFunctionName(@NotNull String name, @NotNull String functionName) {
+            if (null == mKnownAdapterStagFunctionCalls) {
+                mKnownAdapterStagFunctionCalls = new HashMap<>();
+            }
+            mKnownAdapterStagFunctionCalls.put(name, functionName);
+        }
+
+        String getAdapter(@NotNull TypeMirror typeMirror) {
+            String typeName = typeMirror.toString();
+            String result = null != mKnownAdapterStagFunctionCalls ? mKnownAdapterStagFunctionCalls.get(
+                    typeName) : null;
+            if (null == result) {
+                result = mAdapterFields.get(typeName);
+            }
+            return result;
+        }
+
+        String getFieldName(@NotNull TypeMirror fieldType) {
+            return mAdapterFields.get(fieldType.toString());
+        }
+
+        int size() {
+            return mAdapterFields.size();
+        }
+
+        void addField(@NotNull TypeMirror fieldType, @NotNull String fieldName) {
+            mAdapterFields.put(fieldType.toString(), fieldName);
+        }
+    }
 }
\ No newline at end of file

From 9e808c56eed66534dac13edbead445c6105850b1 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 19 Dec 2016 14:40:49 +0530
Subject: [PATCH 022/159] made public

---
 .../com/vimeo/stag/processor/generators/AdapterGenerator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index cc5ecade..fcac530e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -48,6 +48,6 @@ protected static String getJsonName(@NotNull Element element) {
     }
 
     @NotNull
-    protected abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
                                                 @NotNull StagGenerator stagGenerator);
 }

From d12c3b01f88ea40208c8954b18ff0400cfdfe0e4 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 12:44:42 +0530
Subject: [PATCH 023/159] list of knowntypeadapters in stag-library

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 267 ++++++++++++++++++
 1 file changed, 267 insertions(+)
 create mode 100644 stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
new file mode 100644
index 00000000..866affd8
--- /dev/null
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -0,0 +1,267 @@
+package com.vimeo.stag;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.JsonReaderInternalAccess;
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class KnownTypeAdapters {
+
+    interface KnownTypeInstantiater<T> {
+        T instantiate();
+    }
+
+    public static class HashMapInstantiater<K, V> implements KnownTypeInstantiater<HashMap<K, V>> {
+
+        @Override
+        public HashMap<K, V> instantiate() {
+            return new HashMap<>();
+        }
+    }
+
+    public static class ConcurrentHashMapInstantiater<K, V> implements KnownTypeInstantiater<ConcurrentHashMap<K, V>> {
+
+        @Override
+        public ConcurrentHashMap<K, V> instantiate() {
+            return new ConcurrentHashMap<>();
+        }
+    }
+
+    public static class StringTypeAdapter extends TypeAdapter<String> {
+
+        @Override
+        public void write(JsonWriter writer, String value) throws IOException {
+            writer.value(value);
+        }
+
+        @Override
+        public String read(JsonReader in) throws IOException {
+            return in.nextString();
+        }
+    }
+
+    public static class FloatTypeAdapter extends TypeAdapter<Float> {
+
+        @Override
+        public void write(JsonWriter writer, Float value) throws IOException {
+            writer.value(value);
+        }
+
+        @Override
+        public Float read(JsonReader in) throws IOException {
+            return (float) in.nextDouble();
+        }
+    }
+
+    public static class BooleanTypeAdapter extends TypeAdapter<Boolean> {
+
+        @Override
+        public void write(JsonWriter writer, Boolean value) throws IOException {
+            writer.value(value);
+        }
+
+        @Override
+        public Boolean read(JsonReader in) throws IOException {
+            return in.nextBoolean();
+        }
+    }
+
+    public static class DoubleTypeAdapter extends TypeAdapter<Double> {
+
+        @Override
+        public void write(JsonWriter writer, Double value) throws IOException {
+            writer.value(value);
+        }
+
+        @Override
+        public Double read(JsonReader in) throws IOException {
+            return in.nextDouble();
+        }
+    }
+
+    public static class IntegerTypeAdapter extends TypeAdapter<Integer> {
+
+        @Override
+        public void write(JsonWriter writer, Integer value) throws IOException {
+            writer.value(value);
+        }
+
+        @Override
+        public Integer read(JsonReader in) throws IOException {
+            return in.nextInt();
+        }
+    }
+
+    public static class ListTypeAdapter<T> extends TypeAdapter<List<T>> {
+
+        private TypeAdapter<T> valueTypeAdapter;
+        private KnownTypeInstantiater<List<T>> instantiator;
+
+        public ListTypeAdapter(TypeAdapter<T> valueTypeAdapter, KnownTypeInstantiater<List<T>> instantiator) {
+            this.valueTypeAdapter = valueTypeAdapter;
+            this.instantiator = instantiator;
+        }
+
+        @Override
+        public void write(JsonWriter writer, List<T> value) throws IOException {
+            writer.beginArray();
+            for (T item : value) {
+                valueTypeAdapter.write(writer, item);
+            }
+            writer.endArray();
+        }
+
+        @Override
+        public List<T> read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            List<T> object = (null == instantiator) ? new ArrayList<T>() : instantiator.instantiate();
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        object.add(valueTypeAdapter.read(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+            return object;
+        }
+    }
+
+    public static class MapTypeAdapter<K, V> extends TypeAdapter<Map<K, V>> {
+
+        private KnownTypeInstantiater<Map<K, V>> instantiater;
+        private TypeAdapter<V> valueTypeAdapter;
+        private TypeAdapter<K> keyTypeAdapter;
+
+        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<Map<K, V>> instantiater) {
+            this.keyTypeAdapter = keyTypeAdapter;
+            this.valueTypeAdapter = valueTypeAdapter;
+            this.instantiater = instantiater;
+        }
+
+        @Override
+        public void write(JsonWriter writer, Map<K, V> value) throws IOException {
+            boolean hasComplexKeys = false;
+            List<JsonElement> keys = new ArrayList<>(value.size());
+
+            List<V> values = new ArrayList<>(value.size());
+            for (Map.Entry<K, V> entry : value.entrySet()) {
+                JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
+                keys.add(keyElement);
+                values.add(entry.getValue());
+                hasComplexKeys |= keyElement.isJsonArray() || keyElement.isJsonObject();
+            }
+
+            if (hasComplexKeys) {
+                writer.beginArray();
+                for (int i = 0; i < keys.size(); i++) {
+                    writer.beginArray(); // entry array
+                    Streams.write(keys.get(i), writer);
+                    valueTypeAdapter.write(writer, values.get(i));
+                    writer.endArray();
+                }
+                writer.endArray();
+            } else {
+                writer.beginObject();
+                for (int i = 0; i < keys.size(); i++) {
+                    JsonElement keyElement = keys.get(i);
+                    writer.name(keyToString(keyElement));
+                    valueTypeAdapter.write(writer, values.get(i));
+                }
+                writer.endObject();
+            }
+        }
+
+        @Override
+        public Map<K, V> read(JsonReader in) throws IOException {
+            JsonToken peek = in.peek();
+            if (peek == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+
+            Map<K, V> map = null == instantiater ? new LinkedHashMap<K, V>() : instantiater.instantiate();
+
+            if (peek == JsonToken.BEGIN_ARRAY) {
+                in.beginArray();
+                while (in.hasNext()) {
+                    in.beginArray(); // entry array
+                    K key = keyTypeAdapter.read(in);
+                    V value = valueTypeAdapter.read(in);
+                    V replaced = map.put(key, value);
+                    if (replaced != null) {
+                        throw new JsonSyntaxException("duplicate key: " + key);
+                    }
+                    in.endArray();
+                }
+                in.endArray();
+            } else {
+                in.beginObject();
+                while (in.hasNext()) {
+                    JsonReaderInternalAccess.INSTANCE.promoteNameToValue(in);
+                    K key = keyTypeAdapter.read(in);
+                    V value = valueTypeAdapter.read(in);
+                    V replaced = map.put(key, value);
+                    if (replaced != null) {
+                        throw new JsonSyntaxException("duplicate key: " + key);
+                    }
+                }
+                in.endObject();
+            }
+            return map;
+        }
+
+        private String keyToString(JsonElement keyElement) {
+            if (keyElement.isJsonPrimitive()) {
+                JsonPrimitive primitive = keyElement.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    return String.valueOf(primitive.getAsNumber());
+                } else if (primitive.isBoolean()) {
+                    return Boolean.toString(primitive.getAsBoolean());
+                } else if (primitive.isString()) {
+                    return primitive.getAsString();
+                } else {
+                    throw new AssertionError();
+                }
+            } else if (keyElement.isJsonNull()) {
+                return "null";
+            } else {
+                throw new AssertionError();
+            }
+        }
+    }
+}
\ No newline at end of file

From ec0cc04ff3f7ec23df262f6f21ea81627b6a3f70 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 12:45:25 +0530
Subject: [PATCH 024/159] added gson dependency

---
 stag-library/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 4868209b..405e9d58 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -7,6 +7,7 @@ compileJava {
 }
 
 dependencies {
+compile 'com.google.code.gson:gson:2.8.0'
 }
 
 // custom tasks for creating source/javadoc jars

From 2e3e218dfeeb5074f7d531107f23c5ca73d5db00 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 19:08:07 +0530
Subject: [PATCH 025/159] made generic changes

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 866affd8..8e3bbc6e 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -12,6 +12,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -24,11 +25,35 @@ interface KnownTypeInstantiater<T> {
         T instantiate();
     }
 
+    public static class ListInstantiater<V> implements KnownTypeInstantiater<List<V>> {
+
+        @Override
+        public List<V> instantiate() {
+            return new ArrayList<V>();
+        }
+    }
+
+    public static class CollectionInstantiater<V> implements KnownTypeInstantiater<Collection<V>> {
+
+        @Override
+        public Collection<V> instantiate() {
+            return new ArrayList<V>();
+        }
+    }
+
+    public static class ArrayListInstantiater<V> implements KnownTypeInstantiater<ArrayList<V>> {
+
+        @Override
+        public ArrayList<V> instantiate() {
+            return new ArrayList<V>();
+        }
+    }
+
     public static class HashMapInstantiater<K, V> implements KnownTypeInstantiater<HashMap<K, V>> {
 
         @Override
         public HashMap<K, V> instantiate() {
-            return new HashMap<>();
+            return new HashMap<K, V>();
         }
     }
 
@@ -36,7 +61,23 @@ public static class ConcurrentHashMapInstantiater<K, V> implements KnownTypeInst
 
         @Override
         public ConcurrentHashMap<K, V> instantiate() {
-            return new ConcurrentHashMap<>();
+            return new ConcurrentHashMap<K, V>();
+        }
+    }
+
+    public static class LinkedHashMapInstantiater<K, V> implements KnownTypeInstantiater<LinkedHashMap<K, V>> {
+
+        @Override
+        public LinkedHashMap<K, V> instantiate() {
+            return new LinkedHashMap<K, V>();
+        }
+    }
+
+    public static class MapInstantiater<K, V> implements KnownTypeInstantiater<Map<K, V>> {
+
+        @Override
+        public Map<K, V> instantiate() {
+            return new LinkedHashMap<K, V>();
         }
     }
 
@@ -105,27 +146,27 @@ public Integer read(JsonReader in) throws IOException {
         }
     }
 
-    public static class ListTypeAdapter<T> extends TypeAdapter<List<T>> {
+    public static class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
 
-        private TypeAdapter<T> valueTypeAdapter;
-        private KnownTypeInstantiater<List<T>> instantiator;
+        private TypeAdapter<V> valueTypeAdapter;
+        private KnownTypeInstantiater<T> instantiator;
 
-        public ListTypeAdapter(TypeAdapter<T> valueTypeAdapter, KnownTypeInstantiater<List<T>> instantiator) {
+        public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<T> instantiator) {
             this.valueTypeAdapter = valueTypeAdapter;
             this.instantiator = instantiator;
         }
 
         @Override
-        public void write(JsonWriter writer, List<T> value) throws IOException {
+        public void write(JsonWriter writer, T value) throws IOException {
             writer.beginArray();
-            for (T item : value) {
+            for (V item : value) {
                 valueTypeAdapter.write(writer, item);
             }
             writer.endArray();
         }
 
         @Override
-        public List<T> read(JsonReader reader) throws IOException {
+        public T read(JsonReader reader) throws IOException {
             if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
                 reader.nextNull();
                 return null;
@@ -136,7 +177,7 @@ public List<T> read(JsonReader reader) throws IOException {
             }
             reader.beginObject();
 
-            List<T> object = (null == instantiator) ? new ArrayList<T>() : instantiator.instantiate();
+            T object = instantiator.instantiate();
 
             while (reader.hasNext()) {
                 com.google.gson.stream.JsonToken jsonToken = reader.peek();
@@ -161,25 +202,25 @@ public List<T> read(JsonReader reader) throws IOException {
         }
     }
 
-    public static class MapTypeAdapter<K, V> extends TypeAdapter<Map<K, V>> {
+    public static class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
 
-        private KnownTypeInstantiater<Map<K, V>> instantiater;
+        private KnownTypeInstantiater<T> instantiater;
         private TypeAdapter<V> valueTypeAdapter;
         private TypeAdapter<K> keyTypeAdapter;
 
-        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<Map<K, V>> instantiater) {
+        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<T> instantiater) {
             this.keyTypeAdapter = keyTypeAdapter;
             this.valueTypeAdapter = valueTypeAdapter;
             this.instantiater = instantiater;
         }
 
         @Override
-        public void write(JsonWriter writer, Map<K, V> value) throws IOException {
+        public void write(JsonWriter writer, T value) throws IOException {
             boolean hasComplexKeys = false;
             List<JsonElement> keys = new ArrayList<>(value.size());
 
             List<V> values = new ArrayList<>(value.size());
-            for (Map.Entry<K, V> entry : value.entrySet()) {
+            for (T.Entry<K, V> entry : value.entrySet()) {
                 JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
                 keys.add(keyElement);
                 values.add(entry.getValue());
@@ -207,14 +248,14 @@ public void write(JsonWriter writer, Map<K, V> value) throws IOException {
         }
 
         @Override
-        public Map<K, V> read(JsonReader in) throws IOException {
+        public T read(JsonReader in) throws IOException {
             JsonToken peek = in.peek();
             if (peek == JsonToken.NULL) {
                 in.nextNull();
                 return null;
             }
 
-            Map<K, V> map = null == instantiater ? new LinkedHashMap<K, V>() : instantiater.instantiate();
+            T map = instantiater.instantiate();
 
             if (peek == JsonToken.BEGIN_ARRAY) {
                 in.beginArray();

From 6915415af5b7469ea048c2d7da9feb93964a60ee Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 19:08:33 +0530
Subject: [PATCH 026/159] utility class for knowntypeadapters defined in stag
 library

---
 .../utils/KnownTypeAdapterUtils.java          | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
new file mode 100644
index 00000000..857ee562
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -0,0 +1,91 @@
+package com.vimeo.stag.processor.utils;
+
+import com.vimeo.stag.KnownTypeAdapters;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.lang.model.type.TypeMirror;
+
+public class KnownTypeAdapterUtils {
+    @NotNull
+    private static final HashMap<Type, Class> mKnownPrimitiveTypeAdapters = new HashMap<>();
+    @NotNull
+    private static final HashMap<Type, Class> mKnownCollectionTypeAdapters = new HashMap<>();
+    @NotNull
+    private static final HashMap<String, String> mKnownTypeAdaptersMethodNames = new HashMap<>();
+
+    @NotNull
+    public static HashMap<Type, Class> getKnownCollectionTypeAdapters() {
+        return mKnownCollectionTypeAdapters;
+    }
+
+    @NotNull
+    public static HashMap<Type, Class> getKnownPrimitiveTypeAdapters() {
+        return mKnownPrimitiveTypeAdapters;
+    }
+
+    @Nullable
+    public static String getKnownTypeAdaptersMethodNames(String type) {
+        return mKnownTypeAdaptersMethodNames.get(type);
+    }
+
+    public static void initialize() {
+        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Integer.class, KnownTypeAdapters.IntegerTypeAdapter.class);
+        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(String.class, KnownTypeAdapters.StringTypeAdapter.class);
+        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Double.class, KnownTypeAdapters.DoubleTypeAdapter.class);
+        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Float.class, KnownTypeAdapters.FloatTypeAdapter.class);
+        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Boolean.class, KnownTypeAdapters.BooleanTypeAdapter.class);
+
+        mKnownCollectionTypeAdapters.put(List.class, KnownTypeAdapters.ListTypeAdapter.class);
+        mKnownCollectionTypeAdapters.put(Map.class, KnownTypeAdapters.MapTypeAdapter.class);
+    }
+
+    private static void registerPrimitiveTypeAdapters(Class type, Class typeAdapterClass) {
+        mKnownPrimitiveTypeAdapters.put(type, typeAdapterClass);
+        if (mKnownTypeAdaptersMethodNames.get(type.toString()) == null) {
+            String adapterName = FileGenUtils.unescapeEscapedString(typeAdapterClass.getSimpleName());
+            String getAdapterFactoryMethodName = "get" + adapterName;
+            mKnownTypeAdaptersMethodNames.put(type.getName(), getAdapterFactoryMethodName);
+        }
+    }
+
+    @NotNull
+    public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
+        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        if (outerClassType.equals(ArrayList.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater";
+        } else if (outerClassType.equals(List.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.ListInstantiater";
+        } else if (outerClassType.equals(Collection.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater";
+        } else {
+            return "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater";
+        }
+    }
+
+    @NotNull
+    public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
+        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        if (outerClassType.equals(Map.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.MapInstantiater";
+        } else if (outerClassType.equals(HashMap.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater";
+        } else if (outerClassType.equals(LinkedHashMap.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.LinkedHashMapInstantiater";
+        } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater";
+        } else {
+            return "com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater";
+        }
+    }
+}
\ No newline at end of file

From e693ea83c3813d6ee3bfafe2c58caac86a3d9ef1 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 19:12:23 +0530
Subject: [PATCH 027/159] generate getter methods for all known type adapters

---
 .../processor/generators/StagGenerator.java   | 163 ++++++++++++++----
 1 file changed, 130 insertions(+), 33 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 9144f0e8..ec3102c3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -37,16 +37,19 @@
 import com.squareup.javapoet.TypeVariableName;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.utils.FileGenUtils;
+import com.vimeo.stag.processor.utils.KnownTypeAdapterUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.processing.Filer;
@@ -73,11 +76,9 @@ public class StagGenerator {
     @NotNull
     private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
 
-
     @NotNull
     private final String mGeneratedPackageName;
 
-
     public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                          @NotNull Set<TypeMirror> knownTypes) {
         mFiler = filer;
@@ -99,6 +100,8 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             mKnownClasses.add(classInfo);
             mFieldNameMap.put(knownType.toString(), adapterFactoryMethodName);
         }
+
+        KnownTypeAdapterUtils.initialize();
     }
 
     @Nullable
@@ -137,59 +140,114 @@ private TypeSpec getAdapterFactorySpec() {
                 .addTypeVariable(genericTypeName)
                 .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericTypeName))
                 .addParameter(Gson.class, "gson")
-                .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName),
-                              "type")
+                .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName), "type")
                 .addStatement("Class<? super T> clazz = type.getRawType()");
 
-        /**
-         * Iterate through all the registered known classes, and map the classes to its corresponding type adapters.
+        /*
+         * Iterate through all the registered unknown classes, and map the classes to its corresponding type adapters.
          */
         for (ClassInfo classInfo : mUnknownClasses) {
             String variableName = mUnknownAdapterFieldMap.get(classInfo.getType().toString());
             TypeName typeName = TypeVariableName.get(classInfo.getType());
-            TypeName parameterizedTypeName =
-                    ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
             String fieldName = "mAdapter" + variableName;
-            FieldSpec.Builder fieldSpecBuilder =
-                    FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName),
-                                      Modifier.PRIVATE);
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
             adapterFactoryBuilder.addField(fieldSpecBuilder.build());
             String getAdapterFactoryMethodName = "get" + variableName;
-            //Build a getter method
-            MethodSpec.Builder getAdapterMethodBuilder =
-                    MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
-                            .addModifiers(Modifier.PUBLIC)
-                            .addParameter(Gson.class, "gson")
-                            .returns(parameterizedTypeName);
 
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
+                    .addModifiers(Modifier.PUBLIC)
+                    .addParameter(Gson.class, "gson")
+                    .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
-            getAdapterMethodBuilder.addStatement(
-                    fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() +
-                    ">(){})");
+
+            if (TypeAdapterGenerator.isArray(classInfo.getType())) {
+                TypeMirror typeMirror = getFirstTypeArgument(classInfo);
+                String valueAdapterName = mFieldNameMap.get(typeMirror.toString());
+                String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(classInfo.getType());
+                getAdapterMethodBuilder.addStatement(fieldName + " = new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(get" + valueAdapterName + "(gson), new " + listInstantiater + "())");
+            } else if (TypeAdapterGenerator.isMap(classInfo.getType())) {
+                TypeMirror keyTypeMirror = getFirstTypeArgument(classInfo);
+                TypeMirror valueTypeMirror = getSecondTypeArgument(classInfo);
+                String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(classInfo.getType());
+
+                String result;
+                String keyFieldName = KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString());
+                String valueFieldName = KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(valueTypeMirror.toString());
+
+                if (keyFieldName == null) {
+                    keyFieldName = mFieldNameMap.get(keyTypeMirror.toString());
+                    if (keyFieldName == null) {
+                        ClassInfo keyClassInfo = new ClassInfo(keyTypeMirror);
+                        String adapterName = "mAdapter" + keyClassInfo.getTypeAdapterClassName();
+                        ParameterizedTypeName keyParameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(keyClassInfo.getType()));
+                        FieldSpec.Builder keyFieldSpecBuilder = FieldSpec.builder(keyParameterizedTypeName, FileGenUtils.unescapeEscapedString(adapterName), Modifier.PRIVATE);
+                        MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString("get" + keyClassInfo.getTypeAdapterClassName()))
+                                .addModifiers(Modifier.PUBLIC)
+                                .addParameter(Gson.class, "gson")
+                                .returns(keyParameterizedTypeName);
+                        methodBuilder.beginControlFlow("if (null == " + adapterName + ")");
+                        methodBuilder.addStatement(adapterName + " = gson.getAdapter(new TypeToken<" + keyClassInfo.getType().toString() + ">(){})");
+                        methodBuilder.endControlFlow();
+                        methodBuilder.addStatement("return " + adapterName);
+                        adapterFactoryBuilder.addField(keyFieldSpecBuilder.build());
+                        adapterFactoryBuilder.addMethod(methodBuilder.build());
+                        keyFieldName = keyClassInfo.getTypeAdapterClassName();
+                    }
+                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(get" + keyFieldName + "(gson), ";
+                } else {
+                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyFieldName + "(), ";
+                }
+
+                if (valueFieldName == null) {
+                    valueFieldName = mFieldNameMap.get(valueTypeMirror.toString());
+                    if (valueFieldName == null) {
+                        ClassInfo valueClassInfo = new ClassInfo(valueTypeMirror);
+                        String adapterName = "mAdapter" + valueClassInfo.getTypeAdapterClassName();
+                        ParameterizedTypeName keyParameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(valueClassInfo.getType()));
+                        FieldSpec.Builder keyFieldSpecBuilder = FieldSpec.builder(keyParameterizedTypeName, FileGenUtils.unescapeEscapedString(adapterName), Modifier.PRIVATE);
+                        MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString("get" + valueClassInfo.getTypeAdapterClassName()))
+                                .addModifiers(Modifier.PUBLIC)
+                                .addParameter(Gson.class, "gson")
+                                .returns(keyParameterizedTypeName);
+                        methodBuilder.beginControlFlow("if (null == " + adapterName + ")");
+                        methodBuilder.addStatement(adapterName + " = gson.getAdapter(new TypeToken<" + valueClassInfo.getType().toString() + ">(){})");
+                        methodBuilder.endControlFlow();
+                        methodBuilder.addStatement("return " + adapterName);
+                        adapterFactoryBuilder.addField(keyFieldSpecBuilder.build());
+                        adapterFactoryBuilder.addMethod(methodBuilder.build());
+                        valueFieldName = valueClassInfo.getTypeAdapterClassName();
+                    }
+                    result += "get" + valueFieldName + "(gson), new " + mapInstantiater + "())";
+                } else {
+                    result += valueFieldName + "(), new " + mapInstantiater + "())";
+                }
+
+                getAdapterMethodBuilder.addStatement(fieldName + result);
+            } else {
+                getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
+            }
+
             getAdapterMethodBuilder.endControlFlow();
             getAdapterMethodBuilder.addStatement("return " + fieldName);
             adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
         }
 
-
-        /**
+        /*
          * Iterate through all the registered known classes, and map the classes to its corresponding type adapters.
          */
         for (ClassInfo classInfo : mKnownClasses) {
             String qualifiedTypeAdapterName = classInfo.getTypeAdapterQualifiedClassName();
             List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
             if (null == typeArguments || typeArguments.isEmpty()) {
-                /**
+                /*
                  *  This is used to generate the code if the class does not have any type arguments, or it is not parameterized.
                  */
                 String variableName = mFieldNameMap.get(classInfo.getType().toString());
                 TypeName typeName = TypeVariableName.get(classInfo.getType());
-                TypeName parameterizedTypeName =
-                        ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+                TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
                 String fieldName = "mAdapter" + variableName;
-                FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName,
-                                                                       FileGenUtils.unescapeEscapedString(
-                                                                               fieldName), Modifier.PRIVATE);
+                FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
                 adapterFactoryBuilder.addField(fieldSpecBuilder.build());
                 String getAdapterFactoryMethodName = "get" + variableName;
                 //Build a getter method
@@ -213,7 +271,7 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.endControlFlow();
                 createMethodBuilder.addCode("\n");
             } else {
-                /**
+                /*
                  *  This is used to generate the code if the class has type arguments, or it is parameterized.
                  */
                 createMethodBuilder.beginControlFlow(
@@ -227,17 +285,18 @@ private TypeSpec getAdapterFactorySpec() {
                         "java.lang.reflect.Type[] parametersType = parameterizedType.getActualTypeArguments()");
                 String statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    statement += ", parametersType[" + idx + "]";
+                    createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx + " = gson.getAdapter(TypeToken.get(parametersType[" + idx + "]))");
+                    statement += ", typeAdapter" + idx;
                 }
                 statement += ")";
                 createMethodBuilder.addStatement(statement);
                 createMethodBuilder.endControlFlow();
                 createMethodBuilder.beginControlFlow("else");
                 createMethodBuilder.addStatement("TypeToken objectToken = TypeToken.get(Object.class)");
-                createMethodBuilder.addStatement("java.lang.reflect.Type objectType = objectToken.getType()");
+                createMethodBuilder.addStatement("TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
                 statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    statement += ", objectType";
+                    statement += ", typeAdapter";
                 }
                 statement += ")";
                 createMethodBuilder.addStatement(statement);
@@ -247,9 +306,35 @@ private TypeSpec getAdapterFactorySpec() {
             }
         }
         createMethodBuilder.addStatement("return null");
-
         adapterFactoryBuilder.addMethod(createMethodBuilder.build());
 
+        /*
+         * Generate all known primitive type adapters that are registered in {@link KnownTypeAdapterUtils}
+         */
+        Set<Map.Entry<Type, Class>> entries = KnownTypeAdapterUtils.getKnownPrimitiveTypeAdapters().entrySet();
+        for (Map.Entry<Type, Class> entry : entries) {
+
+            String adapterName = FileGenUtils.unescapeEscapedString(entry.getValue().getSimpleName());
+            String methodName = "get" + adapterName;
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(entry.getKey()));
+
+            String fieldName = "m" + adapterName;
+            MethodSpec.Builder adapterMethodBuilder =
+                    MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(methodName))
+                            .addModifiers(Modifier.PUBLIC)
+                            .returns(parameterizedTypeName);
+
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName),
+                    Modifier.PRIVATE);
+
+            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+
+            adapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
+            adapterMethodBuilder.addStatement(fieldName + " = new com.vimeo.stag.KnownTypeAdapters." + adapterName + "()");
+            adapterMethodBuilder.endControlFlow();
+            adapterMethodBuilder.addStatement("return " + fieldName);
+            adapterFactoryBuilder.addMethod(adapterMethodBuilder.build());
+        }
 
         return adapterFactoryBuilder.build();
     }
@@ -289,4 +374,16 @@ String addFieldType(@NotNull TypeMirror fieldType) {
         }
         return result;
     }
+
+    @Nullable
+    private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
+        List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
+        return typeArguments != null ? typeArguments.get(0) : null;
+    }
+
+    @Nullable
+    private TypeMirror getSecondTypeArgument(ClassInfo classInfo) {
+        List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
+        return typeArguments != null ? typeArguments.get(1) : null;
+    }
 }
\ No newline at end of file

From 7c55d8d3f7d9357ea037ca6ffea8be6458cafe15 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 19:12:49 +0530
Subject: [PATCH 028/159] removed list and map reading, redirected it to the
 corresponding adapters

---
 .../generators/TypeAdapterGenerator.java      | 180 +++++++++---------
 1 file changed, 89 insertions(+), 91 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index b170773e..e2ead957 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -38,13 +38,13 @@
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.utils.FileGenUtils;
+import com.vimeo.stag.processor.utils.KnownTypeAdapterUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -66,12 +66,12 @@
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
+    private static boolean mGsonVariableUsed;
+    private static boolean mStagFactoryUsed;
+
     @NotNull
     private final ClassInfo mInfo;
 
-    private boolean mGsonVariableUsed;
-    private boolean mStagFactoryUsed;
-
     public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
     }
@@ -83,30 +83,38 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
-                result = " com.google.gson.reflect.TypeToken.get(" + typeVarsMap.get(fieldType) + ")";
+                result = typeVarsMap.get(fieldType);
             } else if (fieldType instanceof DeclaredType) {
-                /**
+                /*
                  * If it is of ParameterizedType, {@link com.vimeo.stag.utils.ParameterizedTypeUtil} is used to get the
                  * type token of the parameter type.
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                result = "com.google.gson.reflect.TypeToken.getParameterized(" +
-                        declaredFieldType.asElement().toString() + ".class";
-                /**
-                 * Iterate through all the types from the typeArguments and generate type token code accordingly
-                 */
-                for (TypeMirror parameterTypeMirror : typeMirrors) {
-                    if (isSupportedNative(parameterTypeMirror.toString())) {
-                        result += ", " + parameterTypeMirror.toString() + ".class";
-                    } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
-                        result += ", " + typeVarsMap.get(parameterTypeMirror);
+                if (isMap(fieldType)) {
+                    TypeMirror keyTypeMirror = typeMirrors.get(0);
+                    TypeMirror valueTypeMirror = typeMirrors.get(1);
+                    if (isSupportedNative(keyTypeMirror.toString())) {
+                        if (isMap(valueTypeMirror)) {
+                            result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
+                        } else {
+                            result = typeVarsMap.get(valueTypeMirror);
+                        }
+                        result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(stagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString())
+                                + "(), " + result + ", null)";
+                    } else {
+                        result = "com.google.gson.reflect.TypeToken.getParameterized(" +
+                                declaredFieldType.asElement().toString() + ".class";
+                    }
+                } else if (isArray(fieldType)) {
+                    TypeMirror valueTypeMirror = typeMirrors.get(0);
+                    if (isArray(valueTypeMirror)) {
+                        result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
                     } else {
-                        result += ",\n" + getTypeTokenCode(parameterTypeMirror, typeVarsMap,
-                                typeTokenConstantsGenerator) + ".getType()";
+                        result = typeVarsMap.get(valueTypeMirror);
                     }
+                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(" + result + ", null)";
                 }
-                result += ")";
             }
         } else {
             result = typeTokenConstantsGenerator.addTypeToken(fieldType);
@@ -196,8 +204,6 @@ private static List<String> getReadTokenType(@NotNull TypeMirror type) {
             tokenType.add("com.google.gson.stream.JsonToken.STRING");
             tokenType.add("com.google.gson.stream.JsonToken.NUMBER");
             return tokenType;
-        } else if (isArray(type)) {
-            return Collections.singletonList("com.google.gson.stream.JsonToken.BEGIN_ARRAY");
         } else {
             return null;
         }
@@ -233,64 +239,51 @@ private static String getArrayListType(@NotNull TypeMirror innerArrayType) {
     @NotNull
     private static String getReadCode(@NotNull String prefix, @NotNull String variableName,
                                       @NotNull TypeMirror type, @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isArray(type)) {
+        if (isNativeArray(type)) {
             TypeMirror innerType = getArrayInnerType(type);
-            boolean isNativeArray = isNativeArray(type);
             String innerRead = getReadType(type, innerType, adapterFieldInfo);
-            String arrayListVariableName = isNativeArray ? "tmpArray" : "object." + variableName;
+            String arrayListVariableName = "tmp" + variableName;
             String stagGetterName = adapterFieldInfo.getKnownAdapterStagFunctionCalls(innerType);
             String result = prefix + "reader.beginArray();\n" +
-                    prefix + (isNativeArray ? "java.util.ArrayList<" + getArrayListType(innerType) + "> " : "") + arrayListVariableName + " = new java.util.ArrayList<>();\n" +
+                    prefix + "java.util.ArrayList<" + getArrayListType(innerType) + "> " + arrayListVariableName + " = new java.util.ArrayList<>();\n" +
                     (stagGetterName != null ? prefix + "TypeAdapter<" + innerType + "> adapter = " + stagGetterName + ";\n" : "") +
                     prefix + "while (reader.hasNext()) {\n" +
                     prefix + "\t" + arrayListVariableName + ".add(" + innerRead + ");\n" +
                     prefix + "}\n" +
                     prefix + "reader.endArray();\n";
-            if (isNativeArray) {
-                result += prefix + "object." + variableName + "= new " + innerType.toString() + "[" + arrayListVariableName + ".size()];\n";
-                result += prefix + "for(int idx = 0; idx < " + arrayListVariableName + ".size(); idx++) {\n";
-                result += prefix + "\tobject." + variableName + "[idx] = " + arrayListVariableName + ".get(idx);\n";
-                result += prefix + "}\n";
-            }
+
+            result += prefix + "object." + variableName + "= new " + innerType.toString() + "[" + arrayListVariableName + ".size()];\n";
+            result += prefix + "for(int idx = 0; idx < " + arrayListVariableName + ".size(); idx++) {\n";
+            result += prefix + "\tobject." + variableName + "[idx] = " + arrayListVariableName + ".get(idx);\n";
+            result += prefix + "}\n";
+
             return result;
+        } else if (isArray(type)) {
+            TypeMirror innerType = getArrayInnerType(type);
+            String adapter = adapterFieldInfo.getAdapter(innerType);
+            if (isSupportedNative(innerType.toString())) {
+                mStagFactoryUsed = true;
+                adapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(innerType.toString()) + "()";
+            }
+
+            String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
+            return prefix + "object." + variableName + " = new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + innerType + "," + type + ">(" + adapter + ", new " + listInstantiater + "()).read(reader);";
         } else {
             if (isMap(type) && type instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
                 if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    String keyRead = getReadType(type, typeArguments.get(0), adapterFieldInfo);
-                    String valueRead = getReadType(type, typeArguments.get(1), adapterFieldInfo);
-                    String result = prefix + "if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
-                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" : type.toString()) + "();\n" +
-                            prefix + "\treader.beginObject();\n" +
-                            prefix + "\twhile (reader.hasNext()) {\n" +
-                            prefix + "\t\tcom.google.gson.internal.JsonReaderInternalAccess.INSTANCE.promoteNameToValue(reader);\n" +
-                            prefix + "\t\t" + typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
-                            prefix + "\t\t" + typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
-                            prefix + "\t\t" + typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
-                            prefix + "\t\tif (replaced != null) {\n" +
-                            prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
-                            prefix + "\t\t}\n" +
-                            prefix + "\t}\n" +
-                            prefix + "\treader.endObject();\n" +
-                            prefix + "} else if(reader.peek() == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {\n" +
-                            prefix + "\tobject." + variableName + "= new " + (TypeUtils.getOuterClassType(type).equals(Map.class.getName()) ? "java.util.LinkedHashMap<>" : type.toString()) + "();\n" +
-                            prefix + "\treader.beginArray();\n" +
-                            prefix + "\twhile (reader.hasNext()) {\n" +
-                            prefix + "\t\treader.beginArray();\n" +
-                            prefix + "\t\t" + typeArguments.get(0).toString() + " key = " + keyRead + ";\n" +
-                            prefix + "\t\t" + typeArguments.get(1).toString() + " value = " + valueRead + ";\n" +
-                            prefix + "\t\t" + typeArguments.get(1).toString() + " replaced = object." + variableName + ".put(key, value);\n" +
-                            prefix + "\t\tif (replaced != null) {\n" +
-                            prefix + "\t\t\tthrow new com.google.gson.JsonSyntaxException(\"duplicate key: \" + key);\n" +
-                            prefix + "\t\t}\n" +
-                            prefix + "\t\treader.endArray();\n" +
-                            prefix + "\t}\n" +
-                            prefix + "\treader.endArray();\n" +
-                            prefix + "} else {\n" +
-                            prefix + "\treader.skipValue();\n" +
-                            prefix + "}";
-
-                    return result;
+                    TypeMirror valueTypeMirror = typeArguments.get(1);
+
+                    mStagFactoryUsed = true;
+                    String keyAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(0).toString()) + "()";
+                    String valueAdapter = adapterFieldInfo.getAdapter(valueTypeMirror);
+
+                    if (valueAdapter == null || isSupportedNative(valueAdapter)) {
+                        valueAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(1).toString()) + "()";
+                    }
+
+                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
+                    return prefix + "object." + variableName + " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + typeArguments.get(0) + "," + typeArguments.get(1) + "," + type + ">(" + keyAdapter + ", " + valueAdapter + ", new " + mapInstantiater + "()).read(reader);";
                 }
             }
             return prefix + "object." + variableName + " = " +
@@ -475,7 +468,7 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
         for (TypeMirror fieldType : exclusiveTypeSet) {
             String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
             if (null != getterField) {
-                /**
+                /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
                 result.addTypeToFunctionName(fieldType.toString(),
@@ -497,8 +490,7 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
                     TypeName typeName = getAdapterFieldTypeName(fieldType);
                     adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
                     constructorBuilder.addStatement(
-                            fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" +
-                                    getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+                            fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
                 }
             }
         }
@@ -541,7 +533,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
                 builder.addCode("\t}\n");
             }
 
-            /**
+            /*
              * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
              */
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
@@ -594,22 +586,18 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         int idx = 0;
         if (null != typeArguments) {
 
-            for (TypeMirror argType : typeArguments) {
-                if (argType.getKind() == TypeKind.TYPEVAR) {
-                    TypeVariable typeVariable = (TypeVariable) argType;
+            for (TypeMirror innerTypeMirror : typeArguments) {
+                if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
+                    TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
                     String simpleName = typeVariable.asElement().getSimpleName().toString();
                     adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
-
-                    String paramName = "type" + "[" + String.valueOf(idx) + "]";
+                    ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
+                    String paramName = "typeAdapter" + idx;
+                    constructorBuilder.addParameter(parameterizedTypeName, paramName);
                     typeVarsMap.put(typeVariable, paramName);
                     idx++;
                 }
             }
-
-            if (idx > 0) {
-                constructorBuilder.addParameter(Type[].class, "type");
-                constructorBuilder.varargs(true);
-            }
         }
 
         AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
@@ -642,7 +630,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
     private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNull TypeMirror type,
                                 @NotNull String jsonName, @NotNull String variableName,
                                 @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isArray(type)) {
+        if (isNativeArray(type)) {
             TypeMirror innerType = getArrayInnerType(type);
             String innerWrite = getWriteType(key, innerType, "item", adapterFieldInfo);
             return prefix + "writer.name(\"" + jsonName + "\");\n" +
@@ -651,24 +639,34 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
                     prefix + "\t" + innerWrite + "\n" +
                     prefix + "}\n" +
                     prefix + "writer.endArray();\n";
+        } else if (isArray(type)) {
+            TypeMirror innerType = getArrayInnerType(type);
+            String adapter = adapterFieldInfo.getAdapter(innerType);
+            if (isSupportedNative(innerType.toString())) {
+                mStagFactoryUsed = true;
+                adapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(innerType.toString()) + "()";
+            }
+
+            String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
+            return prefix + "writer.name(\"" + jsonName + "\");\n" +
+                    prefix + "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(" + adapter + ", new " + listInstantiater + "()).write(writer, " + variableName + ");\n";
         } else {
             if (isMap(type) && type instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
                 if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    String valueWrite =
-                            getWriteType(key, typeArguments.get(1), "entry.getValue()", adapterFieldInfo);
+                    TypeMirror keyTypeMirror = typeArguments.get(0);
+                    mStagFactoryUsed = true;
+                    String keyAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString()) + "()";
+                    String valueAdapter = adapterFieldInfo.getAdapter(typeArguments.get(1));
+                    if (isSupportedNative(typeArguments.get(1).toString())) {
+                        valueAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(1).toString()) + "()";
+                    }
+                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
                     return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                            prefix + "writer.beginObject();\n" +
-                            prefix + "for (" + type.toString().replaceFirst("<", ".Entry<") + " entry : " +
-                            variableName + ".entrySet()) {\n" +
-                            prefix + "\twriter.name(String.valueOf(entry.getKey()));\n" +
-                            prefix + "\t" + valueWrite + "\n" +
-                            prefix + "}\n" +
-                            prefix + "writer.endObject();\n";
+                            prefix + "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyAdapter + ", " + valueAdapter + ", new " + mapInstantiater + "()).write(writer, " + variableName + ");\n";
                 }
             }
-            return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                    prefix + getWriteType(key, type, variableName, adapterFieldInfo) + '\n';
+            return prefix + "writer.name(\"" + jsonName + "\");\n" + prefix + getWriteType(key, type, variableName, adapterFieldInfo) + '\n';
         }
     }
 

From 7513d897fad0065210a3ed60d26d721db6f4e7b8 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 22:34:29 +0530
Subject: [PATCH 029/159] added different types of known typeadapters

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 572 ++++++++++++++++--
 1 file changed, 517 insertions(+), 55 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 8e3bbc6e..643bbf20 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -1,18 +1,29 @@
 package com.vimeo.stag;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.JsonReaderInternalAccess;
+import com.google.gson.internal.LazilyParsedNumber;
+import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Calendar;
 import java.util.Collection;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -21,128 +32,512 @@
 
 public class KnownTypeAdapters {
 
-    interface KnownTypeInstantiater<T> {
-        T instantiate();
-    }
+    public static final TypeAdapter<BitSet> BIT_SET = new TypeAdapter<BitSet>() {
+        @Override
+        public BitSet read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
 
-    public static class ListInstantiater<V> implements KnownTypeInstantiater<List<V>> {
+            BitSet bitset = new BitSet();
+            in.beginArray();
+            int i = 0;
+            JsonToken tokenType = in.peek();
+            while (tokenType != JsonToken.END_ARRAY) {
+                boolean set;
+                switch (tokenType) {
+                    case NUMBER:
+                        set = in.nextInt() != 0;
+                        break;
+                    case BOOLEAN:
+                        set = in.nextBoolean();
+                        break;
+                    case STRING:
+                        String stringValue = in.nextString();
+                        try {
+                            set = Integer.parseInt(stringValue) != 0;
+                        } catch (NumberFormatException e) {
+                            throw new JsonSyntaxException(
+                                    "Error: Expecting: bitset number value (1, 0), Found: " + stringValue);
+                        }
+                        break;
+                    default:
+                        throw new JsonSyntaxException("Invalid bitset value type: " + tokenType);
+                }
+                if (set) {
+                    bitset.set(i);
+                }
+                ++i;
+                tokenType = in.peek();
+            }
+            in.endArray();
+            return bitset;
+        }
 
         @Override
-        public List<V> instantiate() {
-            return new ArrayList<V>();
+        public void write(JsonWriter out, BitSet src) throws IOException {
+            if (src == null) {
+                out.nullValue();
+                return;
+            }
+
+            out.beginArray();
+            for (int i = 0; i < src.length(); i++) {
+                int value = (src.get(i)) ? 1 : 0;
+                out.value(value);
+            }
+            out.endArray();
         }
-    }
+    };
 
-    public static class CollectionInstantiater<V> implements KnownTypeInstantiater<Collection<V>> {
+    public static final TypeAdapter<Boolean> BOOLEAN = new TypeAdapter<Boolean>() {
+        @Override
+        public Boolean read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            } else if (in.peek() == JsonToken.STRING) {
+                // support strings for compatibility with GSON 1.7
+                return Boolean.parseBoolean(in.nextString());
+            }
+            return in.nextBoolean();
+        }
 
         @Override
-        public Collection<V> instantiate() {
-            return new ArrayList<V>();
+        public void write(JsonWriter out, Boolean value) throws IOException {
+            out.value(value);
         }
-    }
+    };
 
-    public static class ArrayListInstantiater<V> implements KnownTypeInstantiater<ArrayList<V>> {
+    public static final TypeAdapter<Boolean> BOOLEAN_AS_STRING = new TypeAdapter<Boolean>() {
+        @Override
+        public Boolean read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            return Boolean.valueOf(in.nextString());
+        }
 
         @Override
-        public ArrayList<V> instantiate() {
-            return new ArrayList<V>();
+        public void write(JsonWriter out, Boolean value) throws IOException {
+            out.value(value == null ? "null" : value.toString());
         }
-    }
+    };
 
-    public static class HashMapInstantiater<K, V> implements KnownTypeInstantiater<HashMap<K, V>> {
+    public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
+        @Override
+        public Byte read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                int intValue = in.nextInt();
+                return (byte) intValue;
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
+        }
 
         @Override
-        public HashMap<K, V> instantiate() {
-            return new HashMap<K, V>();
+        public void write(JsonWriter out, Byte value) throws IOException {
+            out.value(value);
         }
-    }
+    };
 
-    public static class ConcurrentHashMapInstantiater<K, V> implements KnownTypeInstantiater<ConcurrentHashMap<K, V>> {
+    public static final TypeAdapter<Short> SHORT = new TypeAdapter<Short>() {
+        @Override
+        public Short read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                return (short) in.nextInt();
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
+        }
 
         @Override
-        public ConcurrentHashMap<K, V> instantiate() {
-            return new ConcurrentHashMap<K, V>();
+        public void write(JsonWriter out, Short value) throws IOException {
+            out.value(value);
         }
-    }
+    };
 
-    public static class LinkedHashMapInstantiater<K, V> implements KnownTypeInstantiater<LinkedHashMap<K, V>> {
+    public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
+        @Override
+        public Integer read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                return in.nextInt();
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
+        }
 
         @Override
-        public LinkedHashMap<K, V> instantiate() {
-            return new LinkedHashMap<K, V>();
+        public void write(JsonWriter out, Integer value) throws IOException {
+            out.value(value);
         }
-    }
+    };
 
-    public static class MapInstantiater<K, V> implements KnownTypeInstantiater<Map<K, V>> {
+    public static final TypeAdapter<Long> LONG = new TypeAdapter<Long>() {
+        @Override
+        public Long read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                return in.nextLong();
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
+        }
 
         @Override
-        public Map<K, V> instantiate() {
-            return new LinkedHashMap<K, V>();
+        public void write(JsonWriter out, Long value) throws IOException {
+            out.value(value);
+        }
+    };
+
+    public static final TypeAdapter<Float> FLOAT = new TypeAdapter<Float>() {
+        @Override
+        public Float read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            return (float) in.nextDouble();
+        }
+
+        @Override
+        public void write(JsonWriter out, Float value) throws IOException {
+            out.value(value);
+        }
+    };
+
+    public static final TypeAdapter<Double> DOUBLE = new TypeAdapter<Double>() {
+        @Override
+        public Double read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            return in.nextDouble();
+        }
+
+        @Override
+        public void write(JsonWriter out, Double value) throws IOException {
+            out.value(value);
+        }
+    };
+
+    public static final TypeAdapter<Number> NUMBER = new TypeAdapter<Number>() {
+        @Override
+        public Number read(JsonReader in) throws IOException {
+            JsonToken jsonToken = in.peek();
+            switch (jsonToken) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                case NUMBER:
+                case STRING:
+                    return new LazilyParsedNumber(in.nextString());
+                default:
+                    throw new JsonSyntaxException("Expecting number, got: " + jsonToken);
+            }
         }
-    }
 
-    public static class StringTypeAdapter extends TypeAdapter<String> {
+        @Override
+        public void write(JsonWriter out, Number value) throws IOException {
+            out.value(value);
+        }
+    };
 
+    public static final TypeAdapter<Character> CHARACTER = new TypeAdapter<Character>() {
         @Override
-        public void write(JsonWriter writer, String value) throws IOException {
-            writer.value(value);
+        public Character read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            String str = in.nextString();
+            if (str.length() != 1) {
+                throw new JsonSyntaxException("Expecting character, got: " + str);
+            }
+            return str.charAt(0);
         }
 
+        @Override
+        public void write(JsonWriter out, Character value) throws IOException {
+            out.value(value == null ? null : String.valueOf(value));
+        }
+    };
+
+    public static final TypeAdapter<String> STRING = new TypeAdapter<String>() {
         @Override
         public String read(JsonReader in) throws IOException {
+            JsonToken peek = in.peek();
+            if (peek == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            /* coerce booleans to strings for backwards compatibility */
+            if (peek == JsonToken.BOOLEAN) {
+                return Boolean.toString(in.nextBoolean());
+            }
             return in.nextString();
         }
-    }
 
-    public static class FloatTypeAdapter extends TypeAdapter<Float> {
+        @Override
+        public void write(JsonWriter out, String value) throws IOException {
+            out.value(value);
+        }
+    };
 
+    public static final TypeAdapter<BigDecimal> BIG_DECIMAL = new TypeAdapter<BigDecimal>() {
         @Override
-        public void write(JsonWriter writer, Float value) throws IOException {
-            writer.value(value);
+        public BigDecimal read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                return new BigDecimal(in.nextString());
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
         }
 
         @Override
-        public Float read(JsonReader in) throws IOException {
-            return (float) in.nextDouble();
+        public void write(JsonWriter out, BigDecimal value) throws IOException {
+            out.value(value);
+        }
+    };
+
+    public static final TypeAdapter<BigInteger> BIG_INTEGER = new TypeAdapter<BigInteger>() {
+        @Override
+        public BigInteger read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            try {
+                return new BigInteger(in.nextString());
+            } catch (NumberFormatException e) {
+                throw new JsonSyntaxException(e);
+            }
+        }
+
+        @Override
+        public void write(JsonWriter out, BigInteger value) throws IOException {
+            out.value(value);
+        }
+    };
+
+    public static final TypeAdapter<Calendar> CALENDAR = new TypeAdapter<Calendar>() {
+        private static final String YEAR = "year";
+        private static final String MONTH = "month";
+        private static final String DAY_OF_MONTH = "dayOfMonth";
+        private static final String HOUR_OF_DAY = "hourOfDay";
+        private static final String MINUTE = "minute";
+        private static final String SECOND = "second";
+
+        @Override
+        public Calendar read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            in.beginObject();
+            int year = 0;
+            int month = 0;
+            int dayOfMonth = 0;
+            int hourOfDay = 0;
+            int minute = 0;
+            int second = 0;
+            while (in.peek() != JsonToken.END_OBJECT) {
+                String name = in.nextName();
+                int value = in.nextInt();
+                if (YEAR.equals(name)) {
+                    year = value;
+                } else if (MONTH.equals(name)) {
+                    month = value;
+                } else if (DAY_OF_MONTH.equals(name)) {
+                    dayOfMonth = value;
+                } else if (HOUR_OF_DAY.equals(name)) {
+                    hourOfDay = value;
+                } else if (MINUTE.equals(name)) {
+                    minute = value;
+                } else if (SECOND.equals(name)) {
+                    second = value;
+                }
+            }
+            in.endObject();
+            return new GregorianCalendar(year, month, dayOfMonth, hourOfDay, minute, second);
+        }
+
+        @Override
+        public void write(JsonWriter out, Calendar value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+                return;
+            }
+            out.beginObject();
+            out.name(YEAR);
+            out.value(value.get(Calendar.YEAR));
+            out.name(MONTH);
+            out.value(value.get(Calendar.MONTH));
+            out.name(DAY_OF_MONTH);
+            out.value(value.get(Calendar.DAY_OF_MONTH));
+            out.name(HOUR_OF_DAY);
+            out.value(value.get(Calendar.HOUR_OF_DAY));
+            out.name(MINUTE);
+            out.value(value.get(Calendar.MINUTE));
+            out.name(SECOND);
+            out.value(value.get(Calendar.SECOND));
+            out.endObject();
+        }
+    };
+
+    public static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter<JsonElement>() {
+        @Override
+        public JsonElement read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case STRING:
+                    return new JsonPrimitive(in.nextString());
+                case NUMBER:
+                    String number = in.nextString();
+                    return new JsonPrimitive(new LazilyParsedNumber(number));
+                case BOOLEAN:
+                    return new JsonPrimitive(in.nextBoolean());
+                case NULL:
+                    in.nextNull();
+                    return JsonNull.INSTANCE;
+                case BEGIN_ARRAY:
+                    JsonArray array = new JsonArray();
+                    in.beginArray();
+                    while (in.hasNext()) {
+                        array.add(read(in));
+                    }
+                    in.endArray();
+                    return array;
+                case BEGIN_OBJECT:
+                    JsonObject object = new JsonObject();
+                    in.beginObject();
+                    while (in.hasNext()) {
+                        object.add(in.nextName(), read(in));
+                    }
+                    in.endObject();
+                    return object;
+                case END_DOCUMENT:
+                case NAME:
+                case END_OBJECT:
+                case END_ARRAY:
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+
+        @Override
+        public void write(JsonWriter out, JsonElement value) throws IOException {
+            if (value == null || value.isJsonNull()) {
+                out.nullValue();
+            } else if (value.isJsonPrimitive()) {
+                JsonPrimitive primitive = value.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    out.value(primitive.getAsNumber());
+                } else if (primitive.isBoolean()) {
+                    out.value(primitive.getAsBoolean());
+                } else {
+                    out.value(primitive.getAsString());
+                }
+
+            } else if (value.isJsonArray()) {
+                out.beginArray();
+                for (JsonElement e : value.getAsJsonArray()) {
+                    write(out, e);
+                }
+                out.endArray();
+
+            } else if (value.isJsonObject()) {
+                out.beginObject();
+                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
+                    out.name(e.getKey());
+                    write(out, e.getValue());
+                }
+                out.endObject();
+
+            } else {
+                throw new IllegalArgumentException("Couldn't write " + value.getClass());
+            }
         }
+    };
+
+    interface KnownTypeInstantiater<T> {
+        T instantiate();
     }
 
-    public static class BooleanTypeAdapter extends TypeAdapter<Boolean> {
+    public static class ListInstantiater<V> implements KnownTypeInstantiater<List<V>> {
 
         @Override
-        public void write(JsonWriter writer, Boolean value) throws IOException {
-            writer.value(value);
+        public List<V> instantiate() {
+            return new ArrayList<V>();
         }
+    }
+
+    public static class CollectionInstantiater<V> implements KnownTypeInstantiater<Collection<V>> {
 
         @Override
-        public Boolean read(JsonReader in) throws IOException {
-            return in.nextBoolean();
+        public Collection<V> instantiate() {
+            return new ArrayList<V>();
         }
     }
 
-    public static class DoubleTypeAdapter extends TypeAdapter<Double> {
+    public static class ArrayListInstantiater<V> implements KnownTypeInstantiater<ArrayList<V>> {
 
         @Override
-        public void write(JsonWriter writer, Double value) throws IOException {
-            writer.value(value);
+        public ArrayList<V> instantiate() {
+            return new ArrayList<V>();
         }
+    }
+
+    public static class HashMapInstantiater<K, V> implements KnownTypeInstantiater<HashMap<K, V>> {
 
         @Override
-        public Double read(JsonReader in) throws IOException {
-            return in.nextDouble();
+        public HashMap<K, V> instantiate() {
+            return new HashMap<K, V>();
         }
     }
 
-    public static class IntegerTypeAdapter extends TypeAdapter<Integer> {
+    public static class ConcurrentHashMapInstantiater<K, V> implements KnownTypeInstantiater<ConcurrentHashMap<K, V>> {
 
         @Override
-        public void write(JsonWriter writer, Integer value) throws IOException {
-            writer.value(value);
+        public ConcurrentHashMap<K, V> instantiate() {
+            return new ConcurrentHashMap<K, V>();
         }
+    }
+
+    public static class LinkedHashMapInstantiater<K, V> implements KnownTypeInstantiater<LinkedHashMap<K, V>> {
 
         @Override
-        public Integer read(JsonReader in) throws IOException {
-            return in.nextInt();
+        public LinkedHashMap<K, V> instantiate() {
+            return new LinkedHashMap<K, V>();
+        }
+    }
+
+    public static class MapInstantiater<K, V> implements KnownTypeInstantiater<Map<K, V>> {
+
+        @Override
+        public Map<K, V> instantiate() {
+            return new LinkedHashMap<K, V>();
         }
     }
 
@@ -305,4 +700,71 @@ private String keyToString(JsonElement keyElement) {
             }
         }
     }
+
+    public final class ObjectTypeAdapter extends TypeAdapter<Object> {
+
+        private final Gson gson;
+
+        public ObjectTypeAdapter(Gson gson) {
+            this.gson = gson;
+        }
+
+        @Override
+        public Object read(JsonReader in) throws IOException {
+            JsonToken token = in.peek();
+            switch (token) {
+                case BEGIN_ARRAY:
+                    List<Object> list = new ArrayList<Object>();
+                    in.beginArray();
+                    while (in.hasNext()) {
+                        list.add(read(in));
+                    }
+                    in.endArray();
+                    return list;
+
+                case BEGIN_OBJECT:
+                    Map<String, Object> map = new LinkedTreeMap<String, Object>();
+                    in.beginObject();
+                    while (in.hasNext()) {
+                        map.put(in.nextName(), read(in));
+                    }
+                    in.endObject();
+                    return map;
+
+                case STRING:
+                    return in.nextString();
+
+                case NUMBER:
+                    return in.nextDouble();
+
+                case BOOLEAN:
+                    return in.nextBoolean();
+
+                case NULL:
+                    in.nextNull();
+                    return null;
+
+                default:
+                    throw new IllegalStateException();
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void write(JsonWriter out, Object value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+                return;
+            }
+
+            TypeAdapter<Object> typeAdapter = (TypeAdapter<Object>) gson.getAdapter(value.getClass());
+            if (typeAdapter instanceof ObjectTypeAdapter) {
+                out.beginObject();
+                out.endObject();
+                return;
+            }
+
+            typeAdapter.write(out, value);
+        }
+    }
 }
\ No newline at end of file

From f7cfad3b4ba75ef5be15c8391ab4b2b5f8d4fce4 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 22:34:53 +0530
Subject: [PATCH 030/159] maintain a map of type vs its typeadapters

---
 .../utils/KnownTypeAdapterUtils.java          | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 857ee562..f35032c3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -1,12 +1,17 @@
 package com.vimeo.stag.processor.utils;
 
+import com.google.gson.JsonElement;
 import com.vimeo.stag.KnownTypeAdapters;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -17,48 +22,49 @@
 import javax.lang.model.type.TypeMirror;
 
 public class KnownTypeAdapterUtils {
-    @NotNull
-    private static final HashMap<Type, Class> mKnownPrimitiveTypeAdapters = new HashMap<>();
     @NotNull
     private static final HashMap<Type, Class> mKnownCollectionTypeAdapters = new HashMap<>();
     @NotNull
-    private static final HashMap<String, String> mKnownTypeAdaptersMethodNames = new HashMap<>();
+    private static final HashMap<String, String> mKnownTypeAdapters = new HashMap<>();
 
-    @NotNull
-    public static HashMap<Type, Class> getKnownCollectionTypeAdapters() {
-        return mKnownCollectionTypeAdapters;
+    static {
+        mKnownTypeAdapters.put(BitSet.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIT_SET");
+        mKnownTypeAdapters.put(Boolean.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BOOLEAN");
+        mKnownTypeAdapters.put(byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
+        mKnownTypeAdapters.put(short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
+        mKnownTypeAdapters.put(Integer.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
+        mKnownTypeAdapters.put(int.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
+        mKnownTypeAdapters.put(Long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
+        mKnownTypeAdapters.put(long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
+        mKnownTypeAdapters.put(Float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
+        mKnownTypeAdapters.put(float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
+        mKnownTypeAdapters.put(Double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
+        mKnownTypeAdapters.put(double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
+        mKnownTypeAdapters.put(Number.class.getName(), "com.vimeo.stag.KnownTypeAdapters.NUMBER");
+        mKnownTypeAdapters.put(Character.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CHARACTER");
+        mKnownTypeAdapters.put(char.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CHARACTER");
+        mKnownTypeAdapters.put(String.class.getName(), "com.vimeo.stag.KnownTypeAdapters.STRING");
+        mKnownTypeAdapters.put(BigDecimal.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIG_DECIMAL");
+        mKnownTypeAdapters.put(BigInteger.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIG_INTEGER");
+        mKnownTypeAdapters.put(Calendar.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CALENDAR");
+        mKnownTypeAdapters.put(JsonElement.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_ELEMENT");
     }
 
-    @NotNull
-    public static HashMap<Type, Class> getKnownPrimitiveTypeAdapters() {
-        return mKnownPrimitiveTypeAdapters;
+    @Nullable
+    public static String getKnownTypeAdapterForType(String type) {
+        return mKnownTypeAdapters.get(type);
     }
 
-    @Nullable
-    public static String getKnownTypeAdaptersMethodNames(String type) {
-        return mKnownTypeAdaptersMethodNames.get(type);
+    @NotNull
+    public static HashMap<Type, Class> getKnownCollectionTypeAdapters() {
+        return mKnownCollectionTypeAdapters;
     }
 
     public static void initialize() {
-        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Integer.class, KnownTypeAdapters.IntegerTypeAdapter.class);
-        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(String.class, KnownTypeAdapters.StringTypeAdapter.class);
-        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Double.class, KnownTypeAdapters.DoubleTypeAdapter.class);
-        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Float.class, KnownTypeAdapters.FloatTypeAdapter.class);
-        KnownTypeAdapterUtils.registerPrimitiveTypeAdapters(Boolean.class, KnownTypeAdapters.BooleanTypeAdapter.class);
-
         mKnownCollectionTypeAdapters.put(List.class, KnownTypeAdapters.ListTypeAdapter.class);
         mKnownCollectionTypeAdapters.put(Map.class, KnownTypeAdapters.MapTypeAdapter.class);
     }
 
-    private static void registerPrimitiveTypeAdapters(Class type, Class typeAdapterClass) {
-        mKnownPrimitiveTypeAdapters.put(type, typeAdapterClass);
-        if (mKnownTypeAdaptersMethodNames.get(type.toString()) == null) {
-            String adapterName = FileGenUtils.unescapeEscapedString(typeAdapterClass.getSimpleName());
-            String getAdapterFactoryMethodName = "get" + adapterName;
-            mKnownTypeAdaptersMethodNames.put(type.getName(), getAdapterFactoryMethodName);
-        }
-    }
-
     @NotNull
     public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);

From 7a627712534cf60801df3982a1761e524d87a4b3 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 22:36:06 +0530
Subject: [PATCH 031/159] no need of readTypeToken code, since the typeadapters
 will take care of it. We will now call only the read method of the
 corresponding typeadapters

---
 .../processor/generators/StagGenerator.java   | 36 +--------
 .../generators/TypeAdapterGenerator.java      | 76 +++++--------------
 2 files changed, 21 insertions(+), 91 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index ec3102c3..554b0411 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -172,8 +172,8 @@ private TypeSpec getAdapterFactorySpec() {
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(classInfo.getType());
 
                 String result;
-                String keyFieldName = KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString());
-                String valueFieldName = KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(valueTypeMirror.toString());
+                String keyFieldName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString());
+                String valueFieldName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(valueTypeMirror.toString());
 
                 if (keyFieldName == null) {
                     keyFieldName = mFieldNameMap.get(keyTypeMirror.toString());
@@ -196,7 +196,7 @@ private TypeSpec getAdapterFactorySpec() {
                     }
                     result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(get" + keyFieldName + "(gson), ";
                 } else {
-                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyFieldName + "(), ";
+                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyFieldName + ", ";
                 }
 
                 if (valueFieldName == null) {
@@ -220,7 +220,7 @@ private TypeSpec getAdapterFactorySpec() {
                     }
                     result += "get" + valueFieldName + "(gson), new " + mapInstantiater + "())";
                 } else {
-                    result += valueFieldName + "(), new " + mapInstantiater + "())";
+                    result += valueFieldName + ", new " + mapInstantiater + "())";
                 }
 
                 getAdapterMethodBuilder.addStatement(fieldName + result);
@@ -308,34 +308,6 @@ private TypeSpec getAdapterFactorySpec() {
         createMethodBuilder.addStatement("return null");
         adapterFactoryBuilder.addMethod(createMethodBuilder.build());
 
-        /*
-         * Generate all known primitive type adapters that are registered in {@link KnownTypeAdapterUtils}
-         */
-        Set<Map.Entry<Type, Class>> entries = KnownTypeAdapterUtils.getKnownPrimitiveTypeAdapters().entrySet();
-        for (Map.Entry<Type, Class> entry : entries) {
-
-            String adapterName = FileGenUtils.unescapeEscapedString(entry.getValue().getSimpleName());
-            String methodName = "get" + adapterName;
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(entry.getKey()));
-
-            String fieldName = "m" + adapterName;
-            MethodSpec.Builder adapterMethodBuilder =
-                    MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(methodName))
-                            .addModifiers(Modifier.PUBLIC)
-                            .returns(parameterizedTypeName);
-
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName),
-                    Modifier.PRIVATE);
-
-            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
-
-            adapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
-            adapterMethodBuilder.addStatement(fieldName + " = new com.vimeo.stag.KnownTypeAdapters." + adapterName + "()");
-            adapterMethodBuilder.endControlFlow();
-            adapterMethodBuilder.addStatement("return " + fieldName);
-            adapterFactoryBuilder.addMethod(adapterMethodBuilder.build());
-        }
-
         return adapterFactoryBuilder.build();
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index e2ead957..017913be 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -47,7 +47,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -100,8 +99,8 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                         } else {
                             result = typeVarsMap.get(valueTypeMirror);
                         }
-                        result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(stagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString())
-                                + "(), " + result + ", null)";
+                        result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString())
+                                + ", " + result + ", null)";
                     } else {
                         result = "com.google.gson.reflect.TypeToken.getParameterized(" +
                                 declaredFieldType.asElement().toString() + ".class";
@@ -189,25 +188,6 @@ private static boolean isNumberType(@NotNull String typeString) {
                 || typeString.equals(Float.class.getName());
     }
 
-    @Nullable
-    private static List<String> getReadTokenType(@NotNull TypeMirror type) {
-        String typeString = type.toString();
-        if (isNumberType(typeString)) {
-            List<String> tokenType = new ArrayList<>(2);
-            tokenType.add("com.google.gson.stream.JsonToken.NUMBER");
-            tokenType.add("com.google.gson.stream.JsonToken.STRING");
-            return tokenType;
-        } else if (type.toString().equals(boolean.class.getName())) {
-            return Collections.singletonList("com.google.gson.stream.JsonToken.BOOLEAN");
-        } else if (type.toString().equals(String.class.getName())) {
-            List<String> tokenType = new ArrayList<>(2);
-            tokenType.add("com.google.gson.stream.JsonToken.STRING");
-            tokenType.add("com.google.gson.stream.JsonToken.NUMBER");
-            return tokenType;
-        } else {
-            return null;
-        }
-    }
 
     @NotNull
     private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
@@ -263,7 +243,7 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
             String adapter = adapterFieldInfo.getAdapter(innerType);
             if (isSupportedNative(innerType.toString())) {
                 mStagFactoryUsed = true;
-                adapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(innerType.toString()) + "()";
+                adapter = "" + KnownTypeAdapterUtils.getKnownTypeAdapterForType(innerType.toString());
             }
 
             String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
@@ -275,11 +255,11 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
                     TypeMirror valueTypeMirror = typeArguments.get(1);
 
                     mStagFactoryUsed = true;
-                    String keyAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(0).toString()) + "()";
+                    String keyAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(0).toString());
                     String valueAdapter = adapterFieldInfo.getAdapter(valueTypeMirror);
 
                     if (valueAdapter == null || isSupportedNative(valueAdapter)) {
-                        valueAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(1).toString()) + "()";
+                        valueAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(1).toString());
                     }
 
                     String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
@@ -296,17 +276,17 @@ private static String getReadType(@NotNull TypeMirror parentType, @NotNull TypeM
                                       @NotNull AdapterFieldInfo adapterFieldInfo) {
         String typeString = type.toString();
         if (typeString.equals(long.class.getName()) || typeString.equals(Long.class.getName())) {
-            return "reader.nextLong()";
+            return "com.vimeo.stag.KnownTypeAdapters.LONG.read(reader)";
         } else if (typeString.equals(double.class.getName()) || typeString.equals(Double.class.getName())) {
-            return "reader.nextDouble()";
+            return "com.vimeo.stag.KnownTypeAdapters.DOUBLE.read(reader)";
         } else if (typeString.equals(boolean.class.getName()) || typeString.equals(Boolean.class.getName())) {
-            return "reader.nextBoolean()";
+            return "com.vimeo.stag.KnownTypeAdapters.BOOLEAN.read(reader)";
         } else if (typeString.equals(String.class.getName())) {
-            return "reader.nextString()";
+            return "com.vimeo.stag.KnownTypeAdapters.STRING.read(reader)";
         } else if (typeString.equals(int.class.getName()) || typeString.equals(Integer.class.getName())) {
-            return "reader.nextInt()";
+            return "com.vimeo.stag.KnownTypeAdapters.INTEGER.read(reader)";
         } else if (typeString.equals(float.class.getName()) || typeString.equals(Float.class.getName())) {
-            return "(float) reader.nextDouble()";
+            return "com.vimeo.stag.KnownTypeAdapters.FLOAT.read(reader)";
         } else {
             return getAdapterRead(parentType, type, adapterFieldInfo);
         }
@@ -361,31 +341,9 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
         for (Map.Entry<Element, TypeMirror> element : elements.entrySet()) {
             String name = getJsonName(element.getKey());
             final String variableName = element.getKey().getSimpleName().toString();
-            List<String> jsonTokenType = getReadTokenType(element.getValue());
-
-            StringBuilder jsonTokenCode = new StringBuilder();
-            jsonTokenCode.append("if (");
-            int size = jsonTokenType != null ? jsonTokenType.size() : 0;
-            for (int i = 0; i < size; i++) {
-                jsonTokenCode.append("jsonToken == ");
-                jsonTokenCode.append(jsonTokenType.get(i));
-                if (i != size - 1) {
-                    jsonTokenCode.append(" || ");
-                }
-            }
-            jsonTokenCode.append(")");
-
-            if (size != 0) {
-                builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                        "\t\t\t\t" + jsonTokenCode.toString() + " {\n" +
-                        getReadCode("\t\t\t\t\t", variableName, element.getValue(), adapterFieldInfo) +
-                        "\n\t\t\t\t} else {" +
-                        "\n\t\t\t\t\treader.skipValue();" +
-                        "\n\t\t\t\t}");
-            } else {
-                builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                        getReadCode("\t\t\t\t\t", variableName, element.getValue(), adapterFieldInfo));
-            }
+
+            builder.addCode("\t\t\tcase \"" + name + "\":\n" +
+                    getReadCode("\t\t\t\t", variableName, element.getValue(), adapterFieldInfo));
 
             builder.addCode("\n\t\t\t\tbreak;\n");
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
@@ -644,7 +602,7 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
             String adapter = adapterFieldInfo.getAdapter(innerType);
             if (isSupportedNative(innerType.toString())) {
                 mStagFactoryUsed = true;
-                adapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(innerType.toString()) + "()";
+                adapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(innerType.toString());
             }
 
             String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
@@ -656,10 +614,10 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
                 if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
                     TypeMirror keyTypeMirror = typeArguments.get(0);
                     mStagFactoryUsed = true;
-                    String keyAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(keyTypeMirror.toString()) + "()";
+                    String keyAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString());
                     String valueAdapter = adapterFieldInfo.getAdapter(typeArguments.get(1));
                     if (isSupportedNative(typeArguments.get(1).toString())) {
-                        valueAdapter = "mStagFactory." + KnownTypeAdapterUtils.getKnownTypeAdaptersMethodNames(typeArguments.get(1).toString()) + "()";
+                        valueAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(1).toString());
                     }
                     String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
                     return prefix + "writer.name(\"" + jsonName + "\");\n" +

From 3a8609199190abaa03a183220569ea041eadbe7e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 23:03:13 +0530
Subject: [PATCH 032/159] removed some type adapters

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 337 +-----------------
 1 file changed, 1 insertion(+), 336 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 643bbf20..efaf5ca8 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -12,6 +12,7 @@
 import com.google.gson.internal.LazilyParsedNumber;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.Streams;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -32,100 +33,6 @@
 
 public class KnownTypeAdapters {
 
-    public static final TypeAdapter<BitSet> BIT_SET = new TypeAdapter<BitSet>() {
-        @Override
-        public BitSet read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-
-            BitSet bitset = new BitSet();
-            in.beginArray();
-            int i = 0;
-            JsonToken tokenType = in.peek();
-            while (tokenType != JsonToken.END_ARRAY) {
-                boolean set;
-                switch (tokenType) {
-                    case NUMBER:
-                        set = in.nextInt() != 0;
-                        break;
-                    case BOOLEAN:
-                        set = in.nextBoolean();
-                        break;
-                    case STRING:
-                        String stringValue = in.nextString();
-                        try {
-                            set = Integer.parseInt(stringValue) != 0;
-                        } catch (NumberFormatException e) {
-                            throw new JsonSyntaxException(
-                                    "Error: Expecting: bitset number value (1, 0), Found: " + stringValue);
-                        }
-                        break;
-                    default:
-                        throw new JsonSyntaxException("Invalid bitset value type: " + tokenType);
-                }
-                if (set) {
-                    bitset.set(i);
-                }
-                ++i;
-                tokenType = in.peek();
-            }
-            in.endArray();
-            return bitset;
-        }
-
-        @Override
-        public void write(JsonWriter out, BitSet src) throws IOException {
-            if (src == null) {
-                out.nullValue();
-                return;
-            }
-
-            out.beginArray();
-            for (int i = 0; i < src.length(); i++) {
-                int value = (src.get(i)) ? 1 : 0;
-                out.value(value);
-            }
-            out.endArray();
-        }
-    };
-
-    public static final TypeAdapter<Boolean> BOOLEAN = new TypeAdapter<Boolean>() {
-        @Override
-        public Boolean read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            } else if (in.peek() == JsonToken.STRING) {
-                // support strings for compatibility with GSON 1.7
-                return Boolean.parseBoolean(in.nextString());
-            }
-            return in.nextBoolean();
-        }
-
-        @Override
-        public void write(JsonWriter out, Boolean value) throws IOException {
-            out.value(value);
-        }
-    };
-
-    public static final TypeAdapter<Boolean> BOOLEAN_AS_STRING = new TypeAdapter<Boolean>() {
-        @Override
-        public Boolean read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            return Boolean.valueOf(in.nextString());
-        }
-
-        @Override
-        public void write(JsonWriter out, Boolean value) throws IOException {
-            out.value(value == null ? "null" : value.toString());
-        }
-    };
-
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
         @Override
         public Byte read(JsonReader in) throws IOException {
@@ -239,248 +146,6 @@ public void write(JsonWriter out, Double value) throws IOException {
         }
     };
 
-    public static final TypeAdapter<Number> NUMBER = new TypeAdapter<Number>() {
-        @Override
-        public Number read(JsonReader in) throws IOException {
-            JsonToken jsonToken = in.peek();
-            switch (jsonToken) {
-                case NULL:
-                    in.nextNull();
-                    return null;
-                case NUMBER:
-                case STRING:
-                    return new LazilyParsedNumber(in.nextString());
-                default:
-                    throw new JsonSyntaxException("Expecting number, got: " + jsonToken);
-            }
-        }
-
-        @Override
-        public void write(JsonWriter out, Number value) throws IOException {
-            out.value(value);
-        }
-    };
-
-    public static final TypeAdapter<Character> CHARACTER = new TypeAdapter<Character>() {
-        @Override
-        public Character read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            String str = in.nextString();
-            if (str.length() != 1) {
-                throw new JsonSyntaxException("Expecting character, got: " + str);
-            }
-            return str.charAt(0);
-        }
-
-        @Override
-        public void write(JsonWriter out, Character value) throws IOException {
-            out.value(value == null ? null : String.valueOf(value));
-        }
-    };
-
-    public static final TypeAdapter<String> STRING = new TypeAdapter<String>() {
-        @Override
-        public String read(JsonReader in) throws IOException {
-            JsonToken peek = in.peek();
-            if (peek == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            /* coerce booleans to strings for backwards compatibility */
-            if (peek == JsonToken.BOOLEAN) {
-                return Boolean.toString(in.nextBoolean());
-            }
-            return in.nextString();
-        }
-
-        @Override
-        public void write(JsonWriter out, String value) throws IOException {
-            out.value(value);
-        }
-    };
-
-    public static final TypeAdapter<BigDecimal> BIG_DECIMAL = new TypeAdapter<BigDecimal>() {
-        @Override
-        public BigDecimal read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            try {
-                return new BigDecimal(in.nextString());
-            } catch (NumberFormatException e) {
-                throw new JsonSyntaxException(e);
-            }
-        }
-
-        @Override
-        public void write(JsonWriter out, BigDecimal value) throws IOException {
-            out.value(value);
-        }
-    };
-
-    public static final TypeAdapter<BigInteger> BIG_INTEGER = new TypeAdapter<BigInteger>() {
-        @Override
-        public BigInteger read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            try {
-                return new BigInteger(in.nextString());
-            } catch (NumberFormatException e) {
-                throw new JsonSyntaxException(e);
-            }
-        }
-
-        @Override
-        public void write(JsonWriter out, BigInteger value) throws IOException {
-            out.value(value);
-        }
-    };
-
-    public static final TypeAdapter<Calendar> CALENDAR = new TypeAdapter<Calendar>() {
-        private static final String YEAR = "year";
-        private static final String MONTH = "month";
-        private static final String DAY_OF_MONTH = "dayOfMonth";
-        private static final String HOUR_OF_DAY = "hourOfDay";
-        private static final String MINUTE = "minute";
-        private static final String SECOND = "second";
-
-        @Override
-        public Calendar read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            in.beginObject();
-            int year = 0;
-            int month = 0;
-            int dayOfMonth = 0;
-            int hourOfDay = 0;
-            int minute = 0;
-            int second = 0;
-            while (in.peek() != JsonToken.END_OBJECT) {
-                String name = in.nextName();
-                int value = in.nextInt();
-                if (YEAR.equals(name)) {
-                    year = value;
-                } else if (MONTH.equals(name)) {
-                    month = value;
-                } else if (DAY_OF_MONTH.equals(name)) {
-                    dayOfMonth = value;
-                } else if (HOUR_OF_DAY.equals(name)) {
-                    hourOfDay = value;
-                } else if (MINUTE.equals(name)) {
-                    minute = value;
-                } else if (SECOND.equals(name)) {
-                    second = value;
-                }
-            }
-            in.endObject();
-            return new GregorianCalendar(year, month, dayOfMonth, hourOfDay, minute, second);
-        }
-
-        @Override
-        public void write(JsonWriter out, Calendar value) throws IOException {
-            if (value == null) {
-                out.nullValue();
-                return;
-            }
-            out.beginObject();
-            out.name(YEAR);
-            out.value(value.get(Calendar.YEAR));
-            out.name(MONTH);
-            out.value(value.get(Calendar.MONTH));
-            out.name(DAY_OF_MONTH);
-            out.value(value.get(Calendar.DAY_OF_MONTH));
-            out.name(HOUR_OF_DAY);
-            out.value(value.get(Calendar.HOUR_OF_DAY));
-            out.name(MINUTE);
-            out.value(value.get(Calendar.MINUTE));
-            out.name(SECOND);
-            out.value(value.get(Calendar.SECOND));
-            out.endObject();
-        }
-    };
-
-    public static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter<JsonElement>() {
-        @Override
-        public JsonElement read(JsonReader in) throws IOException {
-            switch (in.peek()) {
-                case STRING:
-                    return new JsonPrimitive(in.nextString());
-                case NUMBER:
-                    String number = in.nextString();
-                    return new JsonPrimitive(new LazilyParsedNumber(number));
-                case BOOLEAN:
-                    return new JsonPrimitive(in.nextBoolean());
-                case NULL:
-                    in.nextNull();
-                    return JsonNull.INSTANCE;
-                case BEGIN_ARRAY:
-                    JsonArray array = new JsonArray();
-                    in.beginArray();
-                    while (in.hasNext()) {
-                        array.add(read(in));
-                    }
-                    in.endArray();
-                    return array;
-                case BEGIN_OBJECT:
-                    JsonObject object = new JsonObject();
-                    in.beginObject();
-                    while (in.hasNext()) {
-                        object.add(in.nextName(), read(in));
-                    }
-                    in.endObject();
-                    return object;
-                case END_DOCUMENT:
-                case NAME:
-                case END_OBJECT:
-                case END_ARRAY:
-                default:
-                    throw new IllegalArgumentException();
-            }
-        }
-
-        @Override
-        public void write(JsonWriter out, JsonElement value) throws IOException {
-            if (value == null || value.isJsonNull()) {
-                out.nullValue();
-            } else if (value.isJsonPrimitive()) {
-                JsonPrimitive primitive = value.getAsJsonPrimitive();
-                if (primitive.isNumber()) {
-                    out.value(primitive.getAsNumber());
-                } else if (primitive.isBoolean()) {
-                    out.value(primitive.getAsBoolean());
-                } else {
-                    out.value(primitive.getAsString());
-                }
-
-            } else if (value.isJsonArray()) {
-                out.beginArray();
-                for (JsonElement e : value.getAsJsonArray()) {
-                    write(out, e);
-                }
-                out.endArray();
-
-            } else if (value.isJsonObject()) {
-                out.beginObject();
-                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
-                    out.name(e.getKey());
-                    write(out, e.getValue());
-                }
-                out.endObject();
-
-            } else {
-                throw new IllegalArgumentException("Couldn't write " + value.getClass());
-            }
-        }
-    };
-
     interface KnownTypeInstantiater<T> {
         T instantiate();
     }

From 2d265d8d434c830e9f871b9c09fed6af0121a82d Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Tue, 20 Dec 2016 23:03:33 +0530
Subject: [PATCH 033/159] using internal typeadapters from gson

---
 .../utils/KnownTypeAdapterUtils.java          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index f35032c3..b8ef19a2 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -28,8 +28,8 @@ public class KnownTypeAdapterUtils {
     private static final HashMap<String, String> mKnownTypeAdapters = new HashMap<>();
 
     static {
-        mKnownTypeAdapters.put(BitSet.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIT_SET");
-        mKnownTypeAdapters.put(Boolean.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BOOLEAN");
+        mKnownTypeAdapters.put(BitSet.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIT_SET");
+        mKnownTypeAdapters.put(Boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
         mKnownTypeAdapters.put(byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
         mKnownTypeAdapters.put(short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
         mKnownTypeAdapters.put(Integer.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
@@ -40,14 +40,14 @@ public class KnownTypeAdapterUtils {
         mKnownTypeAdapters.put(float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
         mKnownTypeAdapters.put(Double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
         mKnownTypeAdapters.put(double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
-        mKnownTypeAdapters.put(Number.class.getName(), "com.vimeo.stag.KnownTypeAdapters.NUMBER");
-        mKnownTypeAdapters.put(Character.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CHARACTER");
-        mKnownTypeAdapters.put(char.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CHARACTER");
-        mKnownTypeAdapters.put(String.class.getName(), "com.vimeo.stag.KnownTypeAdapters.STRING");
-        mKnownTypeAdapters.put(BigDecimal.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIG_DECIMAL");
-        mKnownTypeAdapters.put(BigInteger.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BIG_INTEGER");
-        mKnownTypeAdapters.put(Calendar.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CALENDAR");
-        mKnownTypeAdapters.put(JsonElement.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_ELEMENT");
+        mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
+        mKnownTypeAdapters.put(Character.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
+        mKnownTypeAdapters.put(char.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
+        mKnownTypeAdapters.put(String.class.getName(), "com.google.gson.internal.bind.TypeAdapters.STRING");
+        mKnownTypeAdapters.put(BigDecimal.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_DECIMAL");
+        mKnownTypeAdapters.put(BigInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_INTEGER");
+        mKnownTypeAdapters.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
+        mKnownTypeAdapters.put(JsonElement.class.getName(), "com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT");
     }
 
     @Nullable

From e26fca8cff490dcc091365055a66d8a0907440d5 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 20 Dec 2016 23:22:29 +0530
Subject: [PATCH 034/159] Adding more known types

---
 .../processor/utils/KnownTypeAdapterUtils.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index b8ef19a2..14bd87e9 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -1,6 +1,9 @@
 package com.vimeo.stag.processor.utils;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.vimeo.stag.KnownTypeAdapters;
 
 import org.jetbrains.annotations.NotNull;
@@ -13,11 +16,15 @@
 import java.util.BitSet;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Currency;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicIntegerArray;
 
 import javax.lang.model.type.TypeMirror;
 
@@ -30,7 +37,10 @@ public class KnownTypeAdapterUtils {
     static {
         mKnownTypeAdapters.put(BitSet.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIT_SET");
         mKnownTypeAdapters.put(Boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
+        mKnownTypeAdapters.put(boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
+        mKnownTypeAdapters.put(Byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
         mKnownTypeAdapters.put(byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
+        mKnownTypeAdapters.put(Short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
         mKnownTypeAdapters.put(short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
         mKnownTypeAdapters.put(Integer.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
         mKnownTypeAdapters.put(int.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
@@ -46,7 +56,12 @@ public class KnownTypeAdapterUtils {
         mKnownTypeAdapters.put(String.class.getName(), "com.google.gson.internal.bind.TypeAdapters.STRING");
         mKnownTypeAdapters.put(BigDecimal.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_DECIMAL");
         mKnownTypeAdapters.put(BigInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_INTEGER");
+        mKnownTypeAdapters.put(AtomicBoolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_BOOLEAN");
+        mKnownTypeAdapters.put(AtomicInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER");
+        mKnownTypeAdapters.put(AtomicIntegerArray.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER_ARRAY");
+        mKnownTypeAdapters.put(Currency.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CURRENCY");
         mKnownTypeAdapters.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
+        mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
         mKnownTypeAdapters.put(JsonElement.class.getName(), "com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT");
     }
 

From 5ea5a02a7cfe356bc10c57b652ade7c58e678533 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Wed, 21 Dec 2016 00:05:06 +0530
Subject: [PATCH 035/159] use adapterName from KnownTypeAdapters

---
 .../generators/TypeAdapterGenerator.java        | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 017913be..7684dcac 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -275,21 +275,8 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
     private static String getReadType(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
                                       @NotNull AdapterFieldInfo adapterFieldInfo) {
         String typeString = type.toString();
-        if (typeString.equals(long.class.getName()) || typeString.equals(Long.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.LONG.read(reader)";
-        } else if (typeString.equals(double.class.getName()) || typeString.equals(Double.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.DOUBLE.read(reader)";
-        } else if (typeString.equals(boolean.class.getName()) || typeString.equals(Boolean.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.BOOLEAN.read(reader)";
-        } else if (typeString.equals(String.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.STRING.read(reader)";
-        } else if (typeString.equals(int.class.getName()) || typeString.equals(Integer.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.INTEGER.read(reader)";
-        } else if (typeString.equals(float.class.getName()) || typeString.equals(Float.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.FLOAT.read(reader)";
-        } else {
-            return getAdapterRead(parentType, type, adapterFieldInfo);
-        }
+        String adapterName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeString);
+        return null == adapterName ? getAdapterRead(parentType, type, adapterFieldInfo) : adapterName + ".read(reader)";
     }
 
     @NotNull

From 4a58d7442efce1e6eb11685fecb9901241fbdd52 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 21 Dec 2016 01:18:40 +0530
Subject: [PATCH 036/159] Adding code where everything would be written or read
 using adapters

---
 .../sample/model/PrimitiveTypesExample.java   |  25 +++
 .../vimeo/sample/model/RecursiveClass.java    |   2 +
 .../processor/generators/StagGenerator.java   |   6 +
 .../generators/TypeAdapterGenerator.java      | 193 ++++++++++--------
 .../com/vimeo/stag/KnownTypeAdapters.java     | 184 +++++++++++++----
 5 files changed, 294 insertions(+), 116 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
new file mode 100644
index 00000000..1819186a
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
@@ -0,0 +1,25 @@
+package com.vimeo.sample.model;
+
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class PrimitiveTypesExample {
+
+    @SerializedName("simpleInt")
+    public int simpleInt;
+
+    @SerializedName("simpleFlot")
+    public float simpleFlot;
+
+
+    @SerializedName("simpleShort")
+    public short simpleShort;
+
+    @SerializedName("simpleLong")
+    public long simpleLong;
+
+    @SerializedName("simpleDouble")
+    public double simpleDouble;
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
index 2ee5d30b..e7c1b6a1 100644
--- a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
@@ -57,4 +57,6 @@ public class RecursiveClass {
 
     @SerializedName("innerSum")
     public RecursiveClass innerSum;
+
+
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 554b0411..7dd20722 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -73,6 +73,10 @@ public class StagGenerator {
     @NotNull
     private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
 
+
+    @NotNull
+    private final HashMap<String, String> mArrayTypeAdapter = new HashMap<>();
+
     @NotNull
     private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
 
@@ -347,6 +351,8 @@ String addFieldType(@NotNull TypeMirror fieldType) {
         return result;
     }
 
+
+
     @Nullable
     private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
         List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 017913be..dba252d8 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -33,6 +33,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import com.sun.org.apache.regexp.internal.RE;
 import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
@@ -127,7 +128,10 @@ static boolean isSupportedPrimitive(@NotNull String type) {
                 || type.equals(double.class.getName())
                 || type.equals(boolean.class.getName())
                 || type.equals(float.class.getName())
-                || type.equals(int.class.getName());
+                || type.equals(int.class.getName())
+                || type.equals(char.class.getName())
+                || type.equals(short.class.getName())
+                || type.equals(byte.class.getName());
     }
 
     private static boolean isNativeArray(@NotNull TypeMirror type) {
@@ -275,21 +279,10 @@ private static String getReadCode(@NotNull String prefix, @NotNull String variab
     private static String getReadType(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
                                       @NotNull AdapterFieldInfo adapterFieldInfo) {
         String typeString = type.toString();
-        if (typeString.equals(long.class.getName()) || typeString.equals(Long.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.LONG.read(reader)";
-        } else if (typeString.equals(double.class.getName()) || typeString.equals(Double.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.DOUBLE.read(reader)";
-        } else if (typeString.equals(boolean.class.getName()) || typeString.equals(Boolean.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.BOOLEAN.read(reader)";
-        } else if (typeString.equals(String.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.STRING.read(reader)";
-        } else if (typeString.equals(int.class.getName()) || typeString.equals(Integer.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.INTEGER.read(reader)";
-        } else if (typeString.equals(float.class.getName()) || typeString.equals(Float.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.FLOAT.read(reader)";
-        } else {
-            return getAdapterRead(parentType, type, adapterFieldInfo);
-        }
+        String adapterAccessor = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeString);
+        return (null != adapterAccessor)
+                ? adapterAccessor + ".read(reader)"
+                : getAdapterRead(parentType, type, adapterFieldInfo);
     }
 
     @NotNull
@@ -341,15 +334,18 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
         for (Map.Entry<Element, TypeMirror> element : elements.entrySet()) {
             String name = getJsonName(element.getKey());
             final String variableName = element.getKey().getSimpleName().toString();
+            final TypeMirror elementValue = element.getValue();
 
             builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                    getReadCode("\t\t\t\t", variableName, element.getValue(), adapterFieldInfo));
+                    "\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapter(elementValue) + ".read(reader);");
 
             builder.addCode("\n\t\t\t\tbreak;\n");
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
                 @Override
                 public void run() {
-                    nonNullFields.add(variableName);
+                    if(!isSupportedPrimitive(elementValue.toString())) {
+                        nonNullFields.add(variableName);
+                    }
                 }
             });
         }
@@ -390,6 +386,47 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
+    private String getAdapterAccessor(@NotNull TypeMirror fieldType,
+                                      @NotNull TypeSpec.Builder adapterBuilder,
+                                      @NotNull MethodSpec.Builder constructorBuilder,
+                                      @NotNull Map<Element, TypeMirror> memberVariables,
+                                      @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                      @NotNull Map<TypeVariable, String> typeVarsMap,
+                                      @NotNull StagGenerator stagGenerator,
+                                      @NotNull AdapterFieldInfo adapterFieldInfo) {
+        String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
+        if (null != knownTypeAdapter) {
+            return knownTypeAdapter;
+        } else {
+            String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
+            if(null != getterField) {
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
+                /*
+                 * If we already have the adapter generated for the fieldType in Stag.Factory class
+                 */
+                return "mStagFactory.get" + getterField + "(mGson)";
+            } else if (TypeUtils.isConcreteType(fieldType)) {
+                getterField = stagGenerator.addFieldType(fieldType);
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
+                return "mStagFactory.get" + getterField + "(mGson)";
+            } else {
+                String fieldName = adapterFieldInfo.getFieldName(fieldType);
+                if (null == fieldName) {
+                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+                    adapterFieldInfo.addField(fieldType, fieldName);
+                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                    TypeName typeName = getAdapterFieldTypeName(fieldType);
+                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                    constructorBuilder.addStatement(
+                            fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                }
+                return fieldName;
+            }
+        }
+    }
+
     @NotNull
     private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
                                               @NotNull MethodSpec.Builder constructorBuilder,
@@ -403,54 +440,48 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
         HashSet<TypeMirror> exclusiveTypeSet = new HashSet<>();
 
         for (TypeMirror fieldType : typeSet) {
-            if (isSupportedNative(fieldType.toString())) {
-                continue;
-            }
             if (isArray(fieldType)) {
-                fieldType = getArrayInnerType(fieldType);
-                if (isSupportedNative(fieldType.toString())) {
-                    continue;
-                }
+                exclusiveTypeSet.add(getArrayInnerType(fieldType));
             } else if (isMap(fieldType) && fieldType instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) fieldType).getTypeArguments();
-                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    fieldType = typeArguments.get(1);
-                    if (isSupportedNative(fieldType.toString())) {
-                        continue;
-                    }
+                if (typeArguments.size() == 2) {
+                    exclusiveTypeSet.add(typeArguments.get(0));
+                    exclusiveTypeSet.add(typeArguments.get(1));
+                } else {
+                    exclusiveTypeSet.add(fieldType);
                 }
+            } else {
+                exclusiveTypeSet.add(fieldType);
             }
-            exclusiveTypeSet.add(fieldType);
         }
 
         for (TypeMirror fieldType : exclusiveTypeSet) {
-            String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
-            if (null != getterField) {
+            String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
+            if (null != knownTypeAdapter) {
+                result.addTypeToAdapterAccessor(fieldType.toString(),
+                        knownTypeAdapter);
+            } else  {
+                String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
+                if(null != getterField) {
+
                 /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
-                result.addTypeToFunctionName(fieldType.toString(),
-                        "mStagFactory.get" + getterField + "(mGson)");
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-            } else if (TypeUtils.isConcreteType(fieldType)) {
-                getterField = stagGenerator.addFieldType(fieldType);
-                result.addTypeToFunctionName(fieldType.toString(),
-                        "mStagFactory.get" + getterField + "(mGson)");
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-            } else {
-                String fieldName = result.getFieldName(fieldType);
-                if (null == fieldName) {
-                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
-                    result.addField(fieldType, fieldName);
-                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                    TypeName typeName = getAdapterFieldTypeName(fieldType);
-                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(
-                            fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                    result.addTypeToAdapterAccessor(fieldType.toString(),
+                            "mStagFactory.get" + getterField + "(mGson)");
+                    mGsonVariableUsed = true;
+                    mStagFactoryUsed = true;
+                } else if (TypeUtils.isConcreteType(fieldType)) {
+                    getterField = stagGenerator.addFieldType(fieldType);
+                    result.addTypeToAdapterAccessor(fieldType.toString(),
+                            "mStagFactory.get" + getterField + "(mGson)");
+                    mGsonVariableUsed = true;
+                    mStagFactoryUsed = true;
+                } else {
+
                 }
             }
+
         }
 
         return result;
@@ -468,11 +499,11 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
                 .addAnnotation(Override.class)
                 .addException(IOException.class);
 
-        builder.addCode("\twriter.beginObject();\n" +
-                "\tif (object == null) {\n" +
-                "\t\twriter.endObject();\n" +
-                "\t\treturn;\n" +
-                "\t}\n");
+        builder.addStatement("writer.beginObject()");
+        builder.beginControlFlow("if (object == null)");
+        builder.addStatement("writer.endObject()");
+        builder.addStatement("return");
+        builder.endControlFlow();
 
         for (Map.Entry<Element, TypeMirror> element : memberVariables.entrySet()) {
             String name = getJsonName(element.getKey());
@@ -481,32 +512,35 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
 
             boolean isPrimitive = isSupportedPrimitive(variableType);
 
-            String prefix = isPrimitive ? "\t" : "\t\t";
+            builder.addCode("\n");
             if (!isPrimitive) {
-                builder.addCode("\tif (object." + variableName + " != null) {\n");
+                builder.beginControlFlow("if (object." + variableName + " != null) ");
             }
-            builder.addCode(getWriteCode(element.getKey(), prefix, element.getValue(), name, "object." + variableName,
-                    adapterFieldInfo));
+
+            builder.addStatement("writer.name(\""+ name + "\")");
             if (!isPrimitive) {
-                builder.addCode("\t}\n");
-            }
+                builder.addStatement(adapterFieldInfo.getAdapter(element.getValue()) + ".write(writer, object." + variableName + ")");
+                /*
+                * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+                */
+                runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
+                    @Override
+                    public void run() {
+                        builder.endControlFlow();
+                        builder.beginControlFlow("else if (object." + variableName + " == null)");
+                        builder.addStatement("throw new java.io.IOException(\"" + variableName +
+                                " cannot be null\")");
+                    }
+                });
 
-            /*
-             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
-             */
-            runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
-                @Override
-                public void run() {
-                    builder.addCode("\n\telse if (object." + variableName + " == null) {");
-                    builder.addCode("\n\t\tthrow new java.io.IOException(\"" + variableName +
-                            " cannot be null\");");
-                    builder.addCode("\n\t}\n\n");
-                }
-            });
+                builder.endControlFlow();
+            } else {
+                builder.addStatement("writer.value(object." +  variableName + ")");
+            }
         }
 
-        builder.addCode("\twriter.endObject();\n");
-
+        builder.addCode("\n");
+        builder.addStatement("writer.endObject()");
         return builder.build();
     }
 
@@ -543,7 +577,6 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
 
         int idx = 0;
         if (null != typeArguments) {
-
             for (TypeMirror innerTypeMirror : typeArguments) {
                 if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
                     TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
@@ -674,7 +707,7 @@ String getKnownAdapterStagFunctionCalls(@NotNull TypeMirror typeMirror) {
         /**
          * Add the getter method name against a field name
          */
-        void addTypeToFunctionName(@NotNull String name, @NotNull String functionName) {
+        void addTypeToAdapterAccessor(@NotNull String name, @NotNull String functionName) {
             if (null == mKnownAdapterStagFunctionCalls) {
                 mKnownAdapterStagFunctionCalls = new HashMap<>();
             }
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index efaf5ca8..7db5d727 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -1,30 +1,21 @@
 package com.vimeo.stag;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.JsonReaderInternalAccess;
-import com.google.gson.internal.LazilyParsedNumber;
 import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -33,6 +24,130 @@
 
 public class KnownTypeAdapters {
 
+    public static final class ArrayTypeAdapter<T extends Object> extends TypeAdapter<T[]> {
+        TypeAdapter<T> mValueTypeAdapter;
+        ObjectConstructor<T[]> mObjectCreator;
+
+        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, ObjectConstructor<T[]> instanceCreator) {
+            this.mValueTypeAdapter = valueTypeAdapter;
+            this.mObjectCreator = instanceCreator;
+        }
+
+        @Override
+        public void write(JsonWriter writer, T[] value) throws IOException {
+            writer.beginArray();
+            for (T item : value) {
+                mValueTypeAdapter.write(writer, item);
+            }
+            writer.endArray();
+        }
+
+        @Override
+        public T[] read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            ArrayList<T> object = new ArrayList<>();
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        object.add(mValueTypeAdapter.read(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+
+            T[] result = this.mObjectCreator.construct();
+            return object.toArray(result);
+        }
+
+    }
+
+    public static final class PrimitiveArrayTypeAdapter<T extends Object, V> extends TypeAdapter<V[]> {
+
+        public interface PrimitiveArrayInitializer<K> {
+            K[] construct(int size);
+        }
+
+        TypeAdapter<T> mValueTypeAdapter;
+        PrimitiveArrayInitializer<V> mArrayCreator;
+
+        public PrimitiveArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayInitializer<V> instanceCreator) {
+            this.mValueTypeAdapter = valueTypeAdapter;
+            this.mArrayCreator = instanceCreator;
+        }
+
+        @Override
+        public void write(JsonWriter writer, V[] value) throws IOException {
+            writer.beginArray();
+            for (V item : value) {
+                mValueTypeAdapter.write(writer, (T)item);
+            }
+            writer.endArray();
+        }
+
+        @Override
+        public V[] read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            ArrayList<T> object = new ArrayList<>();
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        object.add(mValueTypeAdapter.read(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+
+            V[] result = this.mArrayCreator.construct(object.size());
+            for(int idx = 0; idx < result.length; idx++) {
+                result[idx] = (V)object.get(idx);
+            }
+            return object.toArray(result);
+        }
+
+    }
+
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
         @Override
         public Byte read(JsonReader in) throws IOException {
@@ -146,62 +261,59 @@ public void write(JsonWriter out, Double value) throws IOException {
         }
     };
 
-    interface KnownTypeInstantiater<T> {
-        T instantiate();
-    }
-
-    public static class ListInstantiater<V> implements KnownTypeInstantiater<List<V>> {
+    
+    public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
 
         @Override
-        public List<V> instantiate() {
+        public List<V> construct() {
             return new ArrayList<V>();
         }
     }
 
-    public static class CollectionInstantiater<V> implements KnownTypeInstantiater<Collection<V>> {
+    public static class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
 
         @Override
-        public Collection<V> instantiate() {
+        public Collection<V> construct() {
             return new ArrayList<V>();
         }
     }
 
-    public static class ArrayListInstantiater<V> implements KnownTypeInstantiater<ArrayList<V>> {
+    public static class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
 
         @Override
-        public ArrayList<V> instantiate() {
+        public ArrayList<V> construct() {
             return new ArrayList<V>();
         }
     }
 
-    public static class HashMapInstantiater<K, V> implements KnownTypeInstantiater<HashMap<K, V>> {
+    public static class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
 
         @Override
-        public HashMap<K, V> instantiate() {
+        public HashMap<K, V> construct() {
             return new HashMap<K, V>();
         }
     }
 
-    public static class ConcurrentHashMapInstantiater<K, V> implements KnownTypeInstantiater<ConcurrentHashMap<K, V>> {
+    public static class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
 
         @Override
-        public ConcurrentHashMap<K, V> instantiate() {
+        public ConcurrentHashMap<K, V> construct() {
             return new ConcurrentHashMap<K, V>();
         }
     }
 
-    public static class LinkedHashMapInstantiater<K, V> implements KnownTypeInstantiater<LinkedHashMap<K, V>> {
+    public static class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
 
         @Override
-        public LinkedHashMap<K, V> instantiate() {
+        public LinkedHashMap<K, V> construct() {
             return new LinkedHashMap<K, V>();
         }
     }
 
-    public static class MapInstantiater<K, V> implements KnownTypeInstantiater<Map<K, V>> {
+    public static class MapInstantiater<K, V> implements ObjectConstructor<Map<K, V>> {
 
         @Override
-        public Map<K, V> instantiate() {
+        public Map<K, V> construct() {
             return new LinkedHashMap<K, V>();
         }
     }
@@ -209,11 +321,11 @@ public Map<K, V> instantiate() {
     public static class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
 
         private TypeAdapter<V> valueTypeAdapter;
-        private KnownTypeInstantiater<T> instantiator;
+        private ObjectConstructor<T> objectConstructor;
 
-        public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<T> instantiator) {
+        public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> objectConstructor) {
             this.valueTypeAdapter = valueTypeAdapter;
-            this.instantiator = instantiator;
+            this.objectConstructor = objectConstructor;
         }
 
         @Override
@@ -237,7 +349,7 @@ public T read(JsonReader reader) throws IOException {
             }
             reader.beginObject();
 
-            T object = instantiator.instantiate();
+            T object = objectConstructor.construct();
 
             while (reader.hasNext()) {
                 com.google.gson.stream.JsonToken jsonToken = reader.peek();
@@ -264,14 +376,14 @@ public T read(JsonReader reader) throws IOException {
 
     public static class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
 
-        private KnownTypeInstantiater<T> instantiater;
+        private ObjectConstructor<T> objectConstructor;
         private TypeAdapter<V> valueTypeAdapter;
         private TypeAdapter<K> keyTypeAdapter;
 
-        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, KnownTypeInstantiater<T> instantiater) {
+        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> objectConstructor) {
             this.keyTypeAdapter = keyTypeAdapter;
             this.valueTypeAdapter = valueTypeAdapter;
-            this.instantiater = instantiater;
+            this.objectConstructor = objectConstructor;
         }
 
         @Override
@@ -315,7 +427,7 @@ public T read(JsonReader in) throws IOException {
                 return null;
             }
 
-            T map = instantiater.instantiate();
+            T map = objectConstructor.construct();
 
             if (peek == JsonToken.BEGIN_ARRAY) {
                 in.beginArray();

From 7c47a42e543671a434a53ae6c6a7d5ab164552c3 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 21 Dec 2016 14:34:21 +0530
Subject: [PATCH 037/159] Adding code for handling the accessor code in a
 recursive fashion if required

---
 .../generators/TypeAdapterGenerator.java      | 240 ++++++------------
 .../com/vimeo/stag/KnownTypeAdapters.java     |   1 -
 2 files changed, 74 insertions(+), 167 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 74f1e895..ada1d04d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -33,7 +33,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
-import com.sun.org.apache.regexp.internal.RE;
+import com.sun.org.apache.bcel.internal.generic.Type;
 import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
@@ -63,6 +63,8 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
+import sun.reflect.generics.tree.TypeArgument;
+
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
@@ -151,6 +153,8 @@ static boolean isArray(@Nullable TypeMirror type) {
                 outerClassType.equals(Collection.class.getName());
     }
 
+
+
     static boolean isMap(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -220,80 +224,8 @@ private static String getArrayListType(@NotNull TypeMirror innerArrayType) {
         }
     }
 
-    @NotNull
-    private static String getReadCode(@NotNull String prefix, @NotNull String variableName,
-                                      @NotNull TypeMirror type, @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isNativeArray(type)) {
-            TypeMirror innerType = getArrayInnerType(type);
-            String innerRead = getReadType(type, innerType, adapterFieldInfo);
-            String arrayListVariableName = "tmp" + variableName;
-            String stagGetterName = adapterFieldInfo.getKnownAdapterStagFunctionCalls(innerType);
-            String result = prefix + "reader.beginArray();\n" +
-                    prefix + "java.util.ArrayList<" + getArrayListType(innerType) + "> " + arrayListVariableName + " = new java.util.ArrayList<>();\n" +
-                    (stagGetterName != null ? prefix + "TypeAdapter<" + innerType + "> adapter = " + stagGetterName + ";\n" : "") +
-                    prefix + "while (reader.hasNext()) {\n" +
-                    prefix + "\t" + arrayListVariableName + ".add(" + innerRead + ");\n" +
-                    prefix + "}\n" +
-                    prefix + "reader.endArray();\n";
-
-            result += prefix + "object." + variableName + "= new " + innerType.toString() + "[" + arrayListVariableName + ".size()];\n";
-            result += prefix + "for(int idx = 0; idx < " + arrayListVariableName + ".size(); idx++) {\n";
-            result += prefix + "\tobject." + variableName + "[idx] = " + arrayListVariableName + ".get(idx);\n";
-            result += prefix + "}\n";
-
-            return result;
-        } else if (isArray(type)) {
-            TypeMirror innerType = getArrayInnerType(type);
-            String adapter = adapterFieldInfo.getAdapter(innerType);
-            if (isSupportedNative(innerType.toString())) {
-                mStagFactoryUsed = true;
-                adapter = "" + KnownTypeAdapterUtils.getKnownTypeAdapterForType(innerType.toString());
-            }
-
-            String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
-            return prefix + "object." + variableName + " = new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + innerType + "," + type + ">(" + adapter + ", new " + listInstantiater + "()).read(reader);";
-        } else {
-            if (isMap(type) && type instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
-                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    TypeMirror valueTypeMirror = typeArguments.get(1);
-
-                    mStagFactoryUsed = true;
-                    String keyAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(0).toString());
-                    String valueAdapter = adapterFieldInfo.getAdapter(valueTypeMirror);
-
-                    if (valueAdapter == null || isSupportedNative(valueAdapter)) {
-                        valueAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(1).toString());
-                    }
-
-                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
-                    return prefix + "object." + variableName + " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + typeArguments.get(0) + "," + typeArguments.get(1) + "," + type + ">(" + keyAdapter + ", " + valueAdapter + ", new " + mapInstantiater + "()).read(reader);";
-                }
-            }
-            return prefix + "object." + variableName + " = " +
-                    getReadType(type, type, adapterFieldInfo) + ";";
-        }
-    }
 
-    @NotNull
-    private static String getReadType(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
-                                      @NotNull AdapterFieldInfo adapterFieldInfo) {
-        String typeString = type.toString();
-        String adapterName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeString);
-        return null == adapterName ? getAdapterRead(parentType, type, adapterFieldInfo) : adapterName + ".read(reader)";
-    }
 
-    @NotNull
-    private static String getAdapterRead(@NotNull TypeMirror parentType, @NotNull TypeMirror type,
-                                         @NotNull AdapterFieldInfo adapterFieldInfo) {
-        String adapterCode;
-        if (adapterFieldInfo.getKnownAdapterStagFunctionCalls(type) != null && isArray(parentType)) {
-            adapterCode = "adapter.read(reader)";
-        } else {
-            adapterCode = adapterFieldInfo.getAdapter(type) + ".read(reader)";
-        }
-        return adapterCode;
-    }
 
     @NotNull
     private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
@@ -335,7 +267,7 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
             final TypeMirror elementValue = element.getValue();
 
             builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                    "\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapter(elementValue) + ".read(reader);");
+                    "\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapterAccessor(elementValue) + ".read(reader);");
 
             builder.addCode("\n\t\t\t\tbreak;\n");
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
@@ -395,7 +327,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType,
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
         if (null != knownTypeAdapter) {
             return knownTypeAdapter;
-        } else {
+        } else if(TypeUtils.isConcreteType(fieldType)){
             String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
             if(null != getterField) {
                 mGsonVariableUsed = true;
@@ -404,25 +336,59 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType,
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
                 return "mStagFactory.get" + getterField + "(mGson)";
-            } else if (TypeUtils.isConcreteType(fieldType)) {
+            } else if(isNativeArray(fieldType)) {
+                return "null";
+            } else if(fieldType instanceof DeclaredType) {
+                DeclaredType declaredType = (DeclaredType)fieldType;
+                if(isArray(fieldType) && declaredType.getTypeArguments().size() == 1) {
+                    TypeMirror param = declaredType.getTypeArguments().get(0);
+                    String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
+                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String accessor =  "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + "> (" + paramAdapterAccessor + ", null)";
+                    return accessor;
+                } else if(isMap(fieldType) && declaredType.getTypeArguments().size() == 2) {
+                    TypeMirror keyType = declaredType.getTypeArguments().get(0);
+                    TypeMirror valueType = declaredType.getTypeArguments().get(1);
+                    String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
+                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
+                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String accessor =  "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + "> (" + keyAdapterAccessor +", " + valueAdapterAccessor + ", null)";
+                    return accessor;
+                } else {
+                    mGsonVariableUsed = true;
+                    mStagFactoryUsed = true;
+                    StringBuilder paramsBuilder = new StringBuilder();
+                    paramsBuilder.append("mGson");
+                    for(TypeMirror argument : declaredType.getTypeArguments()) {
+                        String argumentAccessor = getAdapterAccessor(argument, adapterBuilder, constructorBuilder,
+                                memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                        paramsBuilder.append(", " + argumentAccessor);
+                    }
+
+                    System.out.println("Accessor  : " + fieldType.toString() + "     --- " + paramsBuilder.toString());
+                    return "null";
+                }
+            } else{
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 return "mStagFactory.get" + getterField + "(mGson)";
-            } else {
-                String fieldName = adapterFieldInfo.getFieldName(fieldType);
-                if (null == fieldName) {
-                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
-                    adapterFieldInfo.addField(fieldType, fieldName);
-                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                    TypeName typeName = getAdapterFieldTypeName(fieldType);
-                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(
-                            fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
-                }
-                return fieldName;
             }
+        } else {
+            String fieldName = adapterFieldInfo.getFieldName(fieldType);
+            if (null == fieldName) {
+                fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+                adapterFieldInfo.addField(fieldType, fieldName);
+                String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                TypeName typeName = getAdapterFieldTypeName(fieldType);
+                adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                constructorBuilder.addStatement(
+                        fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+            }
+            return fieldName;
         }
+
     }
 
     @NotNull
@@ -435,53 +401,13 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
-        HashSet<TypeMirror> exclusiveTypeSet = new HashSet<>();
 
         for (TypeMirror fieldType : typeSet) {
-            if (isArray(fieldType)) {
-                exclusiveTypeSet.add(getArrayInnerType(fieldType));
-            } else if (isMap(fieldType) && fieldType instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) fieldType).getTypeArguments();
-                if (typeArguments.size() == 2) {
-                    exclusiveTypeSet.add(typeArguments.get(0));
-                    exclusiveTypeSet.add(typeArguments.get(1));
-                } else {
-                    exclusiveTypeSet.add(fieldType);
-                }
-            } else {
-                exclusiveTypeSet.add(fieldType);
-            }
-        }
-
-        for (TypeMirror fieldType : exclusiveTypeSet) {
-            String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
-            if (null != knownTypeAdapter) {
-                result.addTypeToAdapterAccessor(fieldType.toString(),
-                        knownTypeAdapter);
-            } else  {
-                String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
-                if(null != getterField) {
-
-                /*
-                 * If we already have the adapter generated for the fieldType in Stag.Factory class
-                 */
-                    result.addTypeToAdapterAccessor(fieldType.toString(),
-                            "mStagFactory.get" + getterField + "(mGson)");
-                    mGsonVariableUsed = true;
-                    mStagFactoryUsed = true;
-                } else if (TypeUtils.isConcreteType(fieldType)) {
-                    getterField = stagGenerator.addFieldType(fieldType);
-                    result.addTypeToAdapterAccessor(fieldType.toString(),
-                            "mStagFactory.get" + getterField + "(mGson)");
-                    mGsonVariableUsed = true;
-                    mStagFactoryUsed = true;
-                } else {
-
-                }
+            String adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+            if(null != adapterAccessor) {
+                result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
             }
-
         }
-
         return result;
     }
 
@@ -517,7 +443,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
 
             builder.addStatement("writer.name(\""+ name + "\")");
             if (!isPrimitive) {
-                builder.addStatement(adapterFieldInfo.getAdapter(element.getValue()) + ".write(writer, object." + variableName + ")");
+                builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
                 /*
                 * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
                 */
@@ -630,7 +556,7 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
                     prefix + "writer.endArray();\n";
         } else if (isArray(type)) {
             TypeMirror innerType = getArrayInnerType(type);
-            String adapter = adapterFieldInfo.getAdapter(innerType);
+            String adapter = adapterFieldInfo.getAdapterAccessor(innerType);
             if (isSupportedNative(innerType.toString())) {
                 mStagFactoryUsed = true;
                 adapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(innerType.toString());
@@ -646,7 +572,7 @@ private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNu
                     TypeMirror keyTypeMirror = typeArguments.get(0);
                     mStagFactoryUsed = true;
                     String keyAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString());
-                    String valueAdapter = adapterFieldInfo.getAdapter(typeArguments.get(1));
+                    String valueAdapter = adapterFieldInfo.getAdapterAccessor(typeArguments.get(1));
                     if (isSupportedNative(typeArguments.get(1).toString())) {
                         valueAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(1).toString());
                     }
@@ -674,52 +600,30 @@ private String getAdapterWrite(@NotNull Element key, @NotNull TypeMirror type, @
                                    @NotNull AdapterFieldInfo adapterFieldInfo) {
         if (key.getAnnotation(WriteRuntimeType.class) != null) {
             mGsonVariableUsed = true;
-            return "((TypeAdapter) mGson.getAdapter(" + variableName + ".getClass())).write(writer, " + variableName + ")";
+            return "((TypeAdapter) mGson.getAdapterAccessor(" + variableName + ".getClass())).write(writer, " + variableName + ")";
         } else {
-            String adapterField = adapterFieldInfo.getAdapter(type);
+            String adapterField = adapterFieldInfo.getAdapterAccessor(type);
             return adapterField + ".write(writer, " + variableName + ")";
         }
     }
 
     private static class AdapterFieldInfo {
 
+        //Type.toString -> Accessor Map
         @NotNull
-        private final Map<String, String> mAdapterFields;
+        private final Map<String, String> mAdapterAccessor;
 
-        @Nullable
-        private Map<String, String> mKnownAdapterStagFunctionCalls;
+        //Type.toString -> Accessor Map
+        @NotNull
+        private final Map<String, String> mAdapterFields;
 
         AdapterFieldInfo(int capacity) {
             mAdapterFields = new HashMap<>(capacity);
+            mAdapterAccessor = new HashMap<>(capacity);
         }
 
-        /**
-         * Used to get the stag adapter for a typeMirror if it is already generated in Stag.Factory
-         */
-        @Nullable
-        String getKnownAdapterStagFunctionCalls(@NotNull TypeMirror typeMirror) {
-            return mKnownAdapterStagFunctionCalls != null ? mKnownAdapterStagFunctionCalls.get(
-                    typeMirror.toString()) : null;
-        }
-
-        /**
-         * Add the getter method name against a field name
-         */
-        void addTypeToAdapterAccessor(@NotNull String name, @NotNull String functionName) {
-            if (null == mKnownAdapterStagFunctionCalls) {
-                mKnownAdapterStagFunctionCalls = new HashMap<>();
-            }
-            mKnownAdapterStagFunctionCalls.put(name, functionName);
-        }
-
-        String getAdapter(@NotNull TypeMirror typeMirror) {
-            String typeName = typeMirror.toString();
-            String result = null != mKnownAdapterStagFunctionCalls ? mKnownAdapterStagFunctionCalls.get(
-                    typeName) : null;
-            if (null == result) {
-                result = mAdapterFields.get(typeName);
-            }
-            return result;
+        String getAdapterAccessor(@NotNull TypeMirror typeMirror) {
+            return mAdapterAccessor.get(typeMirror.toString());
         }
 
         String getFieldName(@NotNull TypeMirror fieldType) {
@@ -733,5 +637,9 @@ int size() {
         void addField(@NotNull TypeMirror fieldType, @NotNull String fieldName) {
             mAdapterFields.put(fieldType.toString(), fieldName);
         }
+
+        public void addTypeToAdapterAccessor(@NotNull TypeMirror typeMirror, String accessorCode) {
+            mAdapterAccessor.put(typeMirror.toString(), accessorCode);
+        }
     }
 }
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 7db5d727..18622777 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -375,7 +375,6 @@ public T read(JsonReader reader) throws IOException {
     }
 
     public static class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
-
         private ObjectConstructor<T> objectConstructor;
         private TypeAdapter<V> valueTypeAdapter;
         private TypeAdapter<K> keyTypeAdapter;

From 525ae9024ab8b2cc2c2024bed5f9d26ee91c6e77 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 21 Dec 2016 14:42:17 +0530
Subject: [PATCH 038/159] Adding a case that needs to be handled

---
 .../sample/model/ComplexGenericClass.java     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
new file mode 100644
index 00000000..3df8ab81
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
@@ -0,0 +1,44 @@
+/*
+ * The MIT License (MIT)
+ * <p/>
+ * Copyright (c) 2016 Vimeo
+ * <p/>
+ * 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:
+ * <p/>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p/>
+ * 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.
+ */
+package com.vimeo.sample.model;
+
+import android.util.SparseArray;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+import java.util.Map;
+
+@UseStag
+public class ComplexGenericClass<T> {
+
+    @SerializedName("name")
+    public T name;
+
+    @SerializedName("map")
+    public Map<String, Map<String, T>> mapField;
+
+    @SerializedName("sparseArray")
+    public SparseArray<T> sparseArrayField;
+}
\ No newline at end of file

From 10e586383c242070cdc1cfe9a682317b4b55a4e0 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Wed, 21 Dec 2016 20:10:27 +0530
Subject: [PATCH 039/159] added adapters for primitive arrays

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 297 ++++++++++--------
 1 file changed, 167 insertions(+), 130 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 18622777..e7dafefb 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -24,130 +24,6 @@
 
 public class KnownTypeAdapters {
 
-    public static final class ArrayTypeAdapter<T extends Object> extends TypeAdapter<T[]> {
-        TypeAdapter<T> mValueTypeAdapter;
-        ObjectConstructor<T[]> mObjectCreator;
-
-        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, ObjectConstructor<T[]> instanceCreator) {
-            this.mValueTypeAdapter = valueTypeAdapter;
-            this.mObjectCreator = instanceCreator;
-        }
-
-        @Override
-        public void write(JsonWriter writer, T[] value) throws IOException {
-            writer.beginArray();
-            for (T item : value) {
-                mValueTypeAdapter.write(writer, item);
-            }
-            writer.endArray();
-        }
-
-        @Override
-        public T[] read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            ArrayList<T> object = new ArrayList<>();
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        object.add(mValueTypeAdapter.read(reader));
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-
-            T[] result = this.mObjectCreator.construct();
-            return object.toArray(result);
-        }
-
-    }
-
-    public static final class PrimitiveArrayTypeAdapter<T extends Object, V> extends TypeAdapter<V[]> {
-
-        public interface PrimitiveArrayInitializer<K> {
-            K[] construct(int size);
-        }
-
-        TypeAdapter<T> mValueTypeAdapter;
-        PrimitiveArrayInitializer<V> mArrayCreator;
-
-        public PrimitiveArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayInitializer<V> instanceCreator) {
-            this.mValueTypeAdapter = valueTypeAdapter;
-            this.mArrayCreator = instanceCreator;
-        }
-
-        @Override
-        public void write(JsonWriter writer, V[] value) throws IOException {
-            writer.beginArray();
-            for (V item : value) {
-                mValueTypeAdapter.write(writer, (T)item);
-            }
-            writer.endArray();
-        }
-
-        @Override
-        public V[] read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
-                reader.nextNull();
-                return null;
-            }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            ArrayList<T> object = new ArrayList<>();
-
-            while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        object.add(mValueTypeAdapter.read(reader));
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
-            }
-
-            reader.endObject();
-
-            V[] result = this.mArrayCreator.construct(object.size());
-            for(int idx = 0; idx < result.length; idx++) {
-                result[idx] = (V)object.get(idx);
-            }
-            return object.toArray(result);
-        }
-
-    }
-
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
         @Override
         public Byte read(JsonReader in) throws IOException {
@@ -168,7 +44,6 @@ public void write(JsonWriter out, Byte value) throws IOException {
             out.value(value);
         }
     };
-
     public static final TypeAdapter<Short> SHORT = new TypeAdapter<Short>() {
         @Override
         public Short read(JsonReader in) throws IOException {
@@ -188,7 +63,6 @@ public void write(JsonWriter out, Short value) throws IOException {
             out.value(value);
         }
     };
-
     public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
         @Override
         public Integer read(JsonReader in) throws IOException {
@@ -208,7 +82,6 @@ public void write(JsonWriter out, Integer value) throws IOException {
             out.value(value);
         }
     };
-
     public static final TypeAdapter<Long> LONG = new TypeAdapter<Long>() {
         @Override
         public Long read(JsonReader in) throws IOException {
@@ -228,7 +101,6 @@ public void write(JsonWriter out, Long value) throws IOException {
             out.value(value);
         }
     };
-
     public static final TypeAdapter<Float> FLOAT = new TypeAdapter<Float>() {
         @Override
         public Float read(JsonReader in) throws IOException {
@@ -244,7 +116,6 @@ public void write(JsonWriter out, Float value) throws IOException {
             out.value(value);
         }
     };
-
     public static final TypeAdapter<Double> DOUBLE = new TypeAdapter<Double>() {
         @Override
         public Double read(JsonReader in) throws IOException {
@@ -261,7 +132,173 @@ public void write(JsonWriter out, Double value) throws IOException {
         }
     };
 
-    
+    public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(INTEGER, new ArrayListInstantiater<Integer>());
+    public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiater<Long>());
+    public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiater<Double>());
+    public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiater<Short>());
+
+    public static final class ArrayTypeAdapter<T extends Object> extends TypeAdapter<T[]> {
+        TypeAdapter<T> mValueTypeAdapter;
+        ObjectConstructor<T[]> mObjectCreator;
+
+        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, ObjectConstructor<T[]> instanceCreator) {
+            this.mValueTypeAdapter = valueTypeAdapter;
+            this.mObjectCreator = instanceCreator;
+        }
+
+        @Override
+        public void write(JsonWriter writer, T[] value) throws IOException {
+            writer.beginArray();
+            for (T item : value) {
+                mValueTypeAdapter.write(writer, item);
+            }
+            writer.endArray();
+        }
+
+        @Override
+        public T[] read(JsonReader reader) throws IOException {
+            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            }
+            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+                reader.skipValue();
+                return null;
+            }
+            reader.beginObject();
+
+            ArrayList<T> object = new ArrayList<>();
+
+            while (reader.hasNext()) {
+                com.google.gson.stream.JsonToken jsonToken = reader.peek();
+                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
+                    reader.skipValue();
+                    continue;
+                }
+
+                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        object.add(mValueTypeAdapter.read(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+
+            reader.endObject();
+
+            T[] result = this.mObjectCreator.construct();
+            return object.toArray(result);
+        }
+
+    }
+
+    public static final class PrimitiveIntegerArrayAdapter {
+        public static void write(JsonWriter writer, int[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (int item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static int[] read(JsonReader reader) throws IOException {
+            ArrayList<Integer> integerArrayList = INTEGER_ARRAY_LIST_ADAPTER.read(reader);
+            int[] result = null;
+            if (null != integerArrayList) {
+                result = new int[integerArrayList.size()];
+                for (int idx = 0; idx < integerArrayList.size(); idx++) {
+                    result[idx] = integerArrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    public static final class PrimitiveLongArrayAdapter {
+        public static void write(JsonWriter writer, long[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (long item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static long[] read(JsonReader reader) throws IOException {
+            ArrayList<Long> longArrayList = LONG_ARRAY_LIST_ADAPTER.read(reader);
+            long[] result = null;
+            if (null != longArrayList) {
+                result = new long[longArrayList.size()];
+                for (int idx = 0; idx < longArrayList.size(); idx++) {
+                    result[idx] = longArrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    public static final class PrimitiveDoubleArrayAdapter {
+        public static void write(JsonWriter writer, double[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (double item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static double[] read(JsonReader reader) throws IOException {
+            ArrayList<Double> longArrayList = DOUBLE_ARRAY_LIST_ADAPTER.read(reader);
+            double[] result = null;
+            if (null != longArrayList) {
+                result = new double[longArrayList.size()];
+                for (int idx = 0; idx < longArrayList.size(); idx++) {
+                    result[idx] = longArrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    public static final class PrimitiveShortArrayAdapter {
+        public static void write(JsonWriter writer, short[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (short item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static short[] read(JsonReader reader) throws IOException {
+            ArrayList<Short> longArrayList = SHORT_ARRAY_LIST_ADAPTER.read(reader);
+            short[] result = null;
+            if (null != longArrayList) {
+                result = new short[longArrayList.size()];
+                for (int idx = 0; idx < longArrayList.size(); idx++) {
+                    result[idx] = longArrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    public static class StringArrayInstantiater implements ObjectConstructor<String[]> {
+
+        @Override
+        public String[] construct() {
+            return new String[]{};
+        }
+    }
+
     public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
 
         @Override

From 3b228161a8904e3525289877a2b27d5db01a5f2a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Wed, 21 Dec 2016 20:11:06 +0530
Subject: [PATCH 040/159] get typeadapters for primitive types

---
 .../utils/KnownTypeAdapterUtils.java          | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 14bd87e9..0751f148 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -1,9 +1,6 @@
 package com.vimeo.stag.processor.utils;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.vimeo.stag.KnownTypeAdapters;
 
 import org.jetbrains.annotations.NotNull;
@@ -109,4 +106,28 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
             return "com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater";
         }
     }
+
+    @Nullable
+    public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror) {
+        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        if (outerClassType.equals(String.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.StringArrayInstantiater";
+        }
+        return null;
+    }
+
+    @Nullable
+    public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror typeMirror) {
+        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        if (outerClassType.equals(int[].class.getSimpleName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveIntegerArrayAdapter";
+        } else if (outerClassType.equals(long[].class.getSimpleName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveLongArrayAdapter";
+        } else if (outerClassType.equals(double[].class.getSimpleName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveDoubleArrayAdapter";
+        } else if (outerClassType.equals(short[].class.getSimpleName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveShortArrayAdapter";
+        }
+        return null;
+    }
 }
\ No newline at end of file

From c71a589a3f4ff4a223b685627ba3f968bd1c3fd2 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Wed, 21 Dec 2016 20:11:47 +0530
Subject: [PATCH 041/159] corresponding changes in generatores

---
 .../processor/generators/StagGenerator.java   |  99 ++++++-
 .../generators/TypeAdapterGenerator.java      | 251 +++++++-----------
 2 files changed, 182 insertions(+), 168 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 7dd20722..713332f6 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -35,7 +35,9 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
+import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.KnownTypeAdapterUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
@@ -44,20 +46,35 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.processing.Filer;
+import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
 public class StagGenerator {
 
+    public static class GenericClassInfo {
+        public int mNumArguments;
+        public boolean mHasUnknownTypeFields;
+
+        public GenericClassInfo(int numArguments, boolean hasUnknownTypeFields) {
+            mNumArguments = numArguments;
+            mHasUnknownTypeFields = hasUnknownTypeFields;
+        }
+    }
+
     private static final String CLASS_STAG = "Stag";
     private static final String CLASS_TYPE_ADAPTER_FACTORY = "Factory";
 
@@ -73,13 +90,30 @@ public class StagGenerator {
     @NotNull
     private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
 
-
-    @NotNull
-    private final HashMap<String, String> mArrayTypeAdapter = new HashMap<>();
-
     @NotNull
     private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
 
+    //Type.toString() -> NumberOf
+    private final HashMap<String, GenericClassInfo> mGenericClassInfo = new HashMap<>();
+
+
+    //Type.toString() -> NumberOf
+    private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
+    private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
+
+
+    {
+        KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
+        KNOWN_MAP_GENERIC_CLASSES.put(HashMap.class.getName(), new GenericClassInfo(2, false));
+        KNOWN_MAP_GENERIC_CLASSES.put(LinkedHashMap.class.getName(), new GenericClassInfo(2, false));
+        KNOWN_MAP_GENERIC_CLASSES.put(ConcurrentHashMap.class.getName(), new GenericClassInfo(2, false));
+
+        KNOWN_COLLECTION_GENERIC_CLASSES.put(Collection.class.getName(), new GenericClassInfo(1, false));
+        KNOWN_COLLECTION_GENERIC_CLASSES.put(List.class.getName(), new GenericClassInfo(1, false));
+        KNOWN_COLLECTION_GENERIC_CLASSES.put(ArrayList.class.getName(), new GenericClassInfo(1, false));
+
+    }
+
     @NotNull
     private final String mGeneratedPackageName;
 
@@ -89,6 +123,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         mGeneratedPackageName = generatedPackageName;
         mKnownClasses = new ArrayList<>(knownTypes.size());
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
+        Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
             String adapterFactoryMethodName = null;
             ClassInfo classInfo = new ClassInfo(knownType);
@@ -100,14 +135,66 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                             adapterFactoryMethodName + String.valueOf(knownFieldNames.size());
                 }
                 knownFieldNames.add(adapterFactoryMethodName);
+            } else {
+                genericClasses.add(classInfo);
             }
             mKnownClasses.add(classInfo);
             mFieldNameMap.put(knownType.toString(), adapterFactoryMethodName);
         }
 
+
+        for(ClassInfo knownGenericType : genericClasses) {
+            List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
+            AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
+            Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
+            boolean hasUnknownTypeFields = false;
+            for(TypeMirror type : memberVariables.values()) {
+                if(!checkKnownAdapters(type)) {
+                    hasUnknownTypeFields = true;
+                    break;
+                }
+            }
+            mGenericClassInfo.put(knownGenericType.getType().toString(), new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
+        }
+
         KnownTypeAdapterUtils.initialize();
     }
 
+    private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
+        if (typeMirror.getKind() == TypeKind.TYPEVAR) {
+            return true;
+        }
+
+        if(TypeUtils.isConcreteType(typeMirror)) {
+            return true;
+        }
+
+        if (typeMirror instanceof DeclaredType) {
+            DeclaredType declaredType = ((DeclaredType) typeMirror);
+            Element outerClassType = declaredType.asElement();
+            if(!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
+                    !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
+                    !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString())) {
+                return false;
+            }
+
+            List<? extends TypeMirror> typeMirrors = ((DeclaredType) typeMirror).getTypeArguments();
+            for (TypeMirror type : typeMirrors) {
+                if (!checkKnownAdapters(type)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        return mFieldNameMap.get(typeMirror.toString()) != null;
+    }
+
+    @Nullable
+    public GenericClassInfo getGenericClassInfo(@NotNull TypeMirror typeMirror) {
+        return mGenericClassInfo.get(typeMirror.toString());
+    }
+
     @Nullable
     String getClassAdapterFactoryMethod(@NotNull TypeMirror fieldType) {
         return TypeUtils.isConcreteType(fieldType) ? mFieldNameMap.get(fieldType.toString()) : null;
@@ -351,8 +438,6 @@ String addFieldType(@NotNull TypeMirror fieldType) {
         return result;
     }
 
-
-
     @Nullable
     private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
         List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index ada1d04d..7a5099b5 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -33,8 +33,6 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
-import com.sun.org.apache.bcel.internal.generic.Type;
-import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -46,6 +44,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -53,6 +52,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -63,8 +63,6 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
-import sun.reflect.generics.tree.TypeArgument;
-
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
@@ -79,8 +77,7 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
     }
 
     @Nullable
-    private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
-                                           @NotNull Map<TypeVariable, String> typeVarsMap,
+    private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
                                            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
@@ -98,6 +95,10 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
                     if (isSupportedNative(keyTypeMirror.toString())) {
                         if (isMap(valueTypeMirror)) {
+                            /*
+                             * If it is a nested map, cases where the value is also a map, recursively call the function to
+                             * gets its type adapter
+                             */
                             result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
                         } else {
                             result = typeVarsMap.get(valueTypeMirror);
@@ -111,6 +112,10 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                 } else if (isArray(fieldType)) {
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
                     if (isArray(valueTypeMirror)) {
+                        /*
+                         * If it is a nested list, cases where the value is also a List, recursively call the function to
+                         * gets its type adapter
+                         */
                         result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
                     } else {
                         result = typeVarsMap.get(valueTypeMirror);
@@ -153,8 +158,6 @@ static boolean isArray(@Nullable TypeMirror type) {
                 outerClassType.equals(Collection.class.getName());
     }
 
-
-
     static boolean isMap(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -162,6 +165,7 @@ static boolean isMap(@Nullable TypeMirror type) {
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(Map.class.getName()) ||
                 outerClassType.equals(HashMap.class.getName()) ||
+                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
                 outerClassType.equals(LinkedHashMap.class.getName());
     }
 
@@ -196,41 +200,13 @@ private static boolean isNumberType(@NotNull String typeString) {
                 || typeString.equals(Float.class.getName());
     }
 
-
     @NotNull
     private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
         return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
     }
 
     @NotNull
-    private static String getArrayListType(@NotNull TypeMirror innerArrayType) {
-        String innerArrayTypeString = innerArrayType.toString();
-        if (innerArrayTypeString.equals(long.class.getName())) {
-            return Long.class.getName();
-        }
-        if (innerArrayTypeString.equals(double.class.getName())) {
-            return Double.class.getName();
-        }
-        if (innerArrayTypeString.equals(Boolean.class.getName())) {
-            return Boolean.class.getName();
-        }
-        if (innerArrayTypeString.equals(float.class.getName())) {
-            return Float.class.getName();
-        }
-        if (innerArrayTypeString.equals(int.class.getName())) {
-            return Integer.class.getName();
-        } else {
-            return innerArrayType.toString();
-        }
-    }
-
-
-
-
-    @NotNull
-    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
-                                                @NotNull Map<Element, TypeMirror> elements,
-                                                @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> elements, @NotNull AdapterFieldInfo adapterFieldInfo) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
                 .addParameter(JsonReader.class, "reader")
                 .returns(typeName)
@@ -273,7 +249,7 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
                 @Override
                 public void run() {
-                    if(!isSupportedPrimitive(elementValue.toString())) {
+                    if (!isSupportedPrimitive(elementValue.toString())) {
                         nonNullFields.add(variableName);
                     }
                 }
@@ -299,8 +275,7 @@ public void run() {
         return builder.build();
     }
 
-    private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationMirror> annotationMirrors,
-                                                 @NotNull Runnable runnable) {
+    private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationMirror> annotationMirrors, @NotNull Runnable runnable) {
         for (AnnotationMirror annotationMirror : annotationMirrors) {
             switch (annotationMirror.toString()) {
                 case "@javax.validation.constraints.NotNull":
@@ -316,66 +291,84 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-    private String getAdapterAccessor(@NotNull TypeMirror fieldType,
-                                      @NotNull TypeSpec.Builder adapterBuilder,
-                                      @NotNull MethodSpec.Builder constructorBuilder,
-                                      @NotNull Map<Element, TypeMirror> memberVariables,
-                                      @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                      @NotNull Map<TypeVariable, String> typeVarsMap,
-                                      @NotNull StagGenerator stagGenerator,
-                                      @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                      @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
+                                      @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
+                                      @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
+
         if (null != knownTypeAdapter) {
             return knownTypeAdapter;
-        } else if(TypeUtils.isConcreteType(fieldType)){
+        } else if (TypeUtils.isConcreteType(fieldType)) {
+            /*
+             * If the fields are of concrete types, and not parameterized
+             */
             String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
-            if(null != getterField) {
+
+            if (null != getterField) {
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
                 return "mStagFactory.get" + getterField + "(mGson)";
-            } else if(isNativeArray(fieldType)) {
-                return "null";
-            } else if(fieldType instanceof DeclaredType) {
-                DeclaredType declaredType = (DeclaredType)fieldType;
-                if(isArray(fieldType) && declaredType.getTypeArguments().size() == 1) {
+            } else if (isNativeArray(fieldType)) {
+                /*
+                 * If the fieldType is of type native arrays such as String[] or int[]
+                 */
+                TypeMirror arrayInnerType = getArrayInnerType(fieldType);
+                if (isSupportedPrimitive(arrayInnerType.toString())) {
+                    return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
+                } else {
+                    String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
+                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
+                    return "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
+                            "(" + adapterAccessor + ", new " + nativeArrayInstantiater + "())";
+                }
+            } else if (fieldType instanceof DeclaredType) {
+                DeclaredType declaredType = (DeclaredType) fieldType;
+                if (isArray(fieldType) && declaredType.getTypeArguments().size() == 1) {
+                    /*
+                     * If the fieldType is of type List
+                     */
                     TypeMirror param = declaredType.getTypeArguments().get(0);
                     String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
                             memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String accessor =  "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + "> (" + paramAdapterAccessor + ", null)";
-                    return accessor;
-                } else if(isMap(fieldType) && declaredType.getTypeArguments().size() == 2) {
+                    String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
+                    return "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
+                            "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
+                } else if (isMap(fieldType) && declaredType.getTypeArguments().size() == 2) {
+                    /*
+                     * If the fieldType is of type Map
+                     */
                     TypeMirror keyType = declaredType.getTypeArguments().get(0);
                     TypeMirror valueType = declaredType.getTypeArguments().get(1);
                     String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
                             memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
                             memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String accessor =  "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + "> (" + keyAdapterAccessor +", " + valueAdapterAccessor + ", null)";
-                    return accessor;
+                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
+                    return "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
+                            "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
                 } else {
+                    getterField = stagGenerator.addFieldType(fieldType);
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
-                    StringBuilder paramsBuilder = new StringBuilder();
-                    paramsBuilder.append("mGson");
-                    for(TypeMirror argument : declaredType.getTypeArguments()) {
-                        String argumentAccessor = getAdapterAccessor(argument, adapterBuilder, constructorBuilder,
-                                memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                        paramsBuilder.append(", " + argumentAccessor);
-                    }
-
-                    System.out.println("Accessor  : " + fieldType.toString() + "     --- " + paramsBuilder.toString());
-                    return "null";
+                    return "mStagFactory.get" + getterField + "(mGson)";
                 }
-            } else{
+            } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 return "mStagFactory.get" + getterField + "(mGson)";
             }
+
         } else {
+            /*
+             * If the fieldType is parameterized, generate the typeadapter in the constructor itself.
+             */
             String fieldName = adapterFieldInfo.getFieldName(fieldType);
             if (null == fieldName) {
                 fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
@@ -383,28 +376,22 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType,
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                constructorBuilder.addStatement(
-                        fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
             }
             return fieldName;
         }
-
     }
 
     @NotNull
-    private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
-                                              @NotNull MethodSpec.Builder constructorBuilder,
-                                              @NotNull Map<Element, TypeMirror> memberVariables,
-                                              @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                              @NotNull Map<TypeVariable, String> typeVarsMap,
-                                              @NotNull StagGenerator stagGenerator) {
+    private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder, @NotNull MethodSpec.Builder constructorBuilder,
+                                              @NotNull Map<Element, TypeMirror> memberVariables, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                              @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
-
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
-            if(null != adapterAccessor) {
+            if (null != adapterAccessor) {
                 result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
             }
         }
@@ -412,9 +399,7 @@ private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuild
     }
 
     @NotNull
-    private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
-                                          @NotNull Map<Element, TypeMirror> memberVariables,
-                                          @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> memberVariables, @NotNull AdapterFieldInfo adapterFieldInfo) {
         final MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
                 .addParameter(JsonWriter.class, "writer")
                 .addParameter(typeName, "object")
@@ -441,7 +426,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
                 builder.beginControlFlow("if (object." + variableName + " != null) ");
             }
 
-            builder.addStatement("writer.name(\""+ name + "\")");
+            builder.addStatement("writer.name(\"" + name + "\")");
             if (!isPrimitive) {
                 builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
                 /*
@@ -459,7 +444,7 @@ public void run() {
 
                 builder.endControlFlow();
             } else {
-                builder.addStatement("writer.value(object." +  variableName + ")");
+                builder.addStatement("writer.value(object." + variableName + ")");
             }
         }
 
@@ -477,8 +462,7 @@ public void run() {
      */
     @Override
     @NotNull
-    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                       @NotNull StagGenerator stagGenerator) {
+    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator) {
         mGsonVariableUsed = false;
         mStagFactoryUsed = false;
         TypeMirror typeMirror = mInfo.getType();
@@ -501,25 +485,36 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
 
         int idx = 0;
         if (null != typeArguments) {
+            StagGenerator.GenericClassInfo genericClassInfo = stagGenerator.getGenericClassInfo(mInfo.getType());
             for (TypeMirror innerTypeMirror : typeArguments) {
                 if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
                     TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
                     String simpleName = typeVariable.asElement().getSimpleName().toString();
                     adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
-                    ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
-                    String paramName = "typeAdapter" + idx;
-                    constructorBuilder.addParameter(parameterizedTypeName, paramName);
+                    String paramName;
+                    if (genericClassInfo.mHasUnknownTypeFields) {
+                        paramName = "type[" + String.valueOf(idx) + "]";
+                    } else {
+                        ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
+                        paramName = "typeAdapter" + idx;
+                        constructorBuilder.addParameter(parameterizedTypeName, paramName);
+                    }
+
                     typeVarsMap.put(typeVariable, paramName);
                     idx++;
                 }
             }
+
+            if (idx > 0 && genericClassInfo.mHasUnknownTypeFields) {
+                constructorBuilder.addParameter(Type[].class, "type");
+                constructorBuilder.varargs(true);
+            }
         }
 
         AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
         Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
 
-        AdapterFieldInfo adapterFieldInfo = addAdapterFields(adapterBuilder, constructorBuilder, memberVariables,
-                typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
+        AdapterFieldInfo adapterFieldInfo = addAdapterFields(adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
 
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
@@ -541,72 +536,6 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         return adapterBuilder.build();
     }
 
-    @NotNull
-    private String getWriteCode(@NotNull Element key, @NotNull String prefix, @NotNull TypeMirror type,
-                                @NotNull String jsonName, @NotNull String variableName,
-                                @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isNativeArray(type)) {
-            TypeMirror innerType = getArrayInnerType(type);
-            String innerWrite = getWriteType(key, innerType, "item", adapterFieldInfo);
-            return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                    prefix + "writer.beginArray();\n" +
-                    prefix + "for (" + innerType + " item : " + variableName + ") {\n" +
-                    prefix + "\t" + innerWrite + "\n" +
-                    prefix + "}\n" +
-                    prefix + "writer.endArray();\n";
-        } else if (isArray(type)) {
-            TypeMirror innerType = getArrayInnerType(type);
-            String adapter = adapterFieldInfo.getAdapterAccessor(innerType);
-            if (isSupportedNative(innerType.toString())) {
-                mStagFactoryUsed = true;
-                adapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(innerType.toString());
-            }
-
-            String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(type);
-            return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                    prefix + "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(" + adapter + ", new " + listInstantiater + "()).write(writer, " + variableName + ");\n";
-        } else {
-            if (isMap(type) && type instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) type).getTypeArguments();
-                if (typeArguments.size() == 2 && isSupportedNative(typeArguments.get(0).toString())) {
-                    TypeMirror keyTypeMirror = typeArguments.get(0);
-                    mStagFactoryUsed = true;
-                    String keyAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString());
-                    String valueAdapter = adapterFieldInfo.getAdapterAccessor(typeArguments.get(1));
-                    if (isSupportedNative(typeArguments.get(1).toString())) {
-                        valueAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(typeArguments.get(1).toString());
-                    }
-                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(type);
-                    return prefix + "writer.name(\"" + jsonName + "\");\n" +
-                            prefix + "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyAdapter + ", " + valueAdapter + ", new " + mapInstantiater + "()).write(writer, " + variableName + ");\n";
-                }
-            }
-            return prefix + "writer.name(\"" + jsonName + "\");\n" + prefix + getWriteType(key, type, variableName, adapterFieldInfo) + '\n';
-        }
-    }
-
-    @NotNull
-    private String getWriteType(@NotNull Element key, @NotNull TypeMirror type, @NotNull String variableName,
-                                @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (isSupportedNative(type.toString())) {
-            return "writer.value(" + variableName + ");";
-        } else {
-            return getAdapterWrite(key, type, variableName, adapterFieldInfo) + ";";
-        }
-    }
-
-    @NotNull
-    private String getAdapterWrite(@NotNull Element key, @NotNull TypeMirror type, @NotNull String variableName,
-                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
-        if (key.getAnnotation(WriteRuntimeType.class) != null) {
-            mGsonVariableUsed = true;
-            return "((TypeAdapter) mGson.getAdapterAccessor(" + variableName + ".getClass())).write(writer, " + variableName + ")";
-        } else {
-            String adapterField = adapterFieldInfo.getAdapterAccessor(type);
-            return adapterField + ".write(writer, " + variableName + ")";
-        }
-    }
-
     private static class AdapterFieldInfo {
 
         //Type.toString -> Accessor Map
@@ -638,7 +567,7 @@ void addField(@NotNull TypeMirror fieldType, @NotNull String fieldName) {
             mAdapterFields.put(fieldType.toString(), fieldName);
         }
 
-        public void addTypeToAdapterAccessor(@NotNull TypeMirror typeMirror, String accessorCode) {
+        void addTypeToAdapterAccessor(@NotNull TypeMirror typeMirror, String accessorCode) {
             mAdapterAccessor.put(typeMirror.toString(), accessorCode);
         }
     }

From 50b1da7a0da2ff34620742c9d8b956109fb718af Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Wed, 21 Dec 2016 23:30:14 +0530
Subject: [PATCH 042/159] moved declared type getters to stag factory so that
 can be used accross

---
 .../processor/generators/StagGenerator.java   | 123 ++++++++++++------
 .../generators/TypeAdapterGenerator.java      |  89 ++++++-------
 2 files changed, 130 insertions(+), 82 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 713332f6..6e11180e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -65,44 +65,13 @@
 
 public class StagGenerator {
 
-    public static class GenericClassInfo {
-        public int mNumArguments;
-        public boolean mHasUnknownTypeFields;
-
-        public GenericClassInfo(int numArguments, boolean hasUnknownTypeFields) {
-            mNumArguments = numArguments;
-            mHasUnknownTypeFields = hasUnknownTypeFields;
-        }
-    }
-
     private static final String CLASS_STAG = "Stag";
     private static final String CLASS_TYPE_ADAPTER_FACTORY = "Factory";
-
-    @NotNull
-    private final Filer mFiler;
-
-    @NotNull
-    private final List<ClassInfo> mKnownClasses;
-
-    @NotNull
-    private final HashMap<String, String> mFieldNameMap = new HashMap<>();
-
-    @NotNull
-    private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
-
-    @NotNull
-    private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
-
-    //Type.toString() -> NumberOf
-    private final HashMap<String, GenericClassInfo> mGenericClassInfo = new HashMap<>();
-
-
     //Type.toString() -> NumberOf
     private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
     private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
 
-
-    {
+    static {
         KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
         KNOWN_MAP_GENERIC_CLASSES.put(HashMap.class.getName(), new GenericClassInfo(2, false));
         KNOWN_MAP_GENERIC_CLASSES.put(LinkedHashMap.class.getName(), new GenericClassInfo(2, false));
@@ -111,9 +80,23 @@ public GenericClassInfo(int numArguments, boolean hasUnknownTypeFields) {
         KNOWN_COLLECTION_GENERIC_CLASSES.put(Collection.class.getName(), new GenericClassInfo(1, false));
         KNOWN_COLLECTION_GENERIC_CLASSES.put(List.class.getName(), new GenericClassInfo(1, false));
         KNOWN_COLLECTION_GENERIC_CLASSES.put(ArrayList.class.getName(), new GenericClassInfo(1, false));
-
     }
 
+    @NotNull
+    private final Filer mFiler;
+    @NotNull
+    private final List<ClassInfo> mKnownClasses;
+    @NotNull
+    private final HashMap<String, String> mFieldNameMap = new HashMap<>();
+    @NotNull
+    private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
+    @NotNull
+    private final HashMap<TypeMirror, String> mConcreteAdapterFieldMap = new HashMap<>();
+    @NotNull
+    private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
+    //Type.toString() -> NumberOf
+    @NotNull
+    private final HashMap<String, GenericClassInfo> mGenericClassInfo = new HashMap<>();
     @NotNull
     private final String mGeneratedPackageName;
 
@@ -143,13 +126,13 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
 
 
-        for(ClassInfo knownGenericType : genericClasses) {
+        for (ClassInfo knownGenericType : genericClasses) {
             List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
             AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
             Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
             boolean hasUnknownTypeFields = false;
-            for(TypeMirror type : memberVariables.values()) {
-                if(!checkKnownAdapters(type)) {
+            for (TypeMirror type : memberVariables.values()) {
+                if (!checkKnownAdapters(type)) {
                     hasUnknownTypeFields = true;
                     break;
                 }
@@ -165,14 +148,14 @@ private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
             return true;
         }
 
-        if(TypeUtils.isConcreteType(typeMirror)) {
+        if (TypeUtils.isConcreteType(typeMirror)) {
             return true;
         }
 
         if (typeMirror instanceof DeclaredType) {
             DeclaredType declaredType = ((DeclaredType) typeMirror);
             Element outerClassType = declaredType.asElement();
-            if(!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
+            if (!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
                     !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
                     !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString())) {
                 return false;
@@ -252,6 +235,7 @@ private TypeSpec getAdapterFactorySpec() {
                     .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
 
+            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
             if (TypeAdapterGenerator.isArray(classInfo.getType())) {
                 TypeMirror typeMirror = getFirstTypeArgument(classInfo);
                 String valueAdapterName = mFieldNameMap.get(typeMirror.toString());
@@ -315,6 +299,8 @@ private TypeSpec getAdapterFactorySpec() {
                 }
 
                 getAdapterMethodBuilder.addStatement(fieldName + result);
+            } else if (knownTypeAdapterForType != null) {
+
             } else {
                 getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
             }
@@ -396,6 +382,28 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.addCode("\n");
             }
         }
+
+        Set<Map.Entry<TypeMirror, String>> entries = mConcreteAdapterFieldMap.entrySet();
+        for (Map.Entry<TypeMirror, String> entry : entries) {
+            TypeMirror fieldType = entry.getKey();
+
+            String adapterCode = entry.getValue();
+            TypeName typeName = TypeVariableName.get(fieldType);
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            String variableName = "m" + generateNameFromType(fieldType);
+            variableName = variableName.replaceAll("\\[", "").replaceAll("\\]", "");
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType))
+                    .addModifiers(Modifier.PUBLIC)
+                    .returns(parameterizedTypeName);
+            getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
+            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
+            getAdapterMethodBuilder.endControlFlow();
+            getAdapterMethodBuilder.addStatement("return " + variableName);
+            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+        }
+
         createMethodBuilder.addStatement("return null");
         adapterFactoryBuilder.addMethod(createMethodBuilder.build());
 
@@ -438,6 +446,17 @@ String addFieldType(@NotNull TypeMirror fieldType) {
         return result;
     }
 
+    @NotNull
+    String addConcreteFieldType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
+        String result = mConcreteAdapterFieldMap.get(fieldType);
+        if (result == null) {
+            if (mUnknownAdapterFieldMap.get(fieldType.toString()) == null && mFieldNameMap.get(fieldType.toString()) == null) {
+                mConcreteAdapterFieldMap.put(fieldType, adapterAccessorCode);
+            }
+        }
+        return "get" + generateNameFromType(fieldType);
+    }
+
     @Nullable
     private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
         List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
@@ -449,4 +468,32 @@ private TypeMirror getSecondTypeArgument(ClassInfo classInfo) {
         List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
         return typeArguments != null ? typeArguments.get(1) : null;
     }
+
+    @NotNull
+    private String generateNameFromType(@NotNull TypeMirror typeMirror) {
+        String fieldTypeString = typeMirror.toString();
+        fieldTypeString = fieldTypeString.replaceAll("\\[", "").replaceAll("\\]", "");
+        StringBuilder fieldNameBuilder = new StringBuilder();
+        boolean makeCapital = true;
+        for (int idx = 0; idx < fieldTypeString.length(); idx++) {
+            char c = fieldTypeString.charAt(idx);
+            if (c == '.' || c == '<' || c == ',' || c == '>') {
+                makeCapital = true;
+            } else {
+                fieldNameBuilder.append(makeCapital ? Character.toUpperCase(c) : c);
+                makeCapital = false;
+            }
+        }
+        return fieldNameBuilder.toString();
+    }
+
+    static class GenericClassInfo {
+        int mNumArguments;
+        boolean mHasUnknownTypeFields;
+
+        GenericClassInfo(int numArguments, boolean hasUnknownTypeFields) {
+            mNumArguments = numArguments;
+            mHasUnknownTypeFields = hasUnknownTypeFields;
+        }
+    }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 7a5099b5..ccccbd88 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -186,20 +186,6 @@ static boolean isSupportedNative(@NotNull String type) {
                 || type.equals(Number.class.getName());
     }
 
-    /**
-     * Check if the type is one of the numbers
-     */
-    private static boolean isNumberType(@NotNull String typeString) {
-        return typeString.equals(long.class.getName())
-                || typeString.equals(Long.class.getName())
-                || typeString.equals(double.class.getName())
-                || typeString.equals(Double.class.getName())
-                || typeString.equals(int.class.getName())
-                || typeString.equals(Integer.class.getName())
-                || typeString.equals(float.class.getName())
-                || typeString.equals(Float.class.getName());
-    }
-
     @NotNull
     private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
         return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
@@ -321,42 +307,58 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 if (isSupportedPrimitive(arrayInnerType.toString())) {
                     return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
                 } else {
+                    mStagFactoryUsed = true;
+                    ArrayType arrayType = (ArrayType) fieldType;
                     String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
                             memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
-                    return "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
+                    String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", new " + nativeArrayInstantiater + "())";
+                    if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
+                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
+                        return "mStagFactory." + getterName + "()";
+                    } else {
+                        return adapterCode;
+                    }
                 }
-            } else if (fieldType instanceof DeclaredType) {
+            } else if (isArray(fieldType)) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
-                if (isArray(fieldType) && declaredType.getTypeArguments().size() == 1) {
-                    /*
-                     * If the fieldType is of type List
-                     */
-                    TypeMirror param = declaredType.getTypeArguments().get(0);
-                    String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
-                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
-                    return "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
-                            "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
-                } else if (isMap(fieldType) && declaredType.getTypeArguments().size() == 2) {
-                    /*
-                     * If the fieldType is of type Map
-                     */
-                    TypeMirror keyType = declaredType.getTypeArguments().get(0);
-                    TypeMirror valueType = declaredType.getTypeArguments().get(1);
-                    String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
-                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
-                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
-                    return "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
-                            "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
+                /*
+                 * If the fieldType is of type List
+                 */
+                mStagFactoryUsed = true;
+                TypeMirror param = declaredType.getTypeArguments().get(0);
+                String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
+                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
+                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
+                        "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
+                if (declaredType.getKind() != TypeKind.TYPEVAR) {
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
+                    return "mStagFactory." + getterName + "()";
                 } else {
-                    getterField = stagGenerator.addFieldType(fieldType);
-                    mGsonVariableUsed = true;
-                    mStagFactoryUsed = true;
-                    return "mStagFactory.get" + getterField + "(mGson)";
+                    return adapterCode;
+                }
+            } else if (isMap(fieldType)) {
+                DeclaredType declaredType = (DeclaredType) fieldType;
+
+                 /*
+                  * If the fieldType is of type Map
+                  */
+                TypeMirror keyType = declaredType.getTypeArguments().get(0);
+                TypeMirror valueType = declaredType.getTypeArguments().get(1);
+                String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
+                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
+                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
+                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
+                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
+                if (declaredType.getKind() != TypeKind.TYPEVAR) {
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
+                    return "mStagFactory." + getterName + "()";
+                } else {
+                    return adapterCode;
                 }
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
@@ -364,7 +366,6 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 mStagFactoryUsed = true;
                 return "mStagFactory.get" + getterField + "(mGson)";
             }
-
         } else {
             /*
              * If the fieldType is parameterized, generate the typeadapter in the constructor itself.

From 721cc9a1f0f971986cf120dd4d56aba7c416c878 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 00:48:52 +0530
Subject: [PATCH 043/159] changed the key to string type

---
 .../processor/generators/StagGenerator.java   | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 6e11180e..989d4b28 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -70,6 +70,8 @@ public class StagGenerator {
     //Type.toString() -> NumberOf
     private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
     private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
+    @NotNull
+    private static final HashMap<String, String> mConcreteAdapterFieldMap = new HashMap<>();
 
     static {
         KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
@@ -91,8 +93,6 @@ public class StagGenerator {
     @NotNull
     private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
     @NotNull
-    private final HashMap<TypeMirror, String> mConcreteAdapterFieldMap = new HashMap<>();
-    @NotNull
     private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
     //Type.toString() -> NumberOf
     @NotNull
@@ -383,18 +383,18 @@ private TypeSpec getAdapterFactorySpec() {
             }
         }
 
-        Set<Map.Entry<TypeMirror, String>> entries = mConcreteAdapterFieldMap.entrySet();
-        for (Map.Entry<TypeMirror, String> entry : entries) {
-            TypeMirror fieldType = entry.getKey();
-
+        Set<Map.Entry<String, String>> entries = mConcreteAdapterFieldMap.entrySet();
+        for (Map.Entry<String, String> entry : entries) {
+            String fieldType = entry.getKey();
             String adapterCode = entry.getValue();
+
             TypeName typeName = TypeVariableName.get(fieldType);
             TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
             String variableName = "m" + generateNameFromType(fieldType);
-            variableName = variableName.replaceAll("\\[", "").replaceAll("\\]", "");
             FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
             MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType))
                     .addModifiers(Modifier.PUBLIC)
+                    .addParameter(Gson.class, "mGson")
                     .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
             getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
@@ -448,13 +448,10 @@ String addFieldType(@NotNull TypeMirror fieldType) {
 
     @NotNull
     String addConcreteFieldType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
-        String result = mConcreteAdapterFieldMap.get(fieldType);
-        if (result == null) {
-            if (mUnknownAdapterFieldMap.get(fieldType.toString()) == null && mFieldNameMap.get(fieldType.toString()) == null) {
-                mConcreteAdapterFieldMap.put(fieldType, adapterAccessorCode);
-            }
+        if (!mConcreteAdapterFieldMap.containsKey(fieldType.toString())) {
+            mConcreteAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
         }
-        return "get" + generateNameFromType(fieldType);
+        return "get" + generateNameFromType(fieldType.toString());
     }
 
     @Nullable
@@ -470,13 +467,12 @@ private TypeMirror getSecondTypeArgument(ClassInfo classInfo) {
     }
 
     @NotNull
-    private String generateNameFromType(@NotNull TypeMirror typeMirror) {
-        String fieldTypeString = typeMirror.toString();
-        fieldTypeString = fieldTypeString.replaceAll("\\[", "").replaceAll("\\]", "");
+    private String generateNameFromType(@NotNull String name) {
+        name = name.replaceAll("\\[", "").replaceAll("\\]", "");
         StringBuilder fieldNameBuilder = new StringBuilder();
         boolean makeCapital = true;
-        for (int idx = 0; idx < fieldTypeString.length(); idx++) {
-            char c = fieldTypeString.charAt(idx);
+        for (int idx = 0; idx < name.length(); idx++) {
+            char c = name.charAt(idx);
             if (c == '.' || c == '<' || c == ',' || c == '>') {
                 makeCapital = true;
             } else {

From e647dab761276995b3a39f8e1900afcc2912568e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 00:49:17 +0530
Subject: [PATCH 044/159] usesStag variable to add prefix to the adapter code

---
 .../generators/TypeAdapterGenerator.java      | 83 +++++++++++++------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index ccccbd88..1d191a22 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -66,11 +66,13 @@
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
+    private static final String STAG_FACTORY_PREFIX = "mStagFactory";
+    private static final String TYPE_FIELD_PREFIX = "mType";
     private static boolean mGsonVariableUsed;
     private static boolean mStagFactoryUsed;
-
     @NotNull
     private final ClassInfo mInfo;
+    private boolean useStagFactory = false;
 
     public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
@@ -277,7 +279,7 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-    private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+    private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
                                       @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
                                       @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
                                       @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
@@ -285,6 +287,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
 
         if (null != knownTypeAdapter) {
+            useStagFactory = false;
             return knownTypeAdapter;
         } else if (TypeUtils.isConcreteType(fieldType)) {
             /*
@@ -295,10 +298,11 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
             if (null != getterField) {
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
+                useStagFactory = true;
                 /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
-                return "mStagFactory.get" + getterField + "(mGson)";
+                return "get" + getterField + "(mGson)";
             } else if (isNativeArray(fieldType)) {
                 /*
                  * If the fieldType is of type native arrays such as String[] or int[]
@@ -308,16 +312,19 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                     return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
                 } else {
                     mStagFactoryUsed = true;
+                    mGsonVariableUsed = true;
                     ArrayType arrayType = (ArrayType) fieldType;
-                    String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
+                    String adapterAccessor = getAdapterAccessor(arrayInnerType, genericClassInfo, adapterBuilder, constructorBuilder,
                             memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", new " + nativeArrayInstantiater + "())";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
                         String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                        return "mStagFactory." + getterName + "()";
+                        useStagFactory = true;
+                        return getterName + "(mGson)";
                     } else {
+                        useStagFactory = false;
                         return adapterCode;
                     }
                 }
@@ -327,16 +334,19 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                  * If the fieldType is of type List
                  */
                 mStagFactoryUsed = true;
+                mGsonVariableUsed = true;
                 TypeMirror param = declaredType.getTypeArguments().get(0);
-                String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
+                String paramAdapterAccessor = getAdapterAccessor(param, genericClassInfo, adapterBuilder, constructorBuilder,
                         memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
                     String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                    return "mStagFactory." + getterName + "()";
+                    useStagFactory = true;
+                    return getterName + "(mGson)";
                 } else {
+                    useStagFactory = false;
                     return adapterCode;
                 }
             } else if (isMap(fieldType)) {
@@ -345,55 +355,77 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                  /*
                   * If the fieldType is of type Map
                   */
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
                 TypeMirror keyType = declaredType.getTypeArguments().get(0);
                 TypeMirror valueType = declaredType.getTypeArguments().get(1);
-                String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
+                String keyAdapterAccessor = getAdapterAccessor(keyType, genericClassInfo, adapterBuilder, constructorBuilder,
                         memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
+                String valueAdapterAccessor = getAdapterAccessor(valueType, genericClassInfo, adapterBuilder, constructorBuilder,
                         memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
                     String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                    return "mStagFactory." + getterName + "()";
+                    useStagFactory = true;
+                    return getterName + "(mGson)";
                 } else {
+                    useStagFactory = false;
                     return adapterCode;
                 }
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
-                return "mStagFactory.get" + getterField + "(mGson)";
+                useStagFactory = true;
+                return "get" + getterField + "(mGson)";
             }
         } else {
+            useStagFactory = false;
+            if (genericClassInfo.mHasUnknownTypeFields) {
+                String fieldName = adapterFieldInfo.getFieldName(fieldType);
+                if (null == fieldName) {
+                    fieldName = TYPE_FIELD_PREFIX + adapterFieldInfo.size();
+                    adapterFieldInfo.addField(fieldType, fieldName);
+                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                    adapterBuilder.addField(Type.class, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                    constructorBuilder.addStatement(fieldName + " = " + typeVarsMap.get(fieldType));
+                }
+                return fieldName;
+            } else {
             /*
              * If the fieldType is parameterized, generate the typeadapter in the constructor itself.
              */
-            String fieldName = adapterFieldInfo.getFieldName(fieldType);
-            if (null == fieldName) {
-                fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
-                adapterFieldInfo.addField(fieldType, fieldName);
-                String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                TypeName typeName = getAdapterFieldTypeName(fieldType);
-                adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                String fieldName = adapterFieldInfo.getFieldName(fieldType);
+                if (null == fieldName) {
+                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+                    adapterFieldInfo.addField(fieldType, fieldName);
+                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                    TypeName typeName = getAdapterFieldTypeName(fieldType);
+                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                    constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                }
+                return fieldName;
             }
-            return fieldName;
         }
     }
 
     @NotNull
-    private AdapterFieldInfo addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder, @NotNull MethodSpec.Builder constructorBuilder,
+    private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder, @NotNull MethodSpec.Builder constructorBuilder,
                                               @NotNull Map<Element, TypeMirror> memberVariables, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
                                               @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
         for (TypeMirror fieldType : typeSet) {
-            String adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+            String adapterAccessor = getAdapterAccessor(fieldType, genericClassInfo, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             if (null != adapterAccessor) {
-                result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
+                String finalAdapterAccessor = adapterAccessor;
+                if (useStagFactory) {
+                    finalAdapterAccessor = STAG_FACTORY_PREFIX + "." + adapterAccessor;
+                }
+                result.addTypeToAdapterAccessor(fieldType, finalAdapterAccessor);
             }
         }
         return result;
@@ -485,8 +517,9 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         Map<TypeVariable, String> typeVarsMap = new HashMap<>();
 
         int idx = 0;
+        StagGenerator.GenericClassInfo genericClassInfo = null;
         if (null != typeArguments) {
-            StagGenerator.GenericClassInfo genericClassInfo = stagGenerator.getGenericClassInfo(mInfo.getType());
+            genericClassInfo = stagGenerator.getGenericClassInfo(mInfo.getType());
             for (TypeMirror innerTypeMirror : typeArguments) {
                 if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
                     TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
@@ -515,7 +548,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
         Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
 
-        AdapterFieldInfo adapterFieldInfo = addAdapterFields(adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
+        AdapterFieldInfo adapterFieldInfo = addAdapterFields(genericClassInfo, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
 
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);

From 0ff98b0f59bdf2c105e83adb3dea8aa302164494 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 11:18:44 +0530
Subject: [PATCH 045/159] Code Cleanup and handling different type of
 constructors in Stag.Factory

---
 .../sample/model/ComplexGenericClass.java     |  4 +
 .../processor/generators/StagGenerator.java   | 27 ++++--
 .../generators/TypeAdapterGenerator.java      | 86 +++++++------------
 3 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
index 3df8ab81..c8674328 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
@@ -41,4 +41,8 @@ public class ComplexGenericClass<T> {
 
     @SerializedName("sparseArray")
     public SparseArray<T> sparseArrayField;
+
+
+    @SerializedName("regularMap")
+    public Map<String, String> regularMapField;
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 989d4b28..ad0c8c03 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -143,7 +143,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         KnownTypeAdapterUtils.initialize();
     }
 
-    private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
+    public boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return true;
         }
@@ -348,6 +348,9 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.endControlFlow();
                 createMethodBuilder.addCode("\n");
             } else {
+
+                GenericClassInfo genericClassInfo = mGenericClassInfo.get(classInfo.getType().toString());
+                boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownTypeFields;
                 /*
                  *  This is used to generate the code if the class has type arguments, or it is parameterized.
                  */
@@ -361,19 +364,33 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.addStatement(
                         "java.lang.reflect.Type[] parametersType = parameterizedType.getActualTypeArguments()");
                 String statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
+
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx + " = gson.getAdapter(TypeToken.get(parametersType[" + idx + "]))");
-                    statement += ", typeAdapter" + idx;
+                    if(!hasUnknownTypes) {
+                        createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx + " = gson.getAdapter(TypeToken.get(parametersType[" + idx + "]))");
+                        statement += ", typeAdapter" + idx;
+                    } else {
+                        statement += ", parametersType[" + idx + "]";
+                    }
+
                 }
+
                 statement += ")";
                 createMethodBuilder.addStatement(statement);
                 createMethodBuilder.endControlFlow();
                 createMethodBuilder.beginControlFlow("else");
                 createMethodBuilder.addStatement("TypeToken objectToken = TypeToken.get(Object.class)");
-                createMethodBuilder.addStatement("TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
                 statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
+                if(!hasUnknownTypes) {
+                    createMethodBuilder.addStatement("TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
+                }
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    statement += ", typeAdapter";
+                    if(!hasUnknownTypes) {
+                        statement += ", typeAdapter";
+                    } else {
+                        statement += ", objectToken.getType()";
+                    }
+
                 }
                 statement += ")";
                 createMethodBuilder.addStatement(statement);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 1d191a22..183d04b4 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -72,7 +72,6 @@ public class TypeAdapterGenerator extends AdapterGenerator {
     private static boolean mStagFactoryUsed;
     @NotNull
     private final ClassInfo mInfo;
-    private boolean useStagFactory = false;
 
     public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
@@ -279,15 +278,14 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-    private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
-                                      @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
+    private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                      @NotNull MethodSpec.Builder constructorBuilder,
                                       @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
                                       @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
 
         if (null != knownTypeAdapter) {
-            useStagFactory = false;
             return knownTypeAdapter;
         } else if (TypeUtils.isConcreteType(fieldType)) {
             /*
@@ -298,11 +296,10 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.G
             if (null != getterField) {
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
-                useStagFactory = true;
                 /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
-                return "get" + getterField + "(mGson)";
+                return "mStagFactory.get" + getterField + "(mGson)";
             } else if (isNativeArray(fieldType)) {
                 /*
                  * If the fieldType is of type native arrays such as String[] or int[]
@@ -314,17 +311,15 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.G
                     mStagFactoryUsed = true;
                     mGsonVariableUsed = true;
                     ArrayType arrayType = (ArrayType) fieldType;
-                    String adapterAccessor = getAdapterAccessor(arrayInnerType, genericClassInfo, adapterBuilder, constructorBuilder,
-                            memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
+                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", new " + nativeArrayInstantiater + "())";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
-                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                        useStagFactory = true;
-                        return getterName + "(mGson)";
+                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                        return "mStagFactory." + getterName + "(mGson)";
                     } else {
-                        useStagFactory = false;
                         return adapterCode;
                     }
                 }
@@ -336,17 +331,15 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.G
                 mStagFactoryUsed = true;
                 mGsonVariableUsed = true;
                 TypeMirror param = declaredType.getTypeArguments().get(0);
-                String paramAdapterAccessor = getAdapterAccessor(param, genericClassInfo, adapterBuilder, constructorBuilder,
-                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
+                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                    useStagFactory = true;
-                    return getterName + "(mGson)";
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                    return "mStagFactory." + getterName + "(mGson)";
                 } else {
-                    useStagFactory = false;
                     return adapterCode;
                 }
             } else if (isMap(fieldType)) {
@@ -359,55 +352,39 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, StagGenerator.G
                 mStagFactoryUsed = true;
                 TypeMirror keyType = declaredType.getTypeArguments().get(0);
                 TypeMirror valueType = declaredType.getTypeArguments().get(1);
-                String keyAdapterAccessor = getAdapterAccessor(keyType, genericClassInfo, adapterBuilder, constructorBuilder,
-                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                String valueAdapterAccessor = getAdapterAccessor(valueType, genericClassInfo, adapterBuilder, constructorBuilder,
-                        memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
+                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
+                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode);
-                    useStagFactory = true;
-                    return getterName + "(mGson)";
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                    return "mStagFactory." + getterName + "(mGson)";
                 } else {
-                    useStagFactory = false;
                     return adapterCode;
                 }
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
-                useStagFactory = true;
-                return "get" + getterField + "(mGson)";
+                return "mStagFactory." + "get" + getterField + "(mGson)";
             }
         } else {
-            useStagFactory = false;
-            if (genericClassInfo.mHasUnknownTypeFields) {
-                String fieldName = adapterFieldInfo.getFieldName(fieldType);
-                if (null == fieldName) {
-                    fieldName = TYPE_FIELD_PREFIX + adapterFieldInfo.size();
-                    adapterFieldInfo.addField(fieldType, fieldName);
-                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                    adapterBuilder.addField(Type.class, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(fieldName + " = " + typeVarsMap.get(fieldType));
-                }
-                return fieldName;
-            } else {
             /*
              * If the fieldType is parameterized, generate the typeadapter in the constructor itself.
              */
-                String fieldName = adapterFieldInfo.getFieldName(fieldType);
-                if (null == fieldName) {
-                    fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
-                    adapterFieldInfo.addField(fieldType, fieldName);
-                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-                    TypeName typeName = getAdapterFieldTypeName(fieldType);
-                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
-                }
-                return fieldName;
+            String fieldName = adapterFieldInfo.getFieldName(fieldType);
+            if (null == fieldName) {
+                fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+                adapterFieldInfo.addField(fieldType, fieldName);
+                String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                TypeName typeName = getAdapterFieldTypeName(fieldType);
+                adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
             }
+            return fieldName;
         }
     }
 
@@ -419,13 +396,10 @@ private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo generic
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
         for (TypeMirror fieldType : typeSet) {
-            String adapterAccessor = getAdapterAccessor(fieldType, genericClassInfo, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+            boolean hasUnknownTypes = stagGenerator.checkKnownAdapters(fieldType);
+            String adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             if (null != adapterAccessor) {
-                String finalAdapterAccessor = adapterAccessor;
-                if (useStagFactory) {
-                    finalAdapterAccessor = STAG_FACTORY_PREFIX + "." + adapterAccessor;
-                }
-                result.addTypeToAdapterAccessor(fieldType, finalAdapterAccessor);
+                result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
             }
         }
         return result;

From 53e2ac72a0384f5c3b6309bacf739bd6cef96e62 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 11:29:56 +0530
Subject: [PATCH 046/159] Code cleanup

---
 .../sample/model/ComplexGenericClass.java     |  4 +-
 .../sample/model/GenericUsageExample.java     | 12 ++++
 .../processor/generators/StagGenerator.java   | 67 +------------------
 3 files changed, 16 insertions(+), 67 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
index c8674328..ae7f490a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import android.util.SparseArray;
+import android.webkit.ValueCallback;
 
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
@@ -40,7 +40,7 @@ public class ComplexGenericClass<T> {
     public Map<String, Map<String, T>> mapField;
 
     @SerializedName("sparseArray")
-    public SparseArray<T> sparseArrayField;
+    public ValueCallback<T> sparseArrayField;
 
 
     @SerializedName("regularMap")
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java b/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
new file mode 100644
index 00000000..cc0cc5f0
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
@@ -0,0 +1,12 @@
+package com.vimeo.sample.model;
+
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class GenericUsageExample {
+
+    @SerializedName("GenericUsage")
+    GenericClass<User> mGenericUsage;
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index ad0c8c03..717a49ec 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -236,71 +236,8 @@ private TypeSpec getAdapterFactorySpec() {
             getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
 
             String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
-            if (TypeAdapterGenerator.isArray(classInfo.getType())) {
-                TypeMirror typeMirror = getFirstTypeArgument(classInfo);
-                String valueAdapterName = mFieldNameMap.get(typeMirror.toString());
-                String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(classInfo.getType());
-                getAdapterMethodBuilder.addStatement(fieldName + " = new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(get" + valueAdapterName + "(gson), new " + listInstantiater + "())");
-            } else if (TypeAdapterGenerator.isMap(classInfo.getType())) {
-                TypeMirror keyTypeMirror = getFirstTypeArgument(classInfo);
-                TypeMirror valueTypeMirror = getSecondTypeArgument(classInfo);
-                String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(classInfo.getType());
-
-                String result;
-                String keyFieldName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString());
-                String valueFieldName = KnownTypeAdapterUtils.getKnownTypeAdapterForType(valueTypeMirror.toString());
-
-                if (keyFieldName == null) {
-                    keyFieldName = mFieldNameMap.get(keyTypeMirror.toString());
-                    if (keyFieldName == null) {
-                        ClassInfo keyClassInfo = new ClassInfo(keyTypeMirror);
-                        String adapterName = "mAdapter" + keyClassInfo.getTypeAdapterClassName();
-                        ParameterizedTypeName keyParameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(keyClassInfo.getType()));
-                        FieldSpec.Builder keyFieldSpecBuilder = FieldSpec.builder(keyParameterizedTypeName, FileGenUtils.unescapeEscapedString(adapterName), Modifier.PRIVATE);
-                        MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString("get" + keyClassInfo.getTypeAdapterClassName()))
-                                .addModifiers(Modifier.PUBLIC)
-                                .addParameter(Gson.class, "gson")
-                                .returns(keyParameterizedTypeName);
-                        methodBuilder.beginControlFlow("if (null == " + adapterName + ")");
-                        methodBuilder.addStatement(adapterName + " = gson.getAdapter(new TypeToken<" + keyClassInfo.getType().toString() + ">(){})");
-                        methodBuilder.endControlFlow();
-                        methodBuilder.addStatement("return " + adapterName);
-                        adapterFactoryBuilder.addField(keyFieldSpecBuilder.build());
-                        adapterFactoryBuilder.addMethod(methodBuilder.build());
-                        keyFieldName = keyClassInfo.getTypeAdapterClassName();
-                    }
-                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(get" + keyFieldName + "(gson), ";
-                } else {
-                    result = " = new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + keyFieldName + ", ";
-                }
-
-                if (valueFieldName == null) {
-                    valueFieldName = mFieldNameMap.get(valueTypeMirror.toString());
-                    if (valueFieldName == null) {
-                        ClassInfo valueClassInfo = new ClassInfo(valueTypeMirror);
-                        String adapterName = "mAdapter" + valueClassInfo.getTypeAdapterClassName();
-                        ParameterizedTypeName keyParameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(valueClassInfo.getType()));
-                        FieldSpec.Builder keyFieldSpecBuilder = FieldSpec.builder(keyParameterizedTypeName, FileGenUtils.unescapeEscapedString(adapterName), Modifier.PRIVATE);
-                        MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString("get" + valueClassInfo.getTypeAdapterClassName()))
-                                .addModifiers(Modifier.PUBLIC)
-                                .addParameter(Gson.class, "gson")
-                                .returns(keyParameterizedTypeName);
-                        methodBuilder.beginControlFlow("if (null == " + adapterName + ")");
-                        methodBuilder.addStatement(adapterName + " = gson.getAdapter(new TypeToken<" + valueClassInfo.getType().toString() + ">(){})");
-                        methodBuilder.endControlFlow();
-                        methodBuilder.addStatement("return " + adapterName);
-                        adapterFactoryBuilder.addField(keyFieldSpecBuilder.build());
-                        adapterFactoryBuilder.addMethod(methodBuilder.build());
-                        valueFieldName = valueClassInfo.getTypeAdapterClassName();
-                    }
-                    result += "get" + valueFieldName + "(gson), new " + mapInstantiater + "())";
-                } else {
-                    result += valueFieldName + ", new " + mapInstantiater + "())";
-                }
-
-                getAdapterMethodBuilder.addStatement(fieldName + result);
-            } else if (knownTypeAdapterForType != null) {
-
+            if(null != knownTypeAdapterForType) {
+                fieldName += knownTypeAdapterForType;
             } else {
                 getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
             }

From 9966917ec0a3e3c2d818050f334ab91193aae0b9 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 12:41:43 +0530
Subject: [PATCH 047/159] added date type adapter for knowntypes + removed
 unused map

---
 .../utils/KnownTypeAdapterUtils.java          | 14 +----
 .../com/vimeo/stag/KnownTypeAdapters.java     | 60 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 0751f148..df1d7193 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -14,6 +14,7 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Currency;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -26,8 +27,6 @@
 import javax.lang.model.type.TypeMirror;
 
 public class KnownTypeAdapterUtils {
-    @NotNull
-    private static final HashMap<Type, Class> mKnownCollectionTypeAdapters = new HashMap<>();
     @NotNull
     private static final HashMap<String, String> mKnownTypeAdapters = new HashMap<>();
 
@@ -60,6 +59,7 @@ public class KnownTypeAdapterUtils {
         mKnownTypeAdapters.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
         mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
         mKnownTypeAdapters.put(JsonElement.class.getName(), "com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT");
+        mKnownTypeAdapters.put(Date.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DATE_TYPE_ADAPTER");
     }
 
     @Nullable
@@ -67,16 +67,6 @@ public static String getKnownTypeAdapterForType(String type) {
         return mKnownTypeAdapters.get(type);
     }
 
-    @NotNull
-    public static HashMap<Type, Class> getKnownCollectionTypeAdapters() {
-        return mKnownCollectionTypeAdapters;
-    }
-
-    public static void initialize() {
-        mKnownCollectionTypeAdapters.put(List.class, KnownTypeAdapters.ListTypeAdapter.class);
-        mKnownCollectionTypeAdapters.put(Map.class, KnownTypeAdapters.MapTypeAdapter.class);
-    }
-
     @NotNull
     public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index e7dafefb..2b901ba1 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -9,16 +9,22 @@
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
+import com.google.gson.internal.bind.util.ISO8601Utils;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -514,7 +520,59 @@ private String keyToString(JsonElement keyElement) {
         }
     }
 
-    public final class ObjectTypeAdapter extends TypeAdapter<Object> {
+    private static final class DateTypeAdapter extends TypeAdapter<Date> {
+        private final DateFormat enUsFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.US);
+        private final DateFormat localFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);
+
+        @Override
+        public Date read(JsonReader in) throws IOException {
+            if (in.peek() == JsonToken.NULL) {
+                in.nextNull();
+                return null;
+            }
+            return deserializeToDate(in.nextString());
+        }
+
+        private synchronized Date deserializeToDate(String json) {
+            try {
+                return localFormat.parse(json);
+            } catch (ParseException ignored) {
+            }
+            try {
+                return enUsFormat.parse(json);
+            } catch (ParseException ignored) {
+            }
+            try {
+                return ISO8601Utils.parse(json, new ParsePosition(0));
+            } catch (ParseException e) {
+                throw new JsonSyntaxException(json, e);
+            }
+        }
+
+        @Override
+        public synchronized void write(JsonWriter out, Date value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+                return;
+            }
+            String dateFormatAsString = enUsFormat.format(value);
+            out.value(dateFormatAsString);
+        }
+    }
+
+    public static final class DATE_TYPE_ADAPTER {
+        static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
+
+        public static void write(JsonWriter writer, Date value) throws IOException {
+            dateTypeAdapter.write(writer, value);
+        }
+
+        public static Date read(JsonReader reader) throws IOException {
+            return dateTypeAdapter.read(reader);
+        }
+    }
+
+    public static final class ObjectTypeAdapter extends TypeAdapter<Object> {
 
         private final Gson gson;
 

From 4f90752319c898bda8b0736100557e452378ad68 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 12:42:53 +0530
Subject: [PATCH 048/159] corresponding changes for object typeadapters

---
 .../stag/processor/generators/StagGenerator.java    |  2 --
 .../processor/generators/TypeAdapterGenerator.java  | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 717a49ec..3ed86e2d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -139,8 +139,6 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             }
             mGenericClassInfo.put(knownGenericType.getType().toString(), new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
         }
-
-        KnownTypeAdapterUtils.initialize();
     }
 
     public boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 183d04b4..793d5673 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -159,6 +159,14 @@ static boolean isArray(@Nullable TypeMirror type) {
                 outerClassType.equals(Collection.class.getName());
     }
 
+    static boolean isNativeObject(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(Object.class.getName());
+    }
+
     static boolean isMap(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -365,6 +373,11 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 } else {
                     return adapterCode;
                 }
+            } else if (isNativeObject(fieldType)) {
+                mGsonVariableUsed = true;
+                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
+                String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                return "mStagFactory." + getterName + "(mGson)";
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;

From 00934f08e02f920a8decef47e24ed89c42ba6c54 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 13:26:27 +0530
Subject: [PATCH 049/159] maintaining a list of generic typeadatpers to use it
 instead of crating typetokes

---
 .../processor/generators/StagGenerator.java   | 93 ++++++++++---------
 1 file changed, 49 insertions(+), 44 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 3ed86e2d..8a5202c9 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -68,17 +68,20 @@ public class StagGenerator {
     private static final String CLASS_STAG = "Stag";
     private static final String CLASS_TYPE_ADAPTER_FACTORY = "Factory";
     //Type.toString() -> NumberOf
+    @NotNull
     private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
+    @NotNull
     private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
     @NotNull
     private static final HashMap<String, String> mConcreteAdapterFieldMap = new HashMap<>();
+    @NotNull
+    private static final HashMap<String, String> mGenericAdapterFieldMap = new HashMap<>();
 
     static {
         KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
         KNOWN_MAP_GENERIC_CLASSES.put(HashMap.class.getName(), new GenericClassInfo(2, false));
         KNOWN_MAP_GENERIC_CLASSES.put(LinkedHashMap.class.getName(), new GenericClassInfo(2, false));
         KNOWN_MAP_GENERIC_CLASSES.put(ConcurrentHashMap.class.getName(), new GenericClassInfo(2, false));
-
         KNOWN_COLLECTION_GENERIC_CLASSES.put(Collection.class.getName(), new GenericClassInfo(1, false));
         KNOWN_COLLECTION_GENERIC_CLASSES.put(List.class.getName(), new GenericClassInfo(1, false));
         KNOWN_COLLECTION_GENERIC_CLASSES.put(ArrayList.class.getName(), new GenericClassInfo(1, false));
@@ -125,7 +128,6 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             mFieldNameMap.put(knownType.toString(), adapterFactoryMethodName);
         }
 
-
         for (ClassInfo knownGenericType : genericClasses) {
             List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
             AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
@@ -141,7 +143,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
     }
 
-    public boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
+    boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return true;
         }
@@ -172,7 +174,7 @@ public boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
     }
 
     @Nullable
-    public GenericClassInfo getGenericClassInfo(@NotNull TypeMirror typeMirror) {
+    GenericClassInfo getGenericClassInfo(@NotNull TypeMirror typeMirror) {
         return mGenericClassInfo.get(typeMirror.toString());
     }
 
@@ -215,36 +217,6 @@ private TypeSpec getAdapterFactorySpec() {
                 .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName), "type")
                 .addStatement("Class<? super T> clazz = type.getRawType()");
 
-        /*
-         * Iterate through all the registered unknown classes, and map the classes to its corresponding type adapters.
-         */
-        for (ClassInfo classInfo : mUnknownClasses) {
-            String variableName = mUnknownAdapterFieldMap.get(classInfo.getType().toString());
-            TypeName typeName = TypeVariableName.get(classInfo.getType());
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-            String fieldName = "mAdapter" + variableName;
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
-            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
-            String getAdapterFactoryMethodName = "get" + variableName;
-
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
-                    .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "gson")
-                    .returns(parameterizedTypeName);
-            getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
-
-            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
-            if(null != knownTypeAdapterForType) {
-                fieldName += knownTypeAdapterForType;
-            } else {
-                getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
-            }
-
-            getAdapterMethodBuilder.endControlFlow();
-            getAdapterMethodBuilder.addStatement("return " + fieldName);
-            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
-        }
-
         /*
          * Iterate through all the registered known classes, and map the classes to its corresponding type adapters.
          */
@@ -286,6 +258,11 @@ private TypeSpec getAdapterFactorySpec() {
 
                 GenericClassInfo genericClassInfo = mGenericClassInfo.get(classInfo.getType().toString());
                 boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownTypeFields;
+                if (!mGenericAdapterFieldMap.containsKey(classInfo.getType().toString().replaceAll("<T>", ""))) {
+                    System.out.println("putting in map " + classInfo.getType().toString().replaceAll("<T>", ""));
+                    mGenericAdapterFieldMap.put(classInfo.getType().toString().replaceAll("<T>", ""), qualifiedTypeAdapterName);
+                }
+
                 /*
                  *  This is used to generate the code if the class has type arguments, or it is parameterized.
                  */
@@ -301,13 +278,12 @@ private TypeSpec getAdapterFactorySpec() {
                 String statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
 
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    if(!hasUnknownTypes) {
+                    if (!hasUnknownTypes) {
                         createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx + " = gson.getAdapter(TypeToken.get(parametersType[" + idx + "]))");
                         statement += ", typeAdapter" + idx;
                     } else {
                         statement += ", parametersType[" + idx + "]";
                     }
-
                 }
 
                 statement += ")";
@@ -316,11 +292,11 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.beginControlFlow("else");
                 createMethodBuilder.addStatement("TypeToken objectToken = TypeToken.get(Object.class)");
                 statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
-                if(!hasUnknownTypes) {
+                if (!hasUnknownTypes) {
                     createMethodBuilder.addStatement("TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
                 }
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
-                    if(!hasUnknownTypes) {
+                    if (!hasUnknownTypes) {
                         statement += ", typeAdapter";
                     } else {
                         statement += ", objectToken.getType()";
@@ -335,6 +311,41 @@ private TypeSpec getAdapterFactorySpec() {
             }
         }
 
+                /*
+         * Iterate through all the registered unknown classes, and map the classes to its corresponding type adapters.
+         */
+        for (ClassInfo classInfo : mUnknownClasses) {
+            String variableName = mUnknownAdapterFieldMap.get(classInfo.getType().toString());
+            TypeName typeName = TypeVariableName.get(classInfo.getType());
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            String fieldName = "mAdapter" + variableName;
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
+            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+            String getAdapterFactoryMethodName = "get" + variableName;
+
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
+                    .addModifiers(Modifier.PUBLIC)
+                    .addParameter(Gson.class, "gson")
+                    .returns(parameterizedTypeName);
+            getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
+
+            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
+            if (null != knownTypeAdapterForType) {
+                fieldName += knownTypeAdapterForType;
+            } else if (mUnknownAdapterFieldMap.get(classInfo.getType().toString()) != null) {
+                String outerClassType = TypeUtils.getOuterClassType(classInfo.getType());
+                TypeMirror firstTypeArgument = getFirstTypeArgument(classInfo);
+                String outerAdapter = FileGenUtils.unescapeEscapedString(outerClassType);
+                String innerAdapter = FileGenUtils.unescapeEscapedString(firstTypeArgument.toString());
+                getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson=,l mk-))");
+            } else {
+                getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
+            }
+            getAdapterMethodBuilder.endControlFlow();
+            getAdapterMethodBuilder.addStatement("return " + fieldName);
+            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+        }
+
         Set<Map.Entry<String, String>> entries = mConcreteAdapterFieldMap.entrySet();
         for (Map.Entry<String, String> entry : entries) {
             String fieldType = entry.getKey();
@@ -412,12 +423,6 @@ private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
         return typeArguments != null ? typeArguments.get(0) : null;
     }
 
-    @Nullable
-    private TypeMirror getSecondTypeArgument(ClassInfo classInfo) {
-        List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
-        return typeArguments != null ? typeArguments.get(1) : null;
-    }
-
     @NotNull
     private String generateNameFromType(@NotNull String name) {
         name = name.replaceAll("\\[", "").replaceAll("\\]", "");

From 330a23e2ceacca3bb94bd147cdb0af5f0a402dfc Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 14:27:12 +0530
Subject: [PATCH 050/159] fixed

---
 .../java/com/vimeo/stag/processor/generators/StagGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 8a5202c9..177e9241 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -337,7 +337,7 @@ private TypeSpec getAdapterFactorySpec() {
                 TypeMirror firstTypeArgument = getFirstTypeArgument(classInfo);
                 String outerAdapter = FileGenUtils.unescapeEscapedString(outerClassType);
                 String innerAdapter = FileGenUtils.unescapeEscapedString(firstTypeArgument.toString());
-                getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson=,l mk-))");
+                getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson))");
             } else {
                 getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
             }

From d79a83fa05304a986a18420fd07f27e0d67242c7 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 14:37:06 +0530
Subject: [PATCH 051/159] Code with placeholder for generic unknown type

---
 .../processor/generators/StagGenerator.java   |  8 ++++----
 .../generators/TypeAdapterGenerator.java      | 14 +++++++++----
 .../vimeo/stag/processor/utils/TypeUtils.java | 20 +++++++++++++++++++
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 177e9241..ece2c44c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -257,7 +257,7 @@ private TypeSpec getAdapterFactorySpec() {
             } else {
 
                 GenericClassInfo genericClassInfo = mGenericClassInfo.get(classInfo.getType().toString());
-                boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownTypeFields;
+                boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownVarTypeFields;
                 if (!mGenericAdapterFieldMap.containsKey(classInfo.getType().toString().replaceAll("<T>", ""))) {
                     System.out.println("putting in map " + classInfo.getType().toString().replaceAll("<T>", ""));
                     mGenericAdapterFieldMap.put(classInfo.getType().toString().replaceAll("<T>", ""), qualifiedTypeAdapterName);
@@ -442,11 +442,11 @@ private String generateNameFromType(@NotNull String name) {
 
     static class GenericClassInfo {
         int mNumArguments;
-        boolean mHasUnknownTypeFields;
+        boolean mHasUnknownVarTypeFields;
 
-        GenericClassInfo(int numArguments, boolean hasUnknownTypeFields) {
+        GenericClassInfo(int numArguments, boolean hasUnknownVarTypeFields) {
             mNumArguments = numArguments;
-            mHasUnknownTypeFields = hasUnknownTypeFields;
+            mHasUnknownVarTypeFields = hasUnknownVarTypeFields;
         }
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 793d5673..fcbc9bc8 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -408,9 +408,15 @@ private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo generic
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
+        boolean hasUnkownGenericField = genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
         for (TypeMirror fieldType : typeSet) {
-            boolean hasUnknownTypes = stagGenerator.checkKnownAdapters(fieldType);
-            String adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+            String adapterAccessor;
+            if(hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
+                adapterAccessor = null;
+            } else {
+                adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+            }
+
             if (null != adapterAccessor) {
                 result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
             }
@@ -513,7 +519,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                     String simpleName = typeVariable.asElement().getSimpleName().toString();
                     adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
                     String paramName;
-                    if (genericClassInfo.mHasUnknownTypeFields) {
+                    if (genericClassInfo.mHasUnknownVarTypeFields) {
                         paramName = "type[" + String.valueOf(idx) + "]";
                     } else {
                         ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
@@ -526,7 +532,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                 }
             }
 
-            if (idx > 0 && genericClassInfo.mHasUnknownTypeFields) {
+            if (idx > 0 && genericClassInfo.mHasUnknownVarTypeFields) {
                 constructorBuilder.addParameter(Type[].class, "type");
                 constructorBuilder.varargs(true);
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 4afc1787..ad4cedd3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -170,6 +170,26 @@ public static boolean isConcreteType(@NotNull TypeMirror typeMirror) {
         return true;
     }
 
+
+    public static boolean containsTypeVarParams(@NotNull TypeMirror typeMirror) {
+        if (typeMirror.getKind() == TypeKind.TYPEVAR) {
+            return true;
+        }
+
+        if (typeMirror instanceof DeclaredType) {
+            List<? extends TypeMirror> typeMirrors = ((DeclaredType) typeMirror).getTypeArguments();
+
+            for (TypeMirror type : typeMirrors) {
+                if (containsTypeVarParams(type)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
     /**
      * Gets the inherited type from the element. If
      * the inherited type is Object, then this method

From 2fc51f39cd30be615b77371c7b5931d2acdfcaa7 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 14:40:05 +0530
Subject: [PATCH 052/159] created another function

---
 .../generators/TypeAdapterGenerator.java      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index fcbc9bc8..03d5336f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -286,6 +286,24 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
+
+    private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                                   @NotNull MethodSpec.Builder constructorBuilder,
+                                                   @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
+                                                   @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+
+        String fieldName = adapterFieldInfo.getFieldName(fieldType);
+        if (null == fieldName) {
+            fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+            adapterFieldInfo.addField(fieldType, fieldName);
+            String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+            TypeName typeName = getAdapterFieldTypeName(fieldType);
+            adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+        }
+        return null;
+    }
+
     private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                       @NotNull MethodSpec.Builder constructorBuilder,
                                       @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
@@ -411,8 +429,8 @@ private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo generic
         boolean hasUnkownGenericField = genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor;
-            if(hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
-                adapterAccessor = null;
+            if (hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
+                adapterAccessor = getAdapterForUnknownGenericType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             }

From d2ab27ef3fb796dddb24fd6158bd95c1ec262daf Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 15:03:35 +0530
Subject: [PATCH 053/159] Handling all scenarios

---
 .../vimeo/sample/model/RecursiveClass.java    |  6 ++
 .../processor/generators/StagGenerator.java   |  2 +-
 .../generators/TypeAdapterGenerator.java      | 58 ++++++++++++++++---
 .../utils/KnownTypeAdapterUtils.java          |  5 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     | 20 +++----
 5 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
index e7c1b6a1..5d26fbd2 100644
--- a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
@@ -59,4 +59,10 @@ public class RecursiveClass {
     public RecursiveClass innerSum;
 
 
+    @SerializedName("integerNativeArray")
+    public Integer[] integerNativeArray;
+
+
+    @SerializedName("objectNativeArray")
+    public Stats[] objectNativeArray;
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index ece2c44c..cdadc1a5 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -357,7 +357,7 @@ private TypeSpec getAdapterFactorySpec() {
             FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
             MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType))
                     .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "mGson")
+                    .addParameter(Gson.class, "gson")
                     .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
             getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 03d5336f..ad6dfbb7 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -77,6 +77,46 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
     }
 
+    @Nullable
+    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType,
+                                           @NotNull Map<TypeVariable, String> typeVarsMap,
+                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
+        String result = null;
+        if (!TypeUtils.isConcreteType(fieldType)) {
+            if (fieldType.getKind() == TypeKind.TYPEVAR) {
+                result = " com.google.gson.reflect.TypeToken.get(" + typeVarsMap.get(fieldType) + ")";
+            } else if (fieldType instanceof DeclaredType) {
+                /**
+                 * If it is of ParameterizedType, {@link com.vimeo.stag.utils.ParameterizedTypeUtil} is used to get the
+                 * type token of the parameter type.
+                 */
+                DeclaredType declaredFieldType = (DeclaredType) fieldType;
+                List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
+                result = "com.google.gson.reflect.TypeToken.getParameterized(" +
+                        declaredFieldType.asElement().toString() + ".class";
+                /**
+                 * Iterate through all the types from the typeArguments and generate type token code accordingly
+                 */
+                for (TypeMirror parameterTypeMirror : typeMirrors) {
+                    if (isSupportedNative(parameterTypeMirror.toString())) {
+                        result += ", " + parameterTypeMirror.toString() + ".class";
+                    } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
+                        result += ", " + typeVarsMap.get(parameterTypeMirror);
+                    } else {
+                        result += ",\n" + getTypeTokenCodeForUnknownTypes(parameterTypeMirror, typeVarsMap,
+                                typeTokenConstantsGenerator) + ".getType()";
+                    }
+                }
+                result += ")";
+            }
+        } else {
+            result = typeTokenConstantsGenerator.addTypeToken(fieldType);
+        }
+
+        return result;
+    }
+
+
     @Nullable
     private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
                                            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
@@ -290,7 +330,7 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
     private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                                    @NotNull MethodSpec.Builder constructorBuilder,
                                                    @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
-                                                   @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
         if (null == fieldName) {
@@ -299,9 +339,9 @@ private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @N
             String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
             TypeName typeName = getAdapterFieldTypeName(fieldType);
             adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCodeForUnknownTypes(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
         }
-        return null;
+        return fieldName;
     }
 
     private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
@@ -341,9 +381,9 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                             typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
-                            "(" + adapterAccessor + ", new " + nativeArrayInstantiater + "())";
+                            "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
-                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
                         return adapterCode;
@@ -363,7 +403,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -386,7 +426,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -394,7 +434,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
             } else if (isNativeObject(fieldType)) {
                 mGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
-                String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", ""));
+                String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
@@ -430,7 +470,7 @@ private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo generic
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor;
             if (hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
-                adapterAccessor = getAdapterForUnknownGenericType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+                adapterAccessor = getAdapterForUnknownGenericType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index df1d7193..eaa559a6 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -100,10 +100,7 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
     @Nullable
     public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        if (outerClassType.equals(String.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.StringArrayInstantiater";
-        }
-        return null;
+        return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType+ "[size]; } }";
     }
 
     @Nullable
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 2b901ba1..2744b84f 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -69,6 +69,7 @@ public void write(JsonWriter out, Short value) throws IOException {
             out.value(value);
         }
     };
+
     public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
         @Override
         public Integer read(JsonReader in) throws IOException {
@@ -143,11 +144,16 @@ public void write(JsonWriter out, Double value) throws IOException {
     public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiater<Double>());
     public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiater<Short>());
 
+    public interface PrimitiveArrayConstructor<T> {
+        T[] construct(int size);
+    }
+
+
     public static final class ArrayTypeAdapter<T extends Object> extends TypeAdapter<T[]> {
         TypeAdapter<T> mValueTypeAdapter;
-        ObjectConstructor<T[]> mObjectCreator;
+        PrimitiveArrayConstructor<T> mObjectCreator;
 
-        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, ObjectConstructor<T[]> instanceCreator) {
+        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayConstructor<T> instanceCreator) {
             this.mValueTypeAdapter = valueTypeAdapter;
             this.mObjectCreator = instanceCreator;
         }
@@ -195,7 +201,7 @@ public T[] read(JsonReader reader) throws IOException {
 
             reader.endObject();
 
-            T[] result = this.mObjectCreator.construct();
+            T[] result = this.mObjectCreator.construct(object.size());
             return object.toArray(result);
         }
 
@@ -297,14 +303,6 @@ public static short[] read(JsonReader reader) throws IOException {
         }
     }
 
-    public static class StringArrayInstantiater implements ObjectConstructor<String[]> {
-
-        @Override
-        public String[] construct() {
-            return new String[]{};
-        }
-    }
-
     public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
 
         @Override

From 251e8df18da4f8917700ea52176a2c1aa588cedd Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 16:42:30 +0530
Subject: [PATCH 054/159] null checks

---
 .../stag/processor/generators/StagGenerator.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index cdadc1a5..30a4223c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -336,8 +336,13 @@ private TypeSpec getAdapterFactorySpec() {
                 String outerClassType = TypeUtils.getOuterClassType(classInfo.getType());
                 TypeMirror firstTypeArgument = getFirstTypeArgument(classInfo);
                 String outerAdapter = FileGenUtils.unescapeEscapedString(outerClassType);
-                String innerAdapter = FileGenUtils.unescapeEscapedString(firstTypeArgument.toString());
-                getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson))");
+                String firstTypeString = firstTypeArgument != null ? firstTypeArgument.toString() : null;
+                if (firstTypeString != null && mGenericAdapterFieldMap.get(outerAdapter) != null) {
+                    String innerAdapter = FileGenUtils.unescapeEscapedString(firstTypeString);
+                    getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson))");
+                } else {
+                    getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
+                }
             } else {
                 getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
             }
@@ -420,7 +425,7 @@ String addConcreteFieldType(@NotNull TypeMirror fieldType, @NotNull String adapt
     @Nullable
     private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
         List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
-        return typeArguments != null ? typeArguments.get(0) : null;
+        return typeArguments != null && typeArguments.size() == 1 ? typeArguments.get(0) : null;
     }
 
     @NotNull
@@ -437,7 +442,7 @@ private String generateNameFromType(@NotNull String name) {
                 makeCapital = false;
             }
         }
-        return fieldNameBuilder.toString();
+        return fieldNameBuilder.toString() + "Array";
     }
 
     static class GenericClassInfo {

From 05cc6ae0177ece07a007fbf6e73f2af589f0aac6 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 16:51:31 +0530
Subject: [PATCH 055/159] Fixing the cases for List & Maps

---
 .../generators/TypeAdapterGenerator.java      |  4 +--
 .../utils/KnownTypeAdapterUtils.java          | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index ad6dfbb7..7a455ef0 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -401,7 +401,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                         typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
-                        "(" + paramAdapterAccessor + ", new " + listInstantiater + "())";
+                        "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
                     String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
@@ -424,7 +424,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                         typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
-                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", new " + mapInstantiater + "())";
+                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
                     String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index eaa559a6..4c7be233 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
+import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
 public class KnownTypeAdapterUtils {
@@ -70,30 +71,38 @@ public static String getKnownTypeAdapterForType(String type) {
     @NotNull
     public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType)typeMirror : null;
+        TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null && !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments().get(0) : null;
+        String postFix = valueType != null ? "<" + valueType.toString() + ">()" : "()";
         if (outerClassType.equals(ArrayList.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater" + postFix;
         } else if (outerClassType.equals(List.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.ListInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.ListInstantiater"  + postFix;
         } else if (outerClassType.equals(Collection.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater"  + postFix;
         } else {
-            return "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater"  + postFix;
         }
     }
 
     @NotNull
     public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType)typeMirror : null;
+        TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2? declaredType.getTypeArguments().get(0) : null;
+        TypeMirror paramType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(1) : null;
+        String postFix = keyType != null ? "<" + keyType.toString() + ", " +  paramType.toString() + ">()" : "()";
+
         if (outerClassType.equals(Map.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.MapInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiater" + postFix;
         } else if (outerClassType.equals(HashMap.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater" + postFix;
         } else if (outerClassType.equals(LinkedHashMap.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.LinkedHashMapInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.LinkedHashMapInstantiater" + postFix;
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater" + postFix;
         } else {
-            return "com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater";
+            return "new com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater" + postFix;
         }
     }
 

From 972cb55d3847104153bdf0a3a1cf40cca9f58a48 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 18:14:10 +0530
Subject: [PATCH 056/159] fix for @WriteRuntimeAnnotation, and fixed the
 ListTypeAdapter

---
 .../generators/TypeAdapterGenerator.java      | 12 +++++--
 .../com/vimeo/stag/KnownTypeAdapters.java     | 32 ++++---------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 7a455ef0..54faba66 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -33,6 +33,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -79,8 +80,8 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
 
     @Nullable
     private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType,
-                                           @NotNull Map<TypeVariable, String> typeVarsMap,
-                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
+                                                          @NotNull Map<TypeVariable, String> typeVarsMap,
+                                                          @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
@@ -512,7 +513,12 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<E
 
             builder.addStatement("writer.name(\"" + name + "\")");
             if (!isPrimitive) {
-                builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
+                WriteRuntimeType annotation = element.getKey().getAnnotation(WriteRuntimeType.class);
+                if (annotation != null) {
+                    builder.addStatement("((TypeAdapter) mGson.getAdapter(object." + variableName + ".getClass())).write(writer, object." + variableName + ")");
+                } else {
+                    builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
+                }
                 /*
                 * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
                 */
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 2744b84f..d19e069d 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -380,38 +380,18 @@ public void write(JsonWriter writer, T value) throws IOException {
 
         @Override
         public T read(JsonReader reader) throws IOException {
-            if (reader.peek() == com.google.gson.stream.JsonToken.NULL) {
+            if (reader.peek() == JsonToken.NULL) {
                 reader.nextNull();
                 return null;
             }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
-                reader.skipValue();
-                return null;
-            }
-            reader.beginObject();
-
-            T object = objectConstructor.construct();
 
+            T collection = objectConstructor.construct();
+            reader.beginArray();
             while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        object.add(valueTypeAdapter.read(reader));
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
+                collection.add(valueTypeAdapter.read(reader));
             }
-
-            reader.endObject();
-            return object;
+            reader.endArray();
+            return collection;
         }
     }
 

From 6a18be1399efd0ab98eca0adcd1deb504bc409a7 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 19:18:48 +0530
Subject: [PATCH 057/159] handle the recursive generic scenarios

---
 .../sample/model/GenericUsageExample.java     |  2 +-
 .../processor/generators/StagGenerator.java   | 60 +++++++++++--------
 .../generators/TypeAdapterGenerator.java      | 21 +++++--
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java b/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
index cc0cc5f0..7341ba72 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
@@ -8,5 +8,5 @@
 public class GenericUsageExample {
 
     @SerializedName("GenericUsage")
-    GenericClass<User> mGenericUsage;
+    GenericClass<GenericClass<User>> mGenericUsage;
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 30a4223c..0eadc173 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -143,7 +143,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
     }
 
-    boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
+    private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return true;
         }
@@ -258,10 +258,6 @@ private TypeSpec getAdapterFactorySpec() {
 
                 GenericClassInfo genericClassInfo = mGenericClassInfo.get(classInfo.getType().toString());
                 boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownVarTypeFields;
-                if (!mGenericAdapterFieldMap.containsKey(classInfo.getType().toString().replaceAll("<T>", ""))) {
-                    System.out.println("putting in map " + classInfo.getType().toString().replaceAll("<T>", ""));
-                    mGenericAdapterFieldMap.put(classInfo.getType().toString().replaceAll("<T>", ""), qualifiedTypeAdapterName);
-                }
 
                 /*
                  *  This is used to generate the code if the class has type arguments, or it is parameterized.
@@ -332,17 +328,6 @@ private TypeSpec getAdapterFactorySpec() {
             String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
             if (null != knownTypeAdapterForType) {
                 fieldName += knownTypeAdapterForType;
-            } else if (mUnknownAdapterFieldMap.get(classInfo.getType().toString()) != null) {
-                String outerClassType = TypeUtils.getOuterClassType(classInfo.getType());
-                TypeMirror firstTypeArgument = getFirstTypeArgument(classInfo);
-                String outerAdapter = FileGenUtils.unescapeEscapedString(outerClassType);
-                String firstTypeString = firstTypeArgument != null ? firstTypeArgument.toString() : null;
-                if (firstTypeString != null && mGenericAdapterFieldMap.get(outerAdapter) != null) {
-                    String innerAdapter = FileGenUtils.unescapeEscapedString(firstTypeString);
-                    getAdapterMethodBuilder.addStatement(fieldName + " = new " + mGenericAdapterFieldMap.get(outerAdapter) + "(gson, this, get" + mFieldNameMap.get(innerAdapter) + "(gson))");
-                } else {
-                    getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
-                }
             } else {
                 getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
             }
@@ -358,9 +343,9 @@ private TypeSpec getAdapterFactorySpec() {
 
             TypeName typeName = TypeVariableName.get(fieldType);
             TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-            String variableName = "m" + generateNameFromType(fieldType);
+            String variableName = "m" + generateNameFromType(fieldType, true);
             FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType))
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType, true))
                     .addModifiers(Modifier.PUBLIC)
                     .addParameter(Gson.class, "gson")
                     .returns(parameterizedTypeName);
@@ -372,6 +357,27 @@ private TypeSpec getAdapterFactorySpec() {
             adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
         }
 
+        Set<Map.Entry<String, String>> entries1 = mGenericAdapterFieldMap.entrySet();
+        for (Map.Entry<String, String> entry : entries1) {
+            String fieldType = entry.getKey();
+            String adapterCode = entry.getValue();
+
+            TypeName typeName = TypeVariableName.get(fieldType);
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            String variableName = "m" + generateNameFromType(fieldType, false);
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType, false))
+                    .addModifiers(Modifier.PUBLIC)
+                    .addParameter(Gson.class, "gson")
+                    .returns(parameterizedTypeName);
+            getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
+            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode, "$");
+            getAdapterMethodBuilder.endControlFlow();
+            getAdapterMethodBuilder.addStatement("return " + variableName);
+            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+        }
+
         createMethodBuilder.addStatement("return null");
         adapterFactoryBuilder.addMethod(createMethodBuilder.build());
 
@@ -419,17 +425,19 @@ String addConcreteFieldType(@NotNull TypeMirror fieldType, @NotNull String adapt
         if (!mConcreteAdapterFieldMap.containsKey(fieldType.toString())) {
             mConcreteAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
         }
-        return "get" + generateNameFromType(fieldType.toString());
+        return "get" + generateNameFromType(fieldType.toString(), true);
     }
 
-    @Nullable
-    private TypeMirror getFirstTypeArgument(ClassInfo classInfo) {
-        List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
-        return typeArguments != null && typeArguments.size() == 1 ? typeArguments.get(0) : null;
+    @NotNull
+    String addGenericFieldType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
+        if (!mGenericAdapterFieldMap.containsKey(fieldType.toString())) {
+            mGenericAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
+        }
+        return "get" + generateNameFromType(fieldType.toString(), false);
     }
 
     @NotNull
-    private String generateNameFromType(@NotNull String name) {
+    private String generateNameFromType(@NotNull String name, boolean isArray) {
         name = name.replaceAll("\\[", "").replaceAll("\\]", "");
         StringBuilder fieldNameBuilder = new StringBuilder();
         boolean makeCapital = true;
@@ -442,7 +450,9 @@ private String generateNameFromType(@NotNull String name) {
                 makeCapital = false;
             }
         }
-        return fieldNameBuilder.toString() + "Array";
+
+        String result = fieldNameBuilder.toString();
+        return isArray ? result + "Array" : result;
     }
 
     static class GenericClassInfo {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 54faba66..c08584dc 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -67,8 +67,6 @@
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
-    private static final String STAG_FACTORY_PREFIX = "mStagFactory";
-    private static final String TYPE_FIELD_PREFIX = "mType";
     private static boolean mGsonVariableUsed;
     private static boolean mStagFactoryUsed;
     @NotNull
@@ -200,7 +198,7 @@ static boolean isArray(@Nullable TypeMirror type) {
                 outerClassType.equals(Collection.class.getName());
     }
 
-    static boolean isNativeObject(@Nullable TypeMirror type) {
+    private static boolean isNativeObject(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
         }
@@ -327,7 +325,6 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-
     private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                                    @NotNull MethodSpec.Builder constructorBuilder,
                                                    @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
@@ -437,6 +434,22 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
+            } else if (fieldType instanceof DeclaredType) {
+                DeclaredType declaredType = (DeclaredType) fieldType;
+                TypeMirror outerClass = declaredType.asElement().asType();
+                String outerClassString = outerClass.toString();
+                int idx = outerClassString.indexOf("<");
+                if (idx > 0) {
+                    outerClassString = outerClassString.substring(0, idx);
+                }
+                List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+                String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + "(gson, this, ";
+                for (TypeMirror typeMirror : typeArguments) {
+                    adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
+                            , stagGenerator, adapterFieldInfo);
+                }
+                adapterCode += ")";
+                return "mStagFactory." + stagGenerator.addGenericFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;

From 99b4f99849578c49fc1915bfbced98d763fd32d6 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 20:21:39 +0530
Subject: [PATCH 058/159] added typeadapters for jsonobject, jsonarray and
 jsonelement

---
 .../generators/TypeAdapterGenerator.java      |  30 ++--
 .../utils/KnownTypeAdapterUtils.java          |  34 ++--
 .../com/vimeo/stag/KnownTypeAdapters.java     | 150 +++++++++++++++++-
 3 files changed, 194 insertions(+), 20 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index c08584dc..cefbe17d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -24,6 +24,9 @@
 package com.vimeo.stag.processor.generators;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -77,23 +80,21 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
     }
 
     @Nullable
-    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType,
-                                                          @NotNull Map<TypeVariable, String> typeVarsMap,
+    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
                                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
                 result = " com.google.gson.reflect.TypeToken.get(" + typeVarsMap.get(fieldType) + ")";
             } else if (fieldType instanceof DeclaredType) {
-                /**
+                /*
                  * If it is of ParameterizedType, {@link com.vimeo.stag.utils.ParameterizedTypeUtil} is used to get the
                  * type token of the parameter type.
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                result = "com.google.gson.reflect.TypeToken.getParameterized(" +
-                        declaredFieldType.asElement().toString() + ".class";
-                /**
+                result = "com.google.gson.reflect.TypeToken.getParameterized(" + declaredFieldType.asElement().toString() + ".class";
+                /*
                  * Iterate through all the types from the typeArguments and generate type token code accordingly
                  */
                 for (TypeMirror parameterTypeMirror : typeMirrors) {
@@ -102,8 +103,7 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
                     } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
                         result += ", " + typeVarsMap.get(parameterTypeMirror);
                     } else {
-                        result += ",\n" + getTypeTokenCodeForUnknownTypes(parameterTypeMirror, typeVarsMap,
-                                typeTokenConstantsGenerator) + ".getType()";
+                        result += ",\n" + getTypeTokenCodeForUnknownTypes(parameterTypeMirror, typeVarsMap, typeTokenConstantsGenerator) + ".getType()";
                     }
                 }
                 result += ")";
@@ -115,7 +115,6 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
         return result;
     }
 
-
     @Nullable
     private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
                                            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
@@ -206,6 +205,16 @@ private static boolean isNativeObject(@Nullable TypeMirror type) {
         return outerClassType.equals(Object.class.getName());
     }
 
+    private static boolean isJsonElement(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(JsonElement.class.getName())
+                || outerClassType.equals(JsonObject.class.getName())
+                || outerClassType.equals(JsonArray.class.getName());
+    }
+
     static boolean isMap(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -434,6 +443,9 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
+            } else if (isJsonElement(fieldType)) {
+                String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
+                return adapterCode != null ? "mStagFactory." + stagGenerator.addConcreteFieldType(fieldType, adapterCode) + "(mGson)" : "";
             } else if (fieldType instanceof DeclaredType) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 TypeMirror outerClass = declaredType.asElement().asType();
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 4c7be233..f071f860 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -1,12 +1,12 @@
 package com.vimeo.stag.processor.utils;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.vimeo.stag.KnownTypeAdapters;
+import com.google.gson.JsonObject;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -71,27 +71,27 @@ public static String getKnownTypeAdapterForType(String type) {
     @NotNull
     public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType)typeMirror : null;
+        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
         TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null && !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments().get(0) : null;
         String postFix = valueType != null ? "<" + valueType.toString() + ">()" : "()";
         if (outerClassType.equals(ArrayList.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater" + postFix;
         } else if (outerClassType.equals(List.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.ListInstantiater"  + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.ListInstantiater" + postFix;
         } else if (outerClassType.equals(Collection.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater"  + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater" + postFix;
         } else {
-            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater"  + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater" + postFix;
         }
     }
 
     @NotNull
     public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType)typeMirror : null;
-        TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2? declaredType.getTypeArguments().get(0) : null;
+        DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
+        TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(0) : null;
         TypeMirror paramType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(1) : null;
-        String postFix = keyType != null ? "<" + keyType.toString() + ", " +  paramType.toString() + ">()" : "()";
+        String postFix = keyType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
 
         if (outerClassType.equals(Map.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiater" + postFix;
@@ -109,7 +109,7 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
     @Nullable
     public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType+ "[size]; } }";
+        return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType + "[size]; } }";
     }
 
     @Nullable
@@ -126,4 +126,18 @@ public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror type
         }
         return null;
     }
+
+    @Nullable
+    public static String getJsonElementTypeAdapter(@NotNull TypeMirror typeMirror) {
+        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
+        System.out.println(outerClassType);
+        if (outerClassType.equals(JsonElement.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.JsonElementTypeAdapter";
+        } else if (outerClassType.equals(JsonArray.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.JsonArrayTypeAdapter";
+        } else if (outerClassType.equals(JsonObject.class.getName())) {
+            return "com.vimeo.stag.KnownTypeAdapters.JsonObjectTypeAdapter";
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index d19e069d..334fdb55 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -1,11 +1,15 @@
 package com.vimeo.stag;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.JsonReaderInternalAccess;
+import com.google.gson.internal.LazilyParsedNumber;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
@@ -28,6 +32,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
+
 public class KnownTypeAdapters {
 
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
@@ -173,7 +179,7 @@ public T[] read(JsonReader reader) throws IOException {
                 reader.nextNull();
                 return null;
             }
-            if (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {
+            if (reader.peek() != BEGIN_OBJECT) {
                 reader.skipValue();
                 return null;
             }
@@ -616,4 +622,146 @@ public void write(JsonWriter out, Object value) throws IOException {
             typeAdapter.write(out, value);
         }
     }
+
+    public static final class JsonObjectTypeAdapter extends TypeAdapter<JsonObject> {
+
+        @Override
+        public void write(JsonWriter out, JsonObject value) throws IOException {
+            if (value == null || value.isJsonNull()) {
+                out.nullValue();
+            } else {
+                out.beginObject();
+                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
+                    out.name(e.getKey());
+                    write(out, (JsonObject) e.getValue());
+                }
+                out.endObject();
+            }
+        }
+
+        @Override
+        public JsonObject read(JsonReader in) throws IOException {
+            JsonToken token = in.peek();
+            switch (token) {
+                case BEGIN_OBJECT:
+                    JsonObject object = new JsonObject();
+                    in.beginObject();
+                    while (in.hasNext()) {
+                        object.add(in.nextName(), read(in));
+                    }
+                    in.endObject();
+                    return object;
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    public static final class JsonArrayTypeAdapter extends TypeAdapter<JsonArray> {
+
+        @Override
+        public void write(JsonWriter out, JsonArray value) throws IOException {
+            if (value == null || value.isJsonNull()) {
+                out.nullValue();
+            } else {
+                out.beginArray();
+                for (JsonElement e : value.getAsJsonArray()) {
+                    write(out, (JsonArray) e);
+                }
+                out.endArray();
+            }
+        }
+
+        @Override
+        public JsonArray read(JsonReader in) throws IOException {
+            JsonToken token = in.peek();
+            switch (token) {
+                case BEGIN_ARRAY:
+                    JsonArray array = new JsonArray();
+                    in.beginArray();
+                    while (in.hasNext()) {
+                        array.add(read(in));
+                    }
+                    in.endArray();
+                    return array;
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    public static final class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
+
+        @Override
+        public JsonElement read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case STRING:
+                    return new JsonPrimitive(in.nextString());
+                case NUMBER:
+                    String number = in.nextString();
+                    return new JsonPrimitive(new LazilyParsedNumber(number));
+                case BOOLEAN:
+                    return new JsonPrimitive(in.nextBoolean());
+                case NULL:
+                    in.nextNull();
+                    return JsonNull.INSTANCE;
+                case BEGIN_ARRAY:
+                    JsonArray array = new JsonArray();
+                    in.beginArray();
+                    while (in.hasNext()) {
+                        array.add(read(in));
+                    }
+                    in.endArray();
+                    return array;
+                case BEGIN_OBJECT:
+                    JsonObject object = new JsonObject();
+                    in.beginObject();
+                    while (in.hasNext()) {
+                        object.add(in.nextName(), read(in));
+                    }
+                    in.endObject();
+                    return object;
+                case END_DOCUMENT:
+                case NAME:
+                case END_OBJECT:
+                case END_ARRAY:
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+
+        @Override
+        public void write(JsonWriter out, JsonElement value) throws IOException {
+            if (value == null || value.isJsonNull()) {
+                out.nullValue();
+            } else if (value.isJsonPrimitive()) {
+                JsonPrimitive primitive = value.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    out.value(primitive.getAsNumber());
+                } else if (primitive.isBoolean()) {
+                    out.value(primitive.getAsBoolean());
+                } else {
+                    out.value(primitive.getAsString());
+                }
+
+            } else if (value.isJsonArray()) {
+                out.beginArray();
+                for (JsonElement e : value.getAsJsonArray()) {
+                    write(out, e);
+                }
+                out.endArray();
+
+            } else if (value.isJsonObject()) {
+                out.beginObject();
+                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
+                    out.name(e.getKey());
+                    write(out, e.getValue());
+                }
+                out.endObject();
+
+            } else {
+                throw new IllegalArgumentException("Couldn't write " + value.getClass());
+            }
+        }
+    }
 }
\ No newline at end of file

From bffa857eaf238f802ddc062790c2d76f8e207afc Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 20:40:50 +0530
Subject: [PATCH 059/159] support for ArrayMap , and v4 ArrayMap

---
 .../stag/processor/generators/TypeAdapterGenerator.java   | 3 +++
 .../vimeo/stag/processor/utils/KnownTypeAdapterUtils.java | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index cefbe17d..b40e7b72 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -223,6 +223,8 @@ static boolean isMap(@Nullable TypeMirror type) {
         return outerClassType.equals(Map.class.getName()) ||
                 outerClassType.equals(HashMap.class.getName()) ||
                 outerClassType.equals(ConcurrentHashMap.class.getName()) ||
+                outerClassType.equals("android.util.ArrayMap") ||
+                outerClassType.equals("android.support.v4.util.ArrayMap") ||
                 outerClassType.equals(LinkedHashMap.class.getName());
     }
 
@@ -421,6 +423,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                  /*
                   * If the fieldType is of type Map
                   */
+                System.out.println(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 TypeMirror keyType = declaredType.getTypeArguments().get(0);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index f071f860..929c4ebe 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -102,7 +102,13 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater" + postFix;
         } else {
-            return "new com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater" + postFix;
+            return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">>() " +
+                    "{ " +
+                    "\n@Override " +
+                    "\npublic " + outerClassType + " construct() {" +
+                    "\n\treturn new " + outerClassType + "(); " +
+                    "\n}" +
+                    "}";
         }
     }
 

From cb58076f0e778e144a58c23ba550de68f71ca791 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 21:17:02 +0530
Subject: [PATCH 060/159] fixes where gson , and stag was not being used as
 member variables

---
 .../generators/TypeAdapterGenerator.java      | 37 +++++++++++++------
 .../utils/KnownTypeAdapterUtils.java          |  6 +--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index b40e7b72..699bcc04 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -36,6 +36,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import com.vimeo.stag.UseStag;
 import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
@@ -447,24 +448,36 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else if (isJsonElement(fieldType)) {
+                mGsonVariableUsed = true;
+                mStagFactoryUsed = true;
                 String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
                 return adapterCode != null ? "mStagFactory." + stagGenerator.addConcreteFieldType(fieldType, adapterCode) + "(mGson)" : "";
             } else if (fieldType instanceof DeclaredType) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
+                int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
-                String outerClassString = outerClass.toString();
-                int idx = outerClassString.indexOf("<");
-                if (idx > 0) {
-                    outerClassString = outerClassString.substring(0, idx);
-                }
-                List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
-                String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + "(gson, this, ";
-                for (TypeMirror typeMirror : typeArguments) {
-                    adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
-                            , stagGenerator, adapterFieldInfo);
+                if (size != 0 && outerClass.getAnnotation(UseStag.class) != null) {
+                    mGsonVariableUsed = true;
+                    mStagFactoryUsed = true;
+                    String outerClassString = outerClass.toString();
+                    int idx = outerClassString.indexOf("<");
+                    if (idx > 0) {
+                        outerClassString = outerClassString.substring(0, idx);
+                    }
+                    List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+                    String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + "(gson, this, ";
+                    for (TypeMirror typeMirror : typeArguments) {
+                        adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
+                                , stagGenerator, adapterFieldInfo);
+                    }
+                    adapterCode += ")";
+                    return "mStagFactory." + stagGenerator.addGenericFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
+                } else {
+                    getterField = stagGenerator.addFieldType(fieldType);
+                    mGsonVariableUsed = true;
+                    mStagFactoryUsed = true;
+                    return "mStagFactory." + "get" + getterField + "(mGson)";
                 }
-                adapterCode += ")";
-                return "mStagFactory." + stagGenerator.addGenericFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
             } else {
                 getterField = stagGenerator.addFieldType(fieldType);
                 mGsonVariableUsed = true;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 929c4ebe..060a2730 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -138,11 +138,11 @@ public static String getJsonElementTypeAdapter(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         System.out.println(outerClassType);
         if (outerClassType.equals(JsonElement.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.JsonElementTypeAdapter";
+            return "new com.vimeo.stag.KnownTypeAdapters.JsonElementTypeAdapter()";
         } else if (outerClassType.equals(JsonArray.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.JsonArrayTypeAdapter";
+            return "new com.vimeo.stag.KnownTypeAdapters.JsonArrayTypeAdapter()";
         } else if (outerClassType.equals(JsonObject.class.getName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.JsonObjectTypeAdapter";
+            return "new com.vimeo.stag.KnownTypeAdapters.JsonObjectTypeAdapter()";
         }
         return null;
     }

From 1f52aca0492d45e54b56d7b9ae87d14260407286 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 22 Dec 2016 23:03:24 +0530
Subject: [PATCH 061/159] handing the case where the generic class was not
 annotated with useStag, and since it was generic , code was getting created
 with its typeadapter which is not present

---
 .../vimeo/stag/processor/generators/StagGenerator.java   | 9 +++++++--
 .../stag/processor/generators/TypeAdapterGenerator.java  | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 0eadc173..fa63d7ce 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -102,10 +102,12 @@ public class StagGenerator {
     private final HashMap<String, GenericClassInfo> mGenericClassInfo = new HashMap<>();
     @NotNull
     private final String mGeneratedPackageName;
+    private final Set<TypeMirror> mKnownTypes;
 
     public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                          @NotNull Set<TypeMirror> knownTypes) {
         mFiler = filer;
+        mKnownTypes = knownTypes;
         mGeneratedPackageName = generatedPackageName;
         mKnownClasses = new ArrayList<>(knownTypes.size());
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
@@ -143,6 +145,10 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
     }
 
+    public Set<TypeMirror> getKnownTypes() {
+        return mKnownTypes;
+    }
+
     private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return true;
@@ -451,8 +457,7 @@ private String generateNameFromType(@NotNull String name, boolean isArray) {
             }
         }
 
-        String result = fieldNameBuilder.toString();
-        return isArray ? result + "Array" : result;
+        return isArray ? fieldNameBuilder.toString() + "Array" : fieldNameBuilder.toString();
     }
 
     static class GenericClassInfo {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 699bcc04..c38a0ad1 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -424,7 +424,6 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                  /*
                   * If the fieldType is of type Map
                   */
-                System.out.println(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 TypeMirror keyType = declaredType.getTypeArguments().get(0);
@@ -456,7 +455,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
-                if (size != 0 && outerClass.getAnnotation(UseStag.class) != null) {
+                if (size != 0&& stagGenerator.getKnownTypes().contains(outerClass)) {
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
                     String outerClassString = outerClass.toString();

From 106dc9c4944006d271eb8ec05763d657ac12d598 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 22 Dec 2016 23:14:23 +0530
Subject: [PATCH 062/159] Handling JsonObject and JsonArray

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 77 +++++++------------
 1 file changed, 27 insertions(+), 50 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 334fdb55..c5ab96a9 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -627,33 +627,16 @@ public static final class JsonObjectTypeAdapter extends TypeAdapter<JsonObject>
 
         @Override
         public void write(JsonWriter out, JsonObject value) throws IOException {
-            if (value == null || value.isJsonNull()) {
-                out.nullValue();
-            } else {
-                out.beginObject();
-                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
-                    out.name(e.getKey());
-                    write(out, (JsonObject) e.getValue());
-                }
-                out.endObject();
-            }
+            JsonElementTypeAdapter.writeJsonElement(out, value);
         }
 
         @Override
         public JsonObject read(JsonReader in) throws IOException {
-            JsonToken token = in.peek();
-            switch (token) {
-                case BEGIN_OBJECT:
-                    JsonObject object = new JsonObject();
-                    in.beginObject();
-                    while (in.hasNext()) {
-                        object.add(in.nextName(), read(in));
-                    }
-                    in.endObject();
-                    return object;
-                default:
-                    throw new IllegalArgumentException();
+            JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
+            if(null != jsonElement && !jsonElement.isJsonObject()) {
+                throw new IOException("Could not parse it as a JsonObject");
             }
+            return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonObject() : null;
         }
     }
 
@@ -661,39 +644,22 @@ public static final class JsonArrayTypeAdapter extends TypeAdapter<JsonArray> {
 
         @Override
         public void write(JsonWriter out, JsonArray value) throws IOException {
-            if (value == null || value.isJsonNull()) {
-                out.nullValue();
-            } else {
-                out.beginArray();
-                for (JsonElement e : value.getAsJsonArray()) {
-                    write(out, (JsonArray) e);
-                }
-                out.endArray();
-            }
+            JsonElementTypeAdapter.writeJsonElement(out, value);
         }
 
         @Override
         public JsonArray read(JsonReader in) throws IOException {
-            JsonToken token = in.peek();
-            switch (token) {
-                case BEGIN_ARRAY:
-                    JsonArray array = new JsonArray();
-                    in.beginArray();
-                    while (in.hasNext()) {
-                        array.add(read(in));
-                    }
-                    in.endArray();
-                    return array;
-                default:
-                    throw new IllegalArgumentException();
+            JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
+            if(null != jsonElement && !jsonElement.isJsonArray()) {
+                throw new IOException("Could not parse it as a JsonArray");
             }
+            return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonArray() : null;
         }
     }
 
     public static final class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
 
-        @Override
-        public JsonElement read(JsonReader in) throws IOException {
+        public static JsonElement readJsonElement(JsonReader in) throws IOException {
             switch (in.peek()) {
                 case STRING:
                     return new JsonPrimitive(in.nextString());
@@ -709,7 +675,7 @@ public JsonElement read(JsonReader in) throws IOException {
                     JsonArray array = new JsonArray();
                     in.beginArray();
                     while (in.hasNext()) {
-                        array.add(read(in));
+                        array.add(readJsonElement(in));
                     }
                     in.endArray();
                     return array;
@@ -717,7 +683,7 @@ public JsonElement read(JsonReader in) throws IOException {
                     JsonObject object = new JsonObject();
                     in.beginObject();
                     while (in.hasNext()) {
-                        object.add(in.nextName(), read(in));
+                        object.add(in.nextName(), readJsonElement(in));
                     }
                     in.endObject();
                     return object;
@@ -731,7 +697,12 @@ public JsonElement read(JsonReader in) throws IOException {
         }
 
         @Override
-        public void write(JsonWriter out, JsonElement value) throws IOException {
+        public JsonElement read(JsonReader in) throws IOException {
+           return JsonElementTypeAdapter.readJsonElement(in);
+        }
+
+
+        public static void writeJsonElement(JsonWriter out, JsonElement value) throws IOException {
             if (value == null || value.isJsonNull()) {
                 out.nullValue();
             } else if (value.isJsonPrimitive()) {
@@ -747,7 +718,7 @@ public void write(JsonWriter out, JsonElement value) throws IOException {
             } else if (value.isJsonArray()) {
                 out.beginArray();
                 for (JsonElement e : value.getAsJsonArray()) {
-                    write(out, e);
+                    writeJsonElement(out, e);
                 }
                 out.endArray();
 
@@ -755,7 +726,7 @@ public void write(JsonWriter out, JsonElement value) throws IOException {
                 out.beginObject();
                 for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
                     out.name(e.getKey());
-                    write(out, e.getValue());
+                    writeJsonElement(out, e.getValue());
                 }
                 out.endObject();
 
@@ -763,5 +734,11 @@ public void write(JsonWriter out, JsonElement value) throws IOException {
                 throw new IllegalArgumentException("Couldn't write " + value.getClass());
             }
         }
+
+
+        @Override
+        public void write(JsonWriter out, JsonElement value) throws IOException {
+            writeJsonElement(out, value);
+        }
     }
 }
\ No newline at end of file

From 46a60aaf9cfd27b19fb3e3cb0556f42be4f18cae Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 23 Dec 2016 00:40:05 +0530
Subject: [PATCH 063/159] Handling Issue # 27

---
 .../generators/AdapterGenerator.java          | 16 ++++-
 .../java/com/vimeo/stag/GsonAdapterKey.java   | 68 +++++++++++++++++++
 2 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index fcac530e..2326fb7e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -26,6 +26,7 @@
 
 import com.squareup.javapoet.TypeSpec;
 import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -34,12 +35,20 @@
 public abstract class AdapterGenerator {
 
     /**
-     * If the element is not annotated with {@link SerializedName}, the variable name is used.
+     * If the element is not annotated with {@link SerializedName} or {@link GsonAdapterKey}, the variable name is used.
+     * If both of them are used we will give preference to GsonAdapterKey
      */
     @NotNull
     protected static String getJsonName(@NotNull Element element) {
-        String name = (null != element.getAnnotation(SerializedName.class)) ?
-                element.getAnnotation(SerializedName.class).value() : null;
+
+        String name = (null != element.getAnnotation(GsonAdapterKey.class)) ?
+                element.getAnnotation(GsonAdapterKey.class).value() : null;
+
+
+        if (null == name || name.isEmpty()) {
+            name = (null != element.getAnnotation(SerializedName.class)) ?
+                    element.getAnnotation(SerializedName.class).value() : null;
+        }
 
         if (null == name || name.isEmpty()) {
             name = element.getSimpleName().toString();
@@ -47,6 +56,7 @@ protected static String getJsonName(@NotNull Element element) {
         return name;
     }
 
+
     @NotNull
     public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
                                                 @NotNull StagGenerator stagGenerator);
diff --git a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
new file mode 100644
index 00000000..dfb112f0
--- /dev/null
+++ b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
@@ -0,0 +1,68 @@
+/*
+ * The MIT License (MIT)
+ * <p/>
+ * Copyright (c) 2016 Vimeo
+ * <p/>
+ * 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:
+ * <p/>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p/>
+ * 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.
+ */
+package com.vimeo.stag;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Use this annotation to tell Stag that a member variable
+ * or a class should be processed.
+ * <p/>
+ * If a member variable of a class is annotated, Stag will
+ * generate a TypeAdapter for that class. Stag does not generate
+ * TypeAdapters for abstract classes.
+ * <p/>
+ * If the class is generic (class A), but there is a concrete
+ * class (class B) that has annotated members, Stag will generate
+ * a TypeAdapter for the concrete class (class B) that also includes
+ * all the annotated member variables declared in class A.
+ * No adapter for class A will be generated.
+ * <p/>
+ * If a class (class B) has no annotated members, but inherits from a
+ * parent class (class A) with annotated members, Stag will not know to
+ * generate a TypeAdapter for that child class (class B). In that case,
+ * apply the annotation to the child class declaration (class B) and
+ * then Stag will know to generate a TypeAdapter for it. In this case,
+ * the optional value that can be passed in the annotation will be
+ * ignored as it only applies to class fields, not classes themselves.
+ * <p/>
+ * See the sample code for examples of each.
+ */
+@Target({ElementType.FIELD, ElementType.TYPE})
+public @interface GsonAdapterKey {
+
+    /**
+     * The optional value for the JSON key
+     * to which the member variable will be
+     * mapped. If none is supplied, then the
+     * name of the member variable will be
+     * used as the key.
+     *
+     * @return the value for the JSON key
+     * or empty if there is none.
+     */
+    String value() default "";
+
+}
\ No newline at end of file

From e5b4eff6bf0bcec0188628e28dc6543756237293 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 01:11:48 +0530
Subject: [PATCH 064/159] removed WriteRuntimeType annotation code

---
 .../processor/generators/TypeAdapterGenerator.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index c38a0ad1..be8ba8d9 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -36,8 +36,6 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
-import com.vimeo.stag.UseStag;
-import com.vimeo.stag.WriteRuntimeType;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
@@ -455,7 +453,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
-                if (size != 0&& stagGenerator.getKnownTypes().contains(outerClass)) {
+                if (size != 0 && stagGenerator.getKnownTypes().contains(outerClass)) {
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
                     String outerClassString = outerClass.toString();
@@ -553,12 +551,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<E
 
             builder.addStatement("writer.name(\"" + name + "\")");
             if (!isPrimitive) {
-                WriteRuntimeType annotation = element.getKey().getAnnotation(WriteRuntimeType.class);
-                if (annotation != null) {
-                    builder.addStatement("((TypeAdapter) mGson.getAdapter(object." + variableName + ".getClass())).write(writer, object." + variableName + ")");
-                } else {
-                    builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
-                }
+                builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
                 /*
                 * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
                 */

From aa8d11712d450aed0e3ec4847daf85044c0e651e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 11:40:04 +0530
Subject: [PATCH 065/159] Added @UseStag annotation, removed the support for
 class level for @GsonAdapterKey, and added some documentations

---
 .../java/com/vimeo/stag/GsonAdapterKey.java   | 27 ++-----------
 .../src/main/java/com/vimeo/stag/UseStag.java | 38 ++-----------------
 2 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
index dfb112f0..d39ebfe2 100644
--- a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
+++ b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
@@ -27,30 +27,10 @@
 import java.lang.annotation.Target;
 
 /**
- * Use this annotation to tell Stag that a member variable
- * or a class should be processed.
- * <p/>
- * If a member variable of a class is annotated, Stag will
- * generate a TypeAdapter for that class. Stag does not generate
- * TypeAdapters for abstract classes.
- * <p/>
- * If the class is generic (class A), but there is a concrete
- * class (class B) that has annotated members, Stag will generate
- * a TypeAdapter for the concrete class (class B) that also includes
- * all the annotated member variables declared in class A.
- * No adapter for class A will be generated.
- * <p/>
- * If a class (class B) has no annotated members, but inherits from a
- * parent class (class A) with annotated members, Stag will not know to
- * generate a TypeAdapter for that child class (class B). In that case,
- * apply the annotation to the child class declaration (class B) and
- * then Stag will know to generate a TypeAdapter for it. In this case,
- * the optional value that can be passed in the annotation will be
- * ignored as it only applies to class fields, not classes themselves.
- * <p/>
- * See the sample code for examples of each.
+ * An annotation that indicates this member should be serialized to JSON with
+ * the provided name value as its field name.
  */
-@Target({ElementType.FIELD, ElementType.TYPE})
+@Target({ElementType.FIELD})
 public @interface GsonAdapterKey {
 
     /**
@@ -64,5 +44,4 @@
      * or empty if there is none.
      */
     String value() default "";
-
 }
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/UseStag.java b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
index 1d80f685..3ba13443 100644
--- a/stag-library/src/main/java/com/vimeo/stag/UseStag.java
+++ b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
@@ -27,42 +27,12 @@
 import java.lang.annotation.Target;
 
 /**
- * Use this annotation to tell Stag that a member variable
- * or a class should be processed.
+ * Use this annotation to tell Stag that all the member variables of the class should be processed.
  * <p/>
- * If a member variable of a class is annotated, Stag will
- * generate a TypeAdapter for that class. Stag does not generate
- * TypeAdapters for abstract classes.
+ * If the class is annotated, Stag will generate a TypeAdapter for that class.
+ * Stag does not generate TypeAdapters for abstract classes.
  * <p/>
- * If the class is generic (class A), but there is a concrete
- * class (class B) that has annotated members, Stag will generate
- * a TypeAdapter for the concrete class (class B) that also includes
- * all the annotated member variables declared in class A.
- * No adapter for class A will be generated.
- * <p/>
- * If a class (class B) has no annotated members, but inherits from a
- * parent class (class A) with annotated members, Stag will not know to
- * generate a TypeAdapter for that child class (class B). In that case,
- * apply the annotation to the child class declaration (class B) and
- * then Stag will know to generate a TypeAdapter for it. In this case,
- * the optional value that can be passed in the annotation will be
- * ignored as it only applies to class fields, not classes themselves.
- * <p/>
- * See the sample code for examples of each.
  */
 @Target({ElementType.TYPE})
 public @interface UseStag {
-
-    /**
-     * The optional value for the JSON key
-     * to which the member variable will be
-     * mapped. If none is supplied, then the
-     * name of the member variable will be
-     * used as the key.
-     *
-     * @return the value for the JSON key
-     * or empty if there is none.
-     */
-    String value() default "";
-
-}
+}
\ No newline at end of file

From 5c55272e430d67c6a6320edd60c9eae3bfc15262 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 11:40:36 +0530
Subject: [PATCH 066/159] removed the typeadapter for date, and added
 documentation for reference

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 195 +++++++++++-------
 1 file changed, 120 insertions(+), 75 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index c5ab96a9..626d28d7 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * 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.
+ */
 package com.vimeo.stag;
 
 import com.google.gson.Gson;
@@ -13,29 +28,45 @@
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
-import com.google.gson.internal.bind.util.ISO8601Utils;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
 
+/**
+ * This class contains a list of KnownTypeAdapters such as {@link MapTypeAdapter}, {@link ListTypeAdapter} and more.
+ * These type adapters are referenced in the Stag Compiler library, where we generate the code for the type adapters.
+ * If the type is known to us, such as in case of {@link Integer} or {@link JsonArray} or {@link Double} etc, we
+ * directly access the corresponding type adapters and call {@link TypeAdapter#read(JsonReader)} and {@link TypeAdapter#write(JsonWriter, Object)}
+ * respectively.
+ * <p>
+ * --------------------- {@link MapTypeAdapter} -------------------
+ * <p>
+ * In case of {@link MapTypeAdapter}, we need to pass the keyTypeAdapter, valueTypeAdapter and the ObjectConstructor. The keyTypeAdapter, and valueTypeAdapter
+ * are used to read and write keys and values respectively, and the ObjectConstructor tells the type of Map to be instantiated. This will also support the scenario
+ * where we have a nested maps. In that case the valueTypeAdapter will be again a {@link MapTypeAdapter} with its key and value TypeAdapters
+ * <p>
+ * --------------------- {@link ListTypeAdapter} -------------------
+ * <p>
+ * In case of {@link ListTypeAdapter}, we need to pass the valueTypeAdapter and the ObjectConstructor. The valueTypeAdapter
+ * is used to read and write the values, and the ObjectConstructor tells the type of List to be instantiated. This will also support the scenario
+ * where we have a nested list. In that case the valueTypeAdapter will be again a {@link ListTypeAdapter} with its value TypeAdapter
+ */
 public class KnownTypeAdapters {
 
+    /**
+     * Type Adapter for {@link Byte}.
+     */
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
         @Override
         public Byte read(JsonReader in) throws IOException {
@@ -56,6 +87,10 @@ public void write(JsonWriter out, Byte value) throws IOException {
             out.value(value);
         }
     };
+
+    /**
+     * Type Adapter for {@link Short}.
+     */
     public static final TypeAdapter<Short> SHORT = new TypeAdapter<Short>() {
         @Override
         public Short read(JsonReader in) throws IOException {
@@ -76,6 +111,9 @@ public void write(JsonWriter out, Short value) throws IOException {
         }
     };
 
+    /**
+     * Type Adapter for {@link Integer}.
+     */
     public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
         @Override
         public Integer read(JsonReader in) throws IOException {
@@ -95,6 +133,10 @@ public void write(JsonWriter out, Integer value) throws IOException {
             out.value(value);
         }
     };
+
+    /**
+     * Type Adapter for {@link Long}.
+     */
     public static final TypeAdapter<Long> LONG = new TypeAdapter<Long>() {
         @Override
         public Long read(JsonReader in) throws IOException {
@@ -114,6 +156,10 @@ public void write(JsonWriter out, Long value) throws IOException {
             out.value(value);
         }
     };
+
+    /**
+     * Type Adapter for {@link Float}.
+     */
     public static final TypeAdapter<Float> FLOAT = new TypeAdapter<Float>() {
         @Override
         public Float read(JsonReader in) throws IOException {
@@ -129,6 +175,10 @@ public void write(JsonWriter out, Float value) throws IOException {
             out.value(value);
         }
     };
+
+    /**
+     * Type Adapter for {@link Double}.
+     */
     public static final TypeAdapter<Double> DOUBLE = new TypeAdapter<Double>() {
         @Override
         public Double read(JsonReader in) throws IOException {
@@ -154,8 +204,12 @@ public interface PrimitiveArrayConstructor<T> {
         T[] construct(int size);
     }
 
-
-    public static final class ArrayTypeAdapter<T extends Object> extends TypeAdapter<T[]> {
+    /**
+     * Type Adapter for [] types. eg String[] or Integer[].
+     * For primitive array types such as int[], long[] etc, use the next set of adapters
+     * given below
+     */
+    public static final class ArrayTypeAdapter<T> extends TypeAdapter<T[]> {
         TypeAdapter<T> mValueTypeAdapter;
         PrimitiveArrayConstructor<T> mObjectCreator;
 
@@ -213,6 +267,9 @@ public T[] read(JsonReader reader) throws IOException {
 
     }
 
+    /**
+     * Type Adapter for Integer[] type. This can be directly accessed to read and write
+     */
     public static final class PrimitiveIntegerArrayAdapter {
         public static void write(JsonWriter writer, int[] value) throws IOException {
             if (null != value) {
@@ -237,6 +294,9 @@ public static int[] read(JsonReader reader) throws IOException {
         }
     }
 
+    /**
+     * Type Adapter for long[] type. This can be directly accessed to read and write
+     */
     public static final class PrimitiveLongArrayAdapter {
         public static void write(JsonWriter writer, long[] value) throws IOException {
             if (null != value) {
@@ -261,6 +321,9 @@ public static long[] read(JsonReader reader) throws IOException {
         }
     }
 
+    /**
+     * Type Adapter for double[] type. This can be directly accessed to read and write
+     */
     public static final class PrimitiveDoubleArrayAdapter {
         public static void write(JsonWriter writer, double[] value) throws IOException {
             if (null != value) {
@@ -285,6 +348,9 @@ public static double[] read(JsonReader reader) throws IOException {
         }
     }
 
+    /**
+     * Type Adapter for short[] type. This can be directly accessed to read and write
+     */
     public static final class PrimitiveShortArrayAdapter {
         public static void write(JsonWriter writer, short[] value) throws IOException {
             if (null != value) {
@@ -309,62 +375,79 @@ public static short[] read(JsonReader reader) throws IOException {
         }
     }
 
+    /**
+     * Default Instantiater for List, by default it will create the Map of {@link ArrayList} type
+     */
     public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
-
         @Override
         public List<V> construct() {
             return new ArrayList<V>();
         }
     }
 
+    /**
+     * Instantiater for {@link Collection}
+     */
     public static class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
-
         @Override
         public Collection<V> construct() {
             return new ArrayList<V>();
         }
     }
 
+    /**
+     * Instantiater for {@link ArrayList}
+     */
     public static class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
-
         @Override
         public ArrayList<V> construct() {
             return new ArrayList<V>();
         }
     }
 
+    /**
+     * Instantiater for {@link HashMap}
+     */
     public static class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
-
         @Override
         public HashMap<K, V> construct() {
             return new HashMap<K, V>();
         }
     }
 
+    /**
+     * Instantiater for {@link ConcurrentHashMap}
+     */
     public static class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
-
         @Override
         public ConcurrentHashMap<K, V> construct() {
             return new ConcurrentHashMap<K, V>();
         }
     }
 
+    /**
+     * Instantiater for {@link LinkedHashMap}
+     */
     public static class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
-
         @Override
         public LinkedHashMap<K, V> construct() {
             return new LinkedHashMap<K, V>();
         }
     }
 
+    /**
+     * Default Instantiater for Maps, by default it will create the Map of {@link LinkedHashMap} type
+     */
     public static class MapInstantiater<K, V> implements ObjectConstructor<Map<K, V>> {
-
         @Override
         public Map<K, V> construct() {
             return new LinkedHashMap<K, V>();
         }
     }
 
+    /**
+     * Type Adapter for {@link Collection}
+     */
     public static class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
 
         private TypeAdapter<V> valueTypeAdapter;
@@ -401,6 +484,10 @@ public T read(JsonReader reader) throws IOException {
         }
     }
 
+    /**
+     * Type Adapter for {@link Map}. The constructor expects {@link ObjectConstructor} which is
+     * used to instantiate maps of particular types eg, {@link HashMap} {@link LinkedHashMap} etc
+     */
     public static class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
         private ObjectConstructor<T> objectConstructor;
         private TypeAdapter<V> valueTypeAdapter;
@@ -504,58 +591,9 @@ private String keyToString(JsonElement keyElement) {
         }
     }
 
-    private static final class DateTypeAdapter extends TypeAdapter<Date> {
-        private final DateFormat enUsFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.US);
-        private final DateFormat localFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);
-
-        @Override
-        public Date read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            return deserializeToDate(in.nextString());
-        }
-
-        private synchronized Date deserializeToDate(String json) {
-            try {
-                return localFormat.parse(json);
-            } catch (ParseException ignored) {
-            }
-            try {
-                return enUsFormat.parse(json);
-            } catch (ParseException ignored) {
-            }
-            try {
-                return ISO8601Utils.parse(json, new ParsePosition(0));
-            } catch (ParseException e) {
-                throw new JsonSyntaxException(json, e);
-            }
-        }
-
-        @Override
-        public synchronized void write(JsonWriter out, Date value) throws IOException {
-            if (value == null) {
-                out.nullValue();
-                return;
-            }
-            String dateFormatAsString = enUsFormat.format(value);
-            out.value(dateFormatAsString);
-        }
-    }
-
-    public static final class DATE_TYPE_ADAPTER {
-        static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
-
-        public static void write(JsonWriter writer, Date value) throws IOException {
-            dateTypeAdapter.write(writer, value);
-        }
-
-        public static Date read(JsonReader reader) throws IOException {
-            return dateTypeAdapter.read(reader);
-        }
-    }
-
+    /**
+     * Type Adapter for {@link Object}
+     */
     public static final class ObjectTypeAdapter extends TypeAdapter<Object> {
 
         private final Gson gson;
@@ -623,6 +661,9 @@ public void write(JsonWriter out, Object value) throws IOException {
         }
     }
 
+    /**
+     * Type Adapter for {@link JsonObject}
+     */
     public static final class JsonObjectTypeAdapter extends TypeAdapter<JsonObject> {
 
         @Override
@@ -633,13 +674,16 @@ public void write(JsonWriter out, JsonObject value) throws IOException {
         @Override
         public JsonObject read(JsonReader in) throws IOException {
             JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
-            if(null != jsonElement && !jsonElement.isJsonObject()) {
+            if (null != jsonElement && !jsonElement.isJsonObject()) {
                 throw new IOException("Could not parse it as a JsonObject");
             }
             return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonObject() : null;
         }
     }
 
+    /**
+     * Type Adapter for {@link JsonArray}
+     */
     public static final class JsonArrayTypeAdapter extends TypeAdapter<JsonArray> {
 
         @Override
@@ -650,13 +694,16 @@ public void write(JsonWriter out, JsonArray value) throws IOException {
         @Override
         public JsonArray read(JsonReader in) throws IOException {
             JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
-            if(null != jsonElement && !jsonElement.isJsonArray()) {
+            if (null != jsonElement && !jsonElement.isJsonArray()) {
                 throw new IOException("Could not parse it as a JsonArray");
             }
             return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonArray() : null;
         }
     }
 
+    /**
+     * Type Adapter for {@link JsonElement}
+     */
     public static final class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
 
         public static JsonElement readJsonElement(JsonReader in) throws IOException {
@@ -696,12 +743,6 @@ public static JsonElement readJsonElement(JsonReader in) throws IOException {
             }
         }
 
-        @Override
-        public JsonElement read(JsonReader in) throws IOException {
-           return JsonElementTypeAdapter.readJsonElement(in);
-        }
-
-
         public static void writeJsonElement(JsonWriter out, JsonElement value) throws IOException {
             if (value == null || value.isJsonNull()) {
                 out.nullValue();
@@ -735,6 +776,10 @@ public static void writeJsonElement(JsonWriter out, JsonElement value) throws IO
             }
         }
 
+        @Override
+        public JsonElement read(JsonReader in) throws IOException {
+            return JsonElementTypeAdapter.readJsonElement(in);
+        }
 
         @Override
         public void write(JsonWriter out, JsonElement value) throws IOException {

From 4ed8100c96246c2cc79effc410f466e356aa7069 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 11:57:42 +0530
Subject: [PATCH 067/159] moved the helper classes to TypeUtils

---
 .../generators/TypeAdapterGenerator.java      | 104 +++---------------
 .../vimeo/stag/processor/utils/TypeUtils.java |  92 +++++++++++++++-
 2 files changed, 103 insertions(+), 93 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index be8ba8d9..480aa9dd 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -24,12 +24,10 @@
 package com.vimeo.stag.processor.generators;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
@@ -49,13 +47,10 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -97,7 +92,7 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
                  * Iterate through all the types from the typeArguments and generate type token code accordingly
                  */
                 for (TypeMirror parameterTypeMirror : typeMirrors) {
-                    if (isSupportedNative(parameterTypeMirror.toString())) {
+                    if (TypeUtils.isSupportedNative(parameterTypeMirror.toString())) {
                         result += ", " + parameterTypeMirror.toString() + ".class";
                     } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
                         result += ", " + typeVarsMap.get(parameterTypeMirror);
@@ -128,11 +123,11 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                if (isMap(fieldType)) {
+                if (TypeUtils.isSupportedMap(fieldType)) {
                     TypeMirror keyTypeMirror = typeMirrors.get(0);
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
-                    if (isSupportedNative(keyTypeMirror.toString())) {
-                        if (isMap(valueTypeMirror)) {
+                    if (TypeUtils.isSupportedNative(keyTypeMirror.toString())) {
+                        if (TypeUtils.isSupportedMap(valueTypeMirror)) {
                             /*
                              * If it is a nested map, cases where the value is also a map, recursively call the function to
                              * gets its type adapter
@@ -147,9 +142,9 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
                         result = "com.google.gson.reflect.TypeToken.getParameterized(" +
                                 declaredFieldType.asElement().toString() + ".class";
                     }
-                } else if (isArray(fieldType)) {
+                } else if (TypeUtils.isSupportedCollection(fieldType)) {
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
-                    if (isArray(valueTypeMirror)) {
+                    if (TypeUtils.isSupportedCollection(valueTypeMirror)) {
                         /*
                          * If it is a nested list, cases where the value is also a List, recursively call the function to
                          * gets its type adapter
@@ -168,64 +163,6 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
         return result;
     }
 
-    static boolean isSupportedPrimitive(@NotNull String type) {
-        return type.equals(long.class.getName())
-                || type.equals(double.class.getName())
-                || type.equals(boolean.class.getName())
-                || type.equals(float.class.getName())
-                || type.equals(int.class.getName())
-                || type.equals(char.class.getName())
-                || type.equals(short.class.getName())
-                || type.equals(byte.class.getName());
-    }
-
-    private static boolean isNativeArray(@NotNull TypeMirror type) {
-        return (type instanceof ArrayType);
-    }
-
-    static boolean isArray(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        if (isNativeArray(type)) {
-            return true;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(ArrayList.class.getName()) ||
-                outerClassType.equals(List.class.getName()) ||
-                outerClassType.equals(Collection.class.getName());
-    }
-
-    private static boolean isNativeObject(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(Object.class.getName());
-    }
-
-    private static boolean isJsonElement(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(JsonElement.class.getName())
-                || outerClassType.equals(JsonObject.class.getName())
-                || outerClassType.equals(JsonArray.class.getName());
-    }
-
-    static boolean isMap(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(Map.class.getName()) ||
-                outerClassType.equals(HashMap.class.getName()) ||
-                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
-                outerClassType.equals("android.util.ArrayMap") ||
-                outerClassType.equals("android.support.v4.util.ArrayMap") ||
-                outerClassType.equals(LinkedHashMap.class.getName());
-    }
 
     @NotNull
     private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
@@ -233,16 +170,6 @@ private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
         return ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
     }
 
-    static boolean isSupportedNative(@NotNull String type) {
-        return isSupportedPrimitive(type)
-                || type.equals(String.class.getName())
-                || type.equals(Long.class.getName())
-                || type.equals(Integer.class.getName())
-                || type.equals(Boolean.class.getName())
-                || type.equals(Double.class.getName())
-                || type.equals(Float.class.getName())
-                || type.equals(Number.class.getName());
-    }
 
     @NotNull
     private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
@@ -293,7 +220,7 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
                 @Override
                 public void run() {
-                    if (!isSupportedPrimitive(elementValue.toString())) {
+                    if (!TypeUtils.isSupportedPrimitive(elementValue.toString())) {
                         nonNullFields.add(variableName);
                     }
                 }
@@ -374,12 +301,12 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
                 return "mStagFactory.get" + getterField + "(mGson)";
-            } else if (isNativeArray(fieldType)) {
+            } else if (TypeUtils.isNativeArray(fieldType)) {
                 /*
                  * If the fieldType is of type native arrays such as String[] or int[]
                  */
                 TypeMirror arrayInnerType = getArrayInnerType(fieldType);
-                if (isSupportedPrimitive(arrayInnerType.toString())) {
+                if (TypeUtils.isSupportedPrimitive(arrayInnerType.toString())) {
                     return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
                 } else {
                     mStagFactoryUsed = true;
@@ -397,7 +324,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                         return adapterCode;
                     }
                 }
-            } else if (isArray(fieldType)) {
+            } else if (TypeUtils.isSupportedCollection(fieldType)) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 /*
                  * If the fieldType is of type List
@@ -416,7 +343,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 } else {
                     return adapterCode;
                 }
-            } else if (isMap(fieldType)) {
+            } else if (TypeUtils.isSupportedMap(fieldType)) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
 
                  /*
@@ -439,12 +366,12 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 } else {
                     return adapterCode;
                 }
-            } else if (isNativeObject(fieldType)) {
+            } else if (TypeUtils.isNativeObject(fieldType)) {
                 mGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
-            } else if (isJsonElement(fieldType)) {
+            } else if (TypeUtils.isJsonElement(fieldType)) {
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
@@ -542,7 +469,7 @@ private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<E
             final String variableName = element.getKey().getSimpleName().toString();
             String variableType = element.getValue().toString();
 
-            boolean isPrimitive = isSupportedPrimitive(variableType);
+            boolean isPrimitive = TypeUtils.isSupportedPrimitive(variableType);
 
             builder.addCode("\n");
             if (!isPrimitive) {
@@ -595,6 +522,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
 
         TypeVariableName stagFactoryTypeName = stagGenerator.getGeneratedClassName();
         MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder()
+                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build())
                 .addModifiers(Modifier.PUBLIC)
                 .addParameter(Gson.class, "gson")
                 .addParameter(stagFactoryTypeName, "stagFactory");
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index ad4cedd3..545b29a7 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -23,18 +23,26 @@
  */
 package com.vimeo.stag.processor.utils;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -151,7 +159,6 @@ public static boolean isParameterizedType(@Nullable Element element) {
      * contains no generic type arguments, false otherwise.
      */
     public static boolean isConcreteType(@NotNull TypeMirror typeMirror) {
-
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return false;
         }
@@ -297,7 +304,7 @@ public static Map<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror co
                     map.put(member.getKey(), declaredType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                                      " resolved to - " + declaredType.toString());
+                            " resolved to - " + declaredType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -305,7 +312,7 @@ public static Map<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror co
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                                      " resolved to - " + concreteType.toString());
+                            " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -340,7 +347,6 @@ private static List<TypeMirror> getMemberTypes(@NotNull TypeMirror element) {
         }
 
         // if the type is not parameterized, we will return an empty list
-
         return genericTypes;
     }
 
@@ -353,5 +359,81 @@ private static List<? extends TypeMirror> getParameterizedTypes(@NotNull Element
     private static List<? extends TypeMirror> getParameterizedTypes(@NotNull TypeMirror typeMirror) {
         return ((DeclaredType) typeMirror).getTypeArguments();
     }
-}
 
+    public static boolean isSupportedPrimitive(@NotNull String type) {
+        return type.equals(long.class.getName())
+                || type.equals(double.class.getName())
+                || type.equals(boolean.class.getName())
+                || type.equals(float.class.getName())
+                || type.equals(int.class.getName())
+                || type.equals(char.class.getName())
+                || type.equals(short.class.getName())
+                || type.equals(byte.class.getName());
+    }
+
+    public static boolean isNativeArray(@NotNull TypeMirror type) {
+        return (type instanceof ArrayType);
+    }
+
+    public static boolean isSupportedCollection(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        if (isNativeArray(type)) {
+            return true;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return isSupportedList(type) || outerClassType.equals(Collection.class.getName());
+    }
+
+    private static boolean isSupportedList(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(ArrayList.class.getName()) ||
+                outerClassType.equals(List.class.getName());
+    }
+
+    public static boolean isNativeObject(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(Object.class.getName());
+    }
+
+    public static boolean isJsonElement(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(JsonElement.class.getName())
+                || outerClassType.equals(JsonObject.class.getName())
+                || outerClassType.equals(JsonArray.class.getName());
+    }
+
+    public static boolean isSupportedMap(@Nullable TypeMirror type) {
+        if (type == null) {
+            return false;
+        }
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        return outerClassType.equals(Map.class.getName()) ||
+                outerClassType.equals(HashMap.class.getName()) ||
+                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
+                outerClassType.equals("android.util.ArrayMap") ||
+                outerClassType.equals("android.support.v4.util.ArrayMap") ||
+                outerClassType.equals(LinkedHashMap.class.getName());
+    }
+
+    public static boolean isSupportedNative(@NotNull String type) {
+        return isSupportedPrimitive(type)
+                || type.equals(String.class.getName())
+                || type.equals(Long.class.getName())
+                || type.equals(Integer.class.getName())
+                || type.equals(Boolean.class.getName())
+                || type.equals(Double.class.getName())
+                || type.equals(Float.class.getName())
+                || type.equals(Number.class.getName());
+    }
+}
\ No newline at end of file

From 0def9bcab06a96a8efca6621eae5b3357dc17540 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 12:01:09 +0530
Subject: [PATCH 068/159] removed the typeadapter for registering date

---
 .../com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 060a2730..5c11b39c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -60,7 +60,6 @@ public class KnownTypeAdapterUtils {
         mKnownTypeAdapters.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
         mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
         mKnownTypeAdapters.put(JsonElement.class.getName(), "com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT");
-        mKnownTypeAdapters.put(Date.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DATE_TYPE_ADAPTER");
     }
 
     @Nullable

From 4af4b3c9b33284b3ade019e0e7bfb3d32bb7f786 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 12:34:40 +0530
Subject: [PATCH 069/159] ran code indentation, added documentation for all the
 methods, and moved some utility methods to TypeUtils class

---
 .../vimeo/stag/processor/StagProcessor.java   |  11 +-
 .../generators/AdapterGenerator.java          |  10 +-
 .../generators/EnumTypeAdapterGenerator.java  |  79 ++++++-----
 .../processor/generators/StagGenerator.java   | 123 +++++++++---------
 .../generators/TypeAdapterGenerator.java      |  64 ++++-----
 .../TypeTokenConstantsGenerator.java          |  52 ++++----
 .../utils/KnownTypeAdapterUtils.java          |  34 ++++-
 .../vimeo/stag/processor/utils/TypeUtils.java |  56 ++++++++
 8 files changed, 252 insertions(+), 177 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 6d59771e..fda95e9c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -79,8 +79,7 @@ public final class StagProcessor extends AbstractProcessor {
     private final Set<TypeMirror> mSupportedTypes = new HashSet<>();
     private boolean mHasBeenProcessed;
 
-    private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key,
-                                     @Nullable VariableElement value) {
+`    private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key, @Nullable VariableElement value) {
         if (key == null) {
             return;
         }
@@ -185,23 +184,23 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             }
             try {
                 mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
-            } catch (Exception e){}
+            } catch (Exception ignored) {
+            }
 
             StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes);
             TypeTokenConstantsGenerator typeTokenConstantsGenerator = new TypeTokenConstantsGenerator(filer, packageName);
 
             Set<Element> list = SupportedTypesModel.getInstance().getSupportedElements();
             for (Element element : list) {
-                if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) &&
-                        !TypeUtils.isAbstract(element)) {
+                if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) && !TypeUtils.isAbstract(element)) {
                     ClassInfo classInfo = new ClassInfo(element.asType());
                     AdapterGenerator independentAdapter = element.getKind() == ElementKind.ENUM ? new EnumTypeAdapterGenerator(classInfo, element) : new TypeAdapterGenerator(classInfo);
                     JavaFile javaFile = JavaFile.builder(classInfo.getPackageName(), independentAdapter.getTypeAdapterSpec(typeTokenConstantsGenerator, adapterGenerator)).build();
                     FileGenUtils.writeToFile(javaFile, filer);
                 }
             }
-            adapterGenerator.generateTypeAdapterFactory(packageName);
 
+            adapterGenerator.generateTypeAdapterFactory(packageName);
             typeTokenConstantsGenerator.generateTypeTokenConstants();
             KnownTypeAdapterFactoriesUtils.writeKnownTypes(processingEnv, packageName, mSupportedTypes);
         } catch (IOException e) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index 2326fb7e..099170d1 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -24,8 +24,8 @@
 package com.vimeo.stag.processor.generators;
 
 
-import com.squareup.javapoet.TypeSpec;
 import com.google.gson.annotations.SerializedName;
+import com.squareup.javapoet.TypeSpec;
 import com.vimeo.stag.GsonAdapterKey;
 
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +39,7 @@ public abstract class AdapterGenerator {
      * If both of them are used we will give preference to GsonAdapterKey
      */
     @NotNull
-    protected static String getJsonName(@NotNull Element element) {
+    static String getJsonName(@NotNull Element element) {
 
         String name = (null != element.getAnnotation(GsonAdapterKey.class)) ?
                 element.getAnnotation(GsonAdapterKey.class).value() : null;
@@ -56,8 +56,6 @@ protected static String getJsonName(@NotNull Element element) {
         return name;
     }
 
-
     @NotNull
-    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                                @NotNull StagGenerator stagGenerator);
-}
+    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator);
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
index 33a9d511..9d1b7058 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
@@ -56,12 +56,42 @@ public class EnumTypeAdapterGenerator extends AdapterGenerator {
     @NotNull
     private final Element mElement;
 
-
     public EnumTypeAdapterGenerator(@NotNull ClassInfo info, @NotNull Element element) {
         mInfo = info;
         mElement = element;
     }
 
+    @NotNull
+    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+                .addParameter(JsonWriter.class, "writer")
+                .addParameter(typeName, "object")
+                .returns(void.class)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.addStatement("writer.value(object == null ? null : CONSTANT_TO_NAME.get(object))");
+        return builder.build();
+    }
+
+    @NotNull
+    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
+                .addParameter(JsonReader.class, "reader")
+                .returns(typeName)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.beginControlFlow("if (reader.peek() == com.google.gson.stream.JsonToken.NULL)");
+        builder.addStatement("reader.nextNull()");
+        builder.addStatement("return null");
+        builder.endControlFlow();
+        builder.addStatement("return NAME_TO_CONSTANT.get(reader.nextString())");
+        return builder.build();
+    }
+
     /**
      * Generates the TypeSpec for the TypeAdapter
      * that this enum generates.
@@ -90,15 +120,14 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         Map<String, Element> nameToConstant = new HashMap<>();
         Map<Element, String> constantToName = new HashMap<>();
 
-        for(Element enclosingElement : mElement.getEnclosedElements()) {
-            if(enclosingElement.getKind() == ElementKind.ENUM_CONSTANT) {
+        for (Element enclosingElement : mElement.getEnclosedElements()) {
+            if (enclosingElement.getKind() == ElementKind.ENUM_CONSTANT) {
                 String name = getJsonName(enclosingElement);
                 nameToConstant.put(name, enclosingElement);
                 constantToName.put(enclosingElement, name);
             }
         }
 
-
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName);
 
@@ -110,14 +139,14 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
 
         CodeBlock.Builder staticBlockBuilder = CodeBlock.builder();
         staticBlockBuilder.addStatement("NAME_TO_CONSTANT = new HashMap<>(" + nameToConstant.size() + ")");
-        for(Map.Entry<String, Element> entry : nameToConstant.entrySet()) {
+        for (Map.Entry<String, Element> entry : nameToConstant.entrySet()) {
             staticBlockBuilder.addStatement("NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + typeVariableName + "." + entry.getValue().getSimpleName().toString() + ")");
         }
 
         staticBlockBuilder.add("\n");
         staticBlockBuilder.addStatement("CONSTANT_TO_NAME = new HashMap<>(" + constantToName.size() + ")");
-        for(Map.Entry<Element, String> entry : constantToName.entrySet()) {
-            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + typeVariableName + "." + entry.getKey().getSimpleName().toString() + ", \""  + entry.getValue() + "\")");
+        for (Map.Entry<Element, String> entry : constantToName.entrySet()) {
+            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + typeVariableName + "." + entry.getKey().getSimpleName().toString() + ", \"" + entry.getValue() + "\")");
         }
 
         adapterBuilder.addStaticBlock(staticBlockBuilder.build());
@@ -126,40 +155,6 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         adapterBuilder.addMethod(writeMethod);
         adapterBuilder.addMethod(readMethod);
 
-
         return adapterBuilder.build();
     }
-
-    @NotNull
-    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName) {
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
-                .addParameter(JsonWriter.class, "writer")
-                .addParameter(typeName, "object")
-                .returns(void.class)
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(Override.class)
-                .addException(IOException.class);
-
-        builder.addStatement("writer.value(object == null ? null : CONSTANT_TO_NAME.get(object))");
-        return builder.build();
-    }
-
-    @NotNull
-    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName) {
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
-                .addParameter(JsonReader.class, "reader")
-                .returns(typeName)
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(Override.class)
-                .addException(IOException.class);
-
-        builder.beginControlFlow("if (reader.peek() == com.google.gson.stream.JsonToken.NULL)");
-        builder.addStatement("reader.nextNull()");
-        builder.addStatement("return null");
-        builder.endControlFlow();
-        builder.addStatement("return NAME_TO_CONSTANT.get(reader.nextString())");
-        return builder.build();
-    }
-
-
-}
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 0e37a403..746aaac5 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -73,10 +73,6 @@ public class StagGenerator {
     private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
     @NotNull
     private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
-    @NotNull
-    private static final HashMap<String, String> mConcreteAdapterFieldMap = new HashMap<>();
-    @NotNull
-    private static final HashMap<String, String> mGenericAdapterFieldMap = new HashMap<>();
 
     static {
         KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
@@ -98,15 +94,18 @@ public class StagGenerator {
     private final HashMap<String, String> mUnknownAdapterFieldMap = new HashMap<>();
     @NotNull
     private final List<ClassInfo> mUnknownClasses = new ArrayList<>();
-    //Type.toString() -> NumberOf
     @NotNull
     private final HashMap<String, GenericClassInfo> mGenericClassInfo = new HashMap<>();
     @NotNull
     private final String mGeneratedPackageName;
+    @NotNull
+    private final HashMap<String, String> mConcreteAdapterFieldMap = new HashMap<>();
+    @NotNull
+    private final HashMap<String, String> mGenericAdapterFieldMap = new HashMap<>();
+    @NotNull
     private final Set<TypeMirror> mKnownTypes;
 
-    public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
-                         @NotNull Set<TypeMirror> knownTypes) {
+    public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer, @NotNull Set<TypeMirror> knownTypes) {
         mFiler = filer;
         mKnownTypes = knownTypes;
         mGeneratedPackageName = generatedPackageName;
@@ -146,7 +145,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
     }
 
-    public Set<TypeMirror> getKnownTypes() {
+    Set<TypeMirror> getKnownTypes() {
         return mKnownTypes;
     }
 
@@ -315,7 +314,7 @@ private TypeSpec getAdapterFactorySpec() {
             }
         }
 
-                /*
+        /*
          * Iterate through all the registered unknown classes, and map the classes to its corresponding type adapters.
          */
         for (ClassInfo classInfo : mUnknownClasses) {
@@ -344,46 +343,20 @@ private TypeSpec getAdapterFactorySpec() {
             adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
         }
 
-        Set<Map.Entry<String, String>> entries = mConcreteAdapterFieldMap.entrySet();
-        for (Map.Entry<String, String> entry : entries) {
-            String fieldType = entry.getKey();
-            String adapterCode = entry.getValue();
-
-            TypeName typeName = TypeVariableName.get(fieldType);
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-            String variableName = "m" + generateNameFromType(fieldType, true);
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType, true))
-                    .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "gson")
-                    .returns(parameterizedTypeName);
-            getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
-            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
-            getAdapterMethodBuilder.endControlFlow();
-            getAdapterMethodBuilder.addStatement("return " + variableName);
-            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
-            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+        /*
+         * Iterate through all the registered concrete fields, and map the fields to its corresponding type adapters.
+         */
+        Set<Map.Entry<String, String>> concreteAdapterFieldEntries = mConcreteAdapterFieldMap.entrySet();
+        for (Map.Entry<String, String> entry : concreteAdapterFieldEntries) {
+            generateAdapterMethod(entry.getKey(), entry.getValue(), adapterFactoryBuilder, false);
         }
 
-        Set<Map.Entry<String, String>> entries1 = mGenericAdapterFieldMap.entrySet();
-        for (Map.Entry<String, String> entry : entries1) {
-            String fieldType = entry.getKey();
-            String adapterCode = entry.getValue();
-
-            TypeName typeName = TypeVariableName.get(fieldType);
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-            String variableName = "m" + generateNameFromType(fieldType, false);
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + generateNameFromType(fieldType, false))
-                    .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "gson")
-                    .returns(parameterizedTypeName);
-            getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
-            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode, "$");
-            getAdapterMethodBuilder.endControlFlow();
-            getAdapterMethodBuilder.addStatement("return " + variableName);
-            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
-            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+        /*
+         * Iterate through all the registered generic fields, and map the fields to its corresponding type adapters.
+         */
+        Set<Map.Entry<String, String>> genericAdapterFieldEntries = mGenericAdapterFieldMap.entrySet();
+        for (Map.Entry<String, String> entry : genericAdapterFieldEntries) {
+            generateAdapterMethod(entry.getKey(), entry.getValue(), adapterFactoryBuilder, true);
         }
 
         createMethodBuilder.addStatement("return null");
@@ -392,6 +365,30 @@ private TypeSpec getAdapterFactorySpec() {
         return adapterFactoryBuilder.build();
     }
 
+    private void generateAdapterMethod(String fieldType, String adapterCode, TypeSpec.Builder adapterFactoryBuilder, boolean containsTypeArg) {
+        TypeName typeName = TypeVariableName.get(fieldType);
+        TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+        String getterName = generateNameFromType(fieldType, false);
+        String variableName = "m" + getterName;
+        FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
+        MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + getterName)
+                .addModifiers(Modifier.PUBLIC)
+                .addParameter(Gson.class, "gson")
+                .returns(parameterizedTypeName);
+        getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
+
+        if (containsTypeArg) {
+            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode, "$");
+        } else {
+            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
+        }
+
+        getAdapterMethodBuilder.endControlFlow();
+        getAdapterMethodBuilder.addStatement("return " + variableName);
+        adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+        adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
+    }
+
     /**
      * Returns the {@link TypeVariableName} of Stag.Factory file. This is used to get the type adapters
      * that are already generated in the stag file, avoiding recreating the same type adapters.
@@ -400,44 +397,42 @@ private TypeSpec getAdapterFactorySpec() {
      */
     @NotNull
     TypeVariableName getGeneratedClassName() {
-        return TypeVariableName.get(
-                mGeneratedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY);
+        return TypeVariableName.get(mGeneratedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY);
     }
 
+    /**
+     * Used to add fields for the unknown types
+     */
     @NotNull
-    String addFieldType(@NotNull TypeMirror fieldType) {
+    String addFieldForUnknownType(@NotNull TypeMirror fieldType) {
         String fieldTypeString = fieldType.toString();
         String result = mUnknownAdapterFieldMap.get(fieldTypeString);
         if (null == result) {
             ClassInfo classInfo = new ClassInfo(fieldType);
-            StringBuilder fieldNameBuilder = new StringBuilder();
-            boolean makeCapital = true;
-            for (int idx = 0; idx < fieldTypeString.length(); idx++) {
-                char c = fieldTypeString.charAt(idx);
-                if (c == '.' || c == '<' || c == ',' || c == '>') {
-                    makeCapital = true;
-                } else {
-                    fieldNameBuilder.append(makeCapital ? Character.toUpperCase(c) : c);
-                    makeCapital = false;
-                }
-            }
-            result = fieldNameBuilder.toString();
+            result = generateNameFromType(fieldTypeString, false);
             mUnknownClasses.add(classInfo);
             mUnknownAdapterFieldMap.put(fieldTypeString, result);
         }
         return result;
     }
 
+    /**
+     * Used to add fields for the concrete types such as for {@link Map} or {@link List} or any other
+     * concrete class
+     */
     @NotNull
-    String addConcreteFieldType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
+    String addFieldForConcreteType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
         if (!mConcreteAdapterFieldMap.containsKey(fieldType.toString())) {
             mConcreteAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
         }
         return "get" + generateNameFromType(fieldType.toString(), true);
     }
 
+    /**
+     * Used to add fields for the generic types eg: generic classes
+     */
     @NotNull
-    String addGenericFieldType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
+    String addFieldForGenericType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
         if (!mGenericAdapterFieldMap.containsKey(fieldType.toString())) {
             mGenericAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
         }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 480aa9dd..fd790678 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -73,8 +73,12 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
         mInfo = info;
     }
 
+    /**
+     * This is used to generate the type token code for the types that are unknown.
+     */
     @Nullable
-    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
+    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType,
+                                                          @NotNull Map<TypeVariable, String> typeVarsMap,
                                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
@@ -109,8 +113,12 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
         return result;
     }
 
+    /**
+     * This is used to generate the type token code for the types that are known.
+     */
     @Nullable
-    private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull Map<TypeVariable, String> typeVarsMap,
+    private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
+                                           @NotNull Map<TypeVariable, String> typeVarsMap,
                                            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
@@ -139,8 +147,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
                         result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString())
                                 + ", " + result + ", null)";
                     } else {
-                        result = "com.google.gson.reflect.TypeToken.getParameterized(" +
-                                declaredFieldType.asElement().toString() + ".class";
+                        result = "com.google.gson.reflect.TypeToken.getParameterized(" + declaredFieldType.asElement().toString() + ".class";
                     }
                 } else if (TypeUtils.isSupportedCollection(fieldType)) {
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
@@ -163,19 +170,12 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType, @NotNull M
         return result;
     }
 
-
     @NotNull
     private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
         TypeName typeName = TypeVariableName.get(type);
         return ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
     }
 
-
-    @NotNull
-    private static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
-        return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
-    }
-
     @NotNull
     private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> elements, @NotNull AdapterFieldInfo adapterFieldInfo) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
@@ -262,10 +262,12 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-    private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                                   @NotNull MethodSpec.Builder constructorBuilder,
-                                                   @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
-                                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
+    /**
+     * Returns the adapter code for the unknown types.
+     */
+    private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                            @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                            @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
         if (null == fieldName) {
@@ -279,6 +281,9 @@ private String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldType, @N
         return fieldName;
     }
 
+    /**
+     * Returns the adapter code for the known types.
+     */
     private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                       @NotNull MethodSpec.Builder constructorBuilder,
                                       @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
@@ -305,7 +310,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 /*
                  * If the fieldType is of type native arrays such as String[] or int[]
                  */
-                TypeMirror arrayInnerType = getArrayInnerType(fieldType);
+                TypeMirror arrayInnerType = TypeUtils.getArrayInnerType(fieldType);
                 if (TypeUtils.isSupportedPrimitive(arrayInnerType.toString())) {
                     return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
                 } else {
@@ -318,7 +323,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
-                        String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                        String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
                         return adapterCode;
@@ -338,7 +343,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                    String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -361,7 +366,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
-                    String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                    String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -369,13 +374,13 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
             } else if (TypeUtils.isNativeObject(fieldType)) {
                 mGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
-                String getterName = stagGenerator.addConcreteFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else if (TypeUtils.isJsonElement(fieldType)) {
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
-                return adapterCode != null ? "mStagFactory." + stagGenerator.addConcreteFieldType(fieldType, adapterCode) + "(mGson)" : "";
+                return adapterCode != null ? "mStagFactory." + stagGenerator.addFieldForConcreteType(fieldType, adapterCode) + "(mGson)" : "";
             } else if (fieldType instanceof DeclaredType) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
@@ -395,15 +400,15 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                                 , stagGenerator, adapterFieldInfo);
                     }
                     adapterCode += ")";
-                    return "mStagFactory." + stagGenerator.addGenericFieldType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
+                    return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
                 } else {
-                    getterField = stagGenerator.addFieldType(fieldType);
+                    getterField = stagGenerator.addFieldForUnknownType(fieldType);
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
                     return "mStagFactory." + "get" + getterField + "(mGson)";
                 }
             } else {
-                getterField = stagGenerator.addFieldType(fieldType);
+                getterField = stagGenerator.addFieldForUnknownType(fieldType);
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 return "mStagFactory." + "get" + getterField + "(mGson)";
@@ -426,8 +431,9 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
     }
 
     @NotNull
-    private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder, @NotNull MethodSpec.Builder constructorBuilder,
-                                              @NotNull Map<Element, TypeMirror> memberVariables, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+    private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
+                                              @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
+                                              @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
                                               @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
@@ -436,7 +442,7 @@ private AdapterFieldInfo addAdapterFields(StagGenerator.GenericClassInfo generic
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor;
             if (hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
-                adapterAccessor = getAdapterForUnknownGenericType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
+                adapterAccessor = getAdapterForUnknownType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
             }
@@ -544,7 +550,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                     String simpleName = typeVariable.asElement().getSimpleName().toString();
                     adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
                     String paramName;
-                    if (genericClassInfo.mHasUnknownVarTypeFields) {
+                    if (genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields) {
                         paramName = "type[" + String.valueOf(idx) + "]";
                     } else {
                         ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
@@ -557,7 +563,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                 }
             }
 
-            if (idx > 0 && genericClassInfo.mHasUnknownVarTypeFields) {
+            if (idx > 0 && genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields) {
                 constructorBuilder.addParameter(Type[].class, "type");
                 constructorBuilder.varargs(true);
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
index 635e8fc4..26e836d9 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
@@ -53,20 +53,8 @@ public class TypeTokenConstantsGenerator {
 
     @NotNull
     private final Filer mFiler;
-
-    private static class TypeTokenInfo {
-
-        TypeMirror mTypeMirror;
-        String mFieldName;
-        String mMethodName;
-
-        TypeTokenInfo() {
-        }
-    }
-
     @NotNull
     private final HashMap<String, TypeTokenInfo> mTypesToBeGenerated = new HashMap<>();
-
     @NotNull
     private final String mGeneratedPackageName;
 
@@ -75,6 +63,23 @@ public TypeTokenConstantsGenerator(@NotNull Filer filer, @NotNull String generat
         mGeneratedPackageName = generatedPackageName;
     }
 
+    @NotNull
+    private static MethodSpec generateTypeTokenGetters(@NotNull String name, @NotNull TypeName typeName) {
+        MethodSpec.Builder mBuilder = MethodSpec.methodBuilder(getMethodName(name))
+                .returns(ParameterizedTypeName.get(ClassName.get(TypeToken.class), typeName))
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .beginControlFlow("if (" + name + " == null)")
+                .addStatement(name + " = new com.google.gson.reflect.TypeToken<" + typeName + ">(){}")
+                .endControlFlow()
+                .addStatement("return " + name);
+        return mBuilder.build();
+    }
+
+    @NotNull
+    private static String getMethodName(@NotNull String name) {
+        return "get" + name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase();
+    }
+
     /**
      * Add the type token to be generated
      *
@@ -94,7 +99,7 @@ String addTypeToken(@NotNull TypeMirror type) {
         }
 
         return mGeneratedPackageName + "." + CLASS_STAG_TYPE_TOKEN_CONSTANTS + "." +
-               typeTokenInfo.mMethodName;
+                typeTokenInfo.mMethodName;
     }
 
     /**
@@ -117,7 +122,7 @@ public void generateTypeTokenConstants() throws IOException {
                         ParameterizedTypeName.get(ClassName.get(TypeToken.class), typeName);
                 FieldSpec.Builder fieldSpecBuilder =
                         FieldSpec.builder(parameterizedTypeName, typeTokenInfo.mFieldName, Modifier.PUBLIC,
-                                          Modifier.STATIC);
+                                Modifier.STATIC);
                 adaptersBuilder.addField(fieldSpecBuilder.build());
                 adaptersBuilder.addMethod(generateTypeTokenGetters(typeTokenInfo.mFieldName, typeName));
             }
@@ -127,20 +132,9 @@ public void generateTypeTokenConstants() throws IOException {
         }
     }
 
-    @NotNull
-    private static MethodSpec generateTypeTokenGetters(@NotNull String name, @NotNull TypeName typeName) {
-        MethodSpec.Builder mBuilder = MethodSpec.methodBuilder(getMethodName(name))
-                .returns(ParameterizedTypeName.get(ClassName.get(TypeToken.class), typeName))
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .beginControlFlow("if (" + name + " == null)")
-                .addStatement(name + " = new com.google.gson.reflect.TypeToken<" + typeName + ">(){}")
-                .endControlFlow()
-                .addStatement("return " + name);
-        return mBuilder.build();
-    }
-
-    @NotNull
-    private static String getMethodName(@NotNull String name) {
-        return "get" + name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase();
+    private static class TypeTokenInfo {
+        TypeMirror mTypeMirror;
+        String mFieldName;
+        String mMethodName;
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 5c11b39c..38eeca4f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -14,7 +14,6 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Currency;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -27,6 +26,9 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
+/**
+ * This maintains a list of type vs the known type adapters.
+ */
 public class KnownTypeAdapterUtils {
     @NotNull
     private static final HashMap<String, String> mKnownTypeAdapters = new HashMap<>();
@@ -67,6 +69,12 @@ public static String getKnownTypeAdapterForType(String type) {
         return mKnownTypeAdapters.get(type);
     }
 
+    /**
+     * Get the instantiater for {@link List} types
+     *
+     * @param typeMirror TypeMirror typeMirror
+     * @return instantiater
+     */
     @NotNull
     public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
@@ -84,6 +92,12 @@ public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         }
     }
 
+    /**
+     * Get the instantiater for {@link Map} types
+     *
+     * @param typeMirror TypeMirror typeMirror
+     * @return instantiater
+     */
     @NotNull
     public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
@@ -111,12 +125,24 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         }
     }
 
+    /**
+     * Get the instantiater for native array types
+     *
+     * @param typeMirror TypeMirror typeMirror
+     * @return instantiater
+     */
     @Nullable
     public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType + "[size]; } }";
     }
 
+    /**
+     * Get the type adapter for primitive array types
+     *
+     * @param typeMirror TypeMirror typeMirror
+     * @return adapterName
+     */
     @Nullable
     public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
@@ -132,6 +158,12 @@ public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror type
         return null;
     }
 
+    /**
+     * Get the type adapter for {@link JsonElement} types
+     *
+     * @param typeMirror TypeMirror typeMirror
+     * @return adapterName
+     */
     @Nullable
     public static String getJsonElementTypeAdapter(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 545b29a7..43322a9e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -360,6 +360,12 @@ private static List<? extends TypeMirror> getParameterizedTypes(@NotNull TypeMir
         return ((DeclaredType) typeMirror).getTypeArguments();
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of primitive type
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isSupportedPrimitive(@NotNull String type) {
         return type.equals(long.class.getName())
                 || type.equals(double.class.getName())
@@ -371,10 +377,22 @@ public static boolean isSupportedPrimitive(@NotNull String type) {
                 || type.equals(byte.class.getName());
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link ArrayType}
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isNativeArray(@NotNull TypeMirror type) {
         return (type instanceof ArrayType);
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link Collection} type
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isSupportedCollection(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -386,6 +404,12 @@ public static boolean isSupportedCollection(@Nullable TypeMirror type) {
         return isSupportedList(type) || outerClassType.equals(Collection.class.getName());
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link List} type
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     private static boolean isSupportedList(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -395,6 +419,12 @@ private static boolean isSupportedList(@Nullable TypeMirror type) {
                 outerClassType.equals(List.class.getName());
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link Object}
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isNativeObject(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -403,6 +433,12 @@ public static boolean isNativeObject(@Nullable TypeMirror type) {
         return outerClassType.equals(Object.class.getName());
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link JsonElement} type
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isJsonElement(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -413,6 +449,12 @@ public static boolean isJsonElement(@Nullable TypeMirror type) {
                 || outerClassType.equals(JsonArray.class.getName());
     }
 
+    /**
+     * Method to check if the {@link TypeMirror} is of {@link Map} type
+     *
+     * @param type :TypeMirror type
+     * @return boolean
+     */
     public static boolean isSupportedMap(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
@@ -426,6 +468,12 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
                 outerClassType.equals(LinkedHashMap.class.getName());
     }
 
+    /**
+     * Method to check if the type is natively supported such as {@link String} etc
+     *
+     * @param type String type
+     * @return boolean
+     */
     public static boolean isSupportedNative(@NotNull String type) {
         return isSupportedPrimitive(type)
                 || type.equals(String.class.getName())
@@ -436,4 +484,12 @@ public static boolean isSupportedNative(@NotNull String type) {
                 || type.equals(Float.class.getName())
                 || type.equals(Number.class.getName());
     }
+
+    /**
+     * Returns the inner {@link TypeMirror} for a given {@link TypeMirror}
+     */
+    @NotNull
+    public static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
+        return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
+    }
 }
\ No newline at end of file

From 5f8cffef1a13410d3863854dd0dc02702073cef1 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 12:35:07 +0530
Subject: [PATCH 070/159] fixed code

---
 .../src/main/java/com/vimeo/stag/processor/StagProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index fda95e9c..4876a671 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -79,7 +79,7 @@ public final class StagProcessor extends AbstractProcessor {
     private final Set<TypeMirror> mSupportedTypes = new HashSet<>();
     private boolean mHasBeenProcessed;
 
-`    private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key, @Nullable VariableElement value) {
+    private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key, @Nullable VariableElement value) {
         if (key == null) {
             return;
         }

From d4cc845370cb2b1fb76c26bf6d8e7539c1f1dc2a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 12:39:28 +0530
Subject: [PATCH 071/159] fixed the unit test cases since the methods were
 moved to TypeUtils class

---
 .../TypeAdapterGeneratorUnitTest.java         | 157 +++++++-----------
 1 file changed, 58 insertions(+), 99 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java
index 954ff984..45415e4e 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java
@@ -27,11 +27,11 @@
 import com.vimeo.stag.processor.Utils;
 import com.vimeo.stag.processor.dummy.DummyConcreteClass;
 import com.vimeo.stag.processor.dummy.DummyMapClass;
+import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -53,154 +53,113 @@ public class TypeAdapterGeneratorUnitTest extends BaseUnitTest {
     public void testIsSupportedPrimitive_supportsTypes() throws Exception {
 
         // Check supported primitives
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedPrimitive(long.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedPrimitive(int.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedPrimitive(boolean.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedPrimitive(float.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedPrimitive(double.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(long.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(int.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(boolean.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(float.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(double.class.getName()));
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(byte.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(char.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(short.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(void.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(byte.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(char.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(short.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(void.class.getName()));
 
         // Check non-primitives
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(String.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedPrimitive(Object.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(String.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(Object.class.getName()));
     }
 
     @Test
     public void testIsSupportedCollection_supportsTypes() throws Exception {
         // Check supported list types
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
 
         // Check unsupported list types
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
 
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedCollection(null));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
 
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
 
         // Check array types
         Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
+                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
         Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
+                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
         Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
+                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
         Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
+                TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
         Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+                TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
     }
 
     @Test
     public void testIsSupportedList_supportsTypes() throws Exception {
         // Check supported types
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(List.class)));
-        Assert.assertTrue(
-                TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(ArrayList.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
 
         // Check unsupported list types
-        Assert.assertFalse(
-                TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(LinkedList.class)));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(Vector.class)));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(Stack.class)));
-        Assert.assertFalse(
-                TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(Collection.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
 
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(null));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
 
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(Utils.getTypeMirrorFromClass(Object.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
 
         // Check unsupported array types
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(
-                types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(
-                types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(
-                types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(
-                types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedList(
-                types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
     }
 
     @Test
     public void testIsSupportedNative_supportsCorrectTypes() throws Exception {
         // Check supported primitives
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(long.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(int.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(boolean.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(float.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(double.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isSupportedNative(String.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(long.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(int.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(boolean.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(float.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(double.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(String.class.getName()));
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedNative(byte.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedNative(char.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedNative(short.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedNative(void.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(byte.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(char.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(short.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(void.class.getName()));
 
         // Check non-primitives
-        Assert.assertFalse(TypeAdapterGenerator.isSupportedNative(Object.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(Object.class.getName()));
     }
 
     @Test
     public void testIsMap_supportsCorrectTypes() throws Exception {
         // Check null
-        Assert.assertFalse(TypeAdapterGenerator.isMap(null));
+        Assert.assertFalse(TypeUtils.isSupportedMap(null));
 
         // Check supported types
-        Assert.assertTrue(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(Map.class)));
-        Assert.assertTrue(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(HashMap.class)));
-        Assert.assertTrue(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(LinkedHashMap.class)));
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Map.class)));
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(HashMap.class)));
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(LinkedHashMap.class)));
 
         // Check type that implements map
-        Assert.assertFalse(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(DummyMapClass.class)));
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyMapClass.class)));
 
         // Check other types
-        Assert.assertFalse(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(Object.class)));
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Object.class)));
         Assert.assertFalse(
-                TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
-        Assert.assertFalse(TypeAdapterGenerator.isMap(Utils.getTypeMirrorFromClass(String.class)));
+                TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String.class)));
     }
-
-    @Test
-    public void testNumberType_supportsCorrectTypes() throws Exception {
-
-        // Check primitive number types
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(long.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(double.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(int.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(float.class.getName()));
-
-        // Check object number types
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(Long.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(Double.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(Integer.class.getName()));
-        Assert.assertTrue(TypeAdapterGenerator.isNumberType(Float.class.getName()));
-
-        // Check other primitive types
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(byte.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(char.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(short.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(boolean.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(void.class.getName()));
-
-        // Check other object types
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(Byte.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(Character.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(Short.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(Boolean.class.getName()));
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(Void.class.getName()));
-
-        Assert.assertFalse(TypeAdapterGenerator.isNumberType(BigInteger.class.getName()));
-    }
-
-}
+}
\ No newline at end of file

From e39b009507587b075c047e315fbafe57d8fb7181 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 12:59:52 +0530
Subject: [PATCH 072/159] fixed the parameterized type arguments while creating
 maps

---
 .../com/vimeo/stag/processor/generators/StagGenerator.java    | 2 +-
 .../com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 746aaac5..0422f3e3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -368,7 +368,7 @@ private TypeSpec getAdapterFactorySpec() {
     private void generateAdapterMethod(String fieldType, String adapterCode, TypeSpec.Builder adapterFactoryBuilder, boolean containsTypeArg) {
         TypeName typeName = TypeVariableName.get(fieldType);
         TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-        String getterName = generateNameFromType(fieldType, false);
+        String getterName = containsTypeArg ? generateNameFromType(fieldType, false) : generateNameFromType(fieldType, true);
         String variableName = "m" + getterName;
         FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
         MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + getterName)
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 38eeca4f..9633f2db 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -118,8 +118,8 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
             return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">>() " +
                     "{ " +
                     "\n@Override " +
-                    "\npublic " + outerClassType + " construct() {" +
-                    "\n\treturn new " + outerClassType + "(); " +
+                    "\npublic " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">" + " construct() {" +
+                    "\n\treturn new " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">();" +
                     "\n}" +
                     "}";
         }

From 238e5e578bd128407b2e1a68f45a050e4c34fa3b Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 13:00:22 +0530
Subject: [PATCH 073/159] updated the model classes, created new model classes
 as well for testing the new functionalities added to stag

---
 .../vimeo/sample/model/AbstractDataList.java  |  7 ++-
 .../vimeo/sample/model/AccessModifiers.java   | 17 +++----
 .../vimeo/sample/model/ClassWithMapTypes.java |  8 +++-
 .../sample/model/ComplexGenericClass.java     | 16 ++++---
 .../com/vimeo/sample/model/EnumExample.java   |  6 ++-
 .../com/vimeo/sample/model/GenericClass.java  |  7 ++-
 .../sample/model/GenericUsageExample.java     | 12 -----
 .../sample/model/IdenticalFieldTypes.java     | 18 ++++----
 .../model/MultipleAnnotationSupport.java      | 24 ++++++++++
 .../com/vimeo/sample/model/NestedModel.java   |  8 ++--
 .../java/com/vimeo/sample/model/Paging.java   |  7 ++-
 .../sample/model/PrimitiveTypesExample.java   | 16 ++++---
 .../java/com/vimeo/sample/model/Stats.java    |  5 +-
 .../sample/model/SuperAbstractDataList.java   |  9 ++--
 .../sample/model/TypeTokenBasedModels.java    | 46 -------------------
 .../java/com/vimeo/sample/model/User.java     |  8 ++--
 .../java/com/vimeo/sample/model/Video.java    | 18 ++++----
 .../com/vimeo/sample/model/VideoList.java     |  2 +-
 18 files changed, 105 insertions(+), 129 deletions(-)
 delete mode 100644 sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/MultipleAnnotationSupport.java
 delete mode 100644 sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
index bfff20b0..bcdefc8b 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
@@ -39,7 +39,6 @@
 @UseStag
 public abstract class AbstractDataList<T> extends SuperAbstractDataList<Paging, ArrayList<T>> {
 
-    @SerializedName("page")
+    @GsonAdapterKey("page")
     public int page;
-
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index 6c2d840a..e26e9ffd 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -34,15 +34,12 @@
 @UseStag
 public class AccessModifiers {
 
-    // private modifier is not allowed
-
-    @SerializedName("defaultModifier")
-    String defaultModifier;
+    @GsonAdapterKey("publicModifier")
+    public String publicModifier;
 
-    @SerializedName("protectedModifier")
+    @GsonAdapterKey("protectedModifier")
     protected String protectedModifier;
 
-    @SerializedName("publicModifier")
-    public String publicModifier;
-
-}
+    @GsonAdapterKey("defaultModifier")
+    String defaultModifier;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
index d687e49c..5662081a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
@@ -23,6 +23,8 @@
  */
 package com.vimeo.sample.model;
 
+import android.support.v4.util.ArrayMap;
+
 import com.vimeo.stag.UseStag;
 
 import java.util.HashMap;
@@ -30,6 +32,9 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * Class contains different types of {@link Map}
+ */
 @UseStag
 public class ClassWithMapTypes {
     public HashMap<String, Video> videoHashMap;
@@ -42,4 +47,5 @@ public class ClassWithMapTypes {
 
     public Map<String, List<Video>> mapOfLists;
 
-}
+    public ArrayMap<String, String> arrayMap;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
index ae7f490a..514a3384 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
@@ -25,24 +25,28 @@
 
 import android.webkit.ValueCallback;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.Map;
 
+/**
+ * Complex generic class which contains the parameterized type
+ *
+ * @param <T>
+ */
 @UseStag
 public class ComplexGenericClass<T> {
 
-    @SerializedName("name")
+    @GsonAdapterKey("name")
     public T name;
 
-    @SerializedName("map")
+    @GsonAdapterKey("map")
     public Map<String, Map<String, T>> mapField;
 
-    @SerializedName("sparseArray")
+    @GsonAdapterKey("sparseArray")
     public ValueCallback<T> sparseArrayField;
 
-
-    @SerializedName("regularMap")
+    @GsonAdapterKey("regularMap")
     public Map<String, String> regularMapField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/EnumExample.java b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
index 84bc8c6f..be52d4f4 100644
--- a/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/EnumExample.java
@@ -26,6 +26,9 @@
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
+/**
+ * Model class for {@link Enum}
+ */
 @UseStag
 public enum EnumExample {
     ENUM_VALUE1,
@@ -35,5 +38,4 @@ public enum EnumExample {
     ENUM_VALUE4,
     ENUM_VALUE5,
     ENUM_VALUE6
-
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
index 18a00186..3ef00f20 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
@@ -24,19 +24,22 @@
 package com.vimeo.sample.model;
 
 import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.Map;
 
 /**
  * Created by anirudh.r on 30/11/16.
+ * <p>
+ * A Generic class which has known types.
  */
 @UseStag
 public class GenericClass<T> {
 
-    @SerializedName("name")
+    @GsonAdapterKey("name")
     public T name;
 
-    @SerializedName("map")
+    @GsonAdapterKey("map")
     public Map<String, Map<String, T>> mapField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java b/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
deleted file mode 100644
index 7341ba72..00000000
--- a/sample/src/main/java/com/vimeo/sample/model/GenericUsageExample.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.vimeo.sample.model;
-
-
-import com.google.gson.annotations.SerializedName;
-import com.vimeo.stag.UseStag;
-
-@UseStag
-public class GenericUsageExample {
-
-    @SerializedName("GenericUsage")
-    GenericClass<GenericClass<User>> mGenericUsage;
-}
diff --git a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
index e51ba010..59d83864 100644
--- a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
@@ -41,24 +41,24 @@
 @UseStag
 public class IdenticalFieldTypes {
 
-    @SerializedName("mUser")
+    @GsonAdapterKey("mUser")
     User mUser;
 
-    @SerializedName("mSecondUser")
+    @GsonAdapterKey("mSecondUser")
     User mSecondUser;
 
-    @SerializedName("mUsersList")
+    @GsonAdapterKey("mUsersList")
     ArrayList<User> mUsersList;
 
-    @SerializedName("mSecondUsersList")
+    @GsonAdapterKey("mSecondUsersList")
     ArrayList<User> mSecondUsersList;
 
-    @SerializedName("mStatsArrayList")
+    @GsonAdapterKey("mStatsArrayList")
     ArrayList<Stats> mStatsArrayList;
 
-    @SerializedName("mListOfList")
+    @GsonAdapterKey("mListOfList")
     List<List<Stats>> mListOfList;
 
-    @SerializedName("mStats")
+    @GsonAdapterKey("mStats")
     Stats mStats;
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/MultipleAnnotationSupport.java b/sample/src/main/java/com/vimeo/sample/model/MultipleAnnotationSupport.java
new file mode 100644
index 00000000..e662b94d
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/MultipleAnnotationSupport.java
@@ -0,0 +1,24 @@
+package com.vimeo.sample.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class which contains two annotations
+ * {@link com.vimeo.stag.GsonAdapterKey}
+ * {@link com.google.gson.annotations.SerializedName}
+ * <p>
+ * If we have this kind of scenario, we will give preference to {@link com.vimeo.stag.GsonAdapterKey} value
+ */
+@UseStag
+public class MultipleAnnotationSupport {
+
+    @GsonAdapterKey("gsonAdapterValue")
+    @SerializedName("serializedNameValue")
+    public int mValue;
+
+    @GsonAdapterKey("gsonAdapterName")
+    @SerializedName("serializedNameName")
+    public String mName;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
index e487b490..b5a67367 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -34,10 +34,10 @@
 @UseStag
 public class NestedModel {
 
-    @SerializedName("test1")
+    @GsonAdapterKey("test1")
     public String test1;
 
-    @SerializedName("nestedEnum")
+    @GsonAdapterKey("nestedEnum")
     public NestedEnum nestedEnum;
 
     @UseStag
@@ -46,4 +46,4 @@ public enum NestedEnum {
         NESTED_ENUM_VAL2,
         NESTED_ENUM_VAL3
     }
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/Paging.java b/sample/src/main/java/com/vimeo/sample/model/Paging.java
index 77726060..6bee9041 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Paging.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Paging.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,7 +32,6 @@
 @UseStag
 public class Paging {
 
-    @SerializedName("first")
+    @GsonAdapterKey("first")
     public String first;
-
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
index 1819186a..81b70638 100644
--- a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
@@ -1,25 +1,27 @@
 package com.vimeo.sample.model;
 
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
+/**
+ * Model class which contains different types of primitive member variables
+ */
 @UseStag
 public class PrimitiveTypesExample {
 
-    @SerializedName("simpleInt")
+    @GsonAdapterKey("simpleInt")
     public int simpleInt;
 
-    @SerializedName("simpleFlot")
+    @GsonAdapterKey("simpleFlot")
     public float simpleFlot;
 
-
-    @SerializedName("simpleShort")
+    @GsonAdapterKey("simpleShort")
     public short simpleShort;
 
-    @SerializedName("simpleLong")
+    @GsonAdapterKey("simpleLong")
     public long simpleLong;
 
-    @SerializedName("simpleDouble")
+    @GsonAdapterKey("simpleDouble")
     public double simpleDouble;
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/Stats.java b/sample/src/main/java/com/vimeo/sample/model/Stats.java
index 19bbcfef..266917e2 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Stats.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Stats.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,10 +32,9 @@
 @UseStag
 public class Stats {
 
-    @SerializedName("plays")
+    @GsonAdapterKey("plays")
     public int mPlays;
 
-
     @Override
     public String toString() {
         return "plays: " + mPlays;
diff --git a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
index c35147ad..936ac850 100644
--- a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -39,10 +39,9 @@
 @UseStag
 public abstract class SuperAbstractDataList<T, K> {
 
-    @SerializedName("paging")
+    @GsonAdapterKey("paging")
     public T paging;
 
-    @SerializedName("data")
+    @GsonAdapterKey("data")
     public K data;
-
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java b/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java
deleted file mode 100644
index 793f8d5b..00000000
--- a/sample/src/main/java/com/vimeo/sample/model/TypeTokenBasedModels.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * The MIT License (MIT)
- * <p/>
- * Copyright (c) 2016 Vimeo
- * <p/>
- * 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:
- * <p/>
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * <p/>
- * 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.
- */
-package com.vimeo.sample.model;
-
-import com.google.gson.annotations.SerializedName;
-import com.vimeo.stag.UseStag;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class ensures that the generated
- * adapter properly parses and serializes
- * the interface fields for Map and List,
- * according to what stag supports.
- */
-@UseStag
-public class TypeTokenBasedModels {
-
-    @SerializedName("videoMap")
-    public Map<String, Video> videoMap;
-
-    @SerializedName("videoList")
-    public List<Video> videoList;
-}
diff --git a/sample/src/main/java/com/vimeo/sample/model/User.java b/sample/src/main/java/com/vimeo/sample/model/User.java
index 8cccce52..8832970a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/User.java
+++ b/sample/src/main/java/com/vimeo/sample/model/User.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,14 +32,14 @@
 @UseStag
 public class User {
 
-    @SerializedName("name")
+    @GsonAdapterKey("name")
     public String mName;
 
-    @SerializedName("location")
+    @GsonAdapterKey("location")
     public String mLocation;
 
     @Override
     public String toString() {
         return "name: " + mName + ", location: " + mLocation;
     }
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/Video.java b/sample/src/main/java/com/vimeo/sample/model/Video.java
index 08111617..27b1a01f 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Video.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.Date;
@@ -34,25 +34,25 @@
 @UseStag
 public class Video {
 
-    @SerializedName("user")
+    @GsonAdapterKey("user")
     public User mUser;
 
-    @SerializedName("link")
+    @GsonAdapterKey("link")
     public String mLink;
 
-    @SerializedName("name")
+    @GsonAdapterKey("name")
     public String mName;
 
-    @SerializedName("created_time")
+    @GsonAdapterKey("created_time")
     public Date mCreatedTime;
 
-    @SerializedName("stats")
+    @GsonAdapterKey("stats")
     public Stats mStats;
 
     @Override
     public String toString() {
         return "user: { " + (mUser != null ? mUser.toString() : null) + " }\nlink: " + mLink + "\nname: " +
-               mName + "\ncreated_time: " + mCreatedTime + "\nstats: { " +
-               (mStats != null ? mStats.toString() : null) + " }";
+                mName + "\ncreated_time: " + mCreatedTime + "\nstats: { " +
+                (mStats != null ? mStats.toString() : null) + " }";
     }
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/VideoList.java b/sample/src/main/java/com/vimeo/sample/model/VideoList.java
index 4bccce43..f427492b 100644
--- a/sample/src/main/java/com/vimeo/sample/model/VideoList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/VideoList.java
@@ -37,4 +37,4 @@
 @UseStag
 public class VideoList extends AbstractDataList<Video> {
 
-}
+}
\ No newline at end of file

From d64f0bebfde93f13249a48d4aec51a311977aca3 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 16:06:24 +0530
Subject: [PATCH 074/159] removed the code for publishing modules into
 artifactory

---
 stag-library-compiler/build.gradle | 76 -----------------------------
 stag-library/build.gradle          | 77 ------------------------------
 2 files changed, 153 deletions(-)

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 54ea9a7b..6e136a93 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -85,80 +85,4 @@ allprojects {
             }
         }
     }
-}
-
-group = ARTIFACTORY_GROUP
-version = VERSION_NAME_STAG_COMPILER
-status = STATUS
-
-apply plugin: 'artifactory'
-apply plugin: 'com.github.dcendents.android-maven'
-
-configurations {
-    published
-}
-
-task sourceJar(type: Jar) {
-    from 'src/main/java'
-    classifier "sources"
-}
-
-artifactoryPublish {
-    dependsOn sourceJar
-}
-
-artifacts {
-    published sourceJar
-}
-
-configure(install.repositories.mavenInstaller) {
-    pom.project {
-        licenses {
-            license {
-                name 'The Apache Software License, Version 2.0'
-                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                distribution 'repo'
-            }
-        }
-    }
-}
-
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-artifactory {
-    contextUrl = ARTIFACTORY_REPO_URL
-    publish {
-        repository {
-            repoKey = REPO_KEY //The Artifactory repository key to publish to
-            //username = artifactory_user //The publisher user name, property taken from gradle.properties
-            //password = artifactory_password //The publisher password, property taken from gradle.properties
-        }
-        defaults {
-            publishConfigs('archives', 'published')
-            properties = ['build.status': "$it.project.status".toString()]
-            publishPom = true //Publish generated POM files to Artifactory (true by default)
-            publishIvy = false
-            //Publish generated Ivy descriptor files to Artifactory (true by default)
-        }
-    }
-    resolve {
-        repository {
-            repoKey = REPO_KEY //The Artifactory (preferably virtual) repository key to resolve from
-            //username = artifactory_user //Optional resolver user name (leave out to use anonymous resolution), property taken from gradle.properties
-            //password = artifactory_password //The resolver password, property taken from gradle.properties
-        }
-    }
 }
\ No newline at end of file
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 405e9d58..c82f7225 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -72,81 +72,4 @@ allprojects {
             }
         }
     }
-}
-
-
-group = ARTIFACTORY_GROUP
-version = VERSION_NAME_STAG
-status = STATUS
-
-apply plugin: 'artifactory'
-apply plugin: 'com.github.dcendents.android-maven'
-
-configurations {
-    published
-}
-
-task sourceJar(type: Jar) {
-    from 'src/main/java'
-    classifier "sources"
-}
-
-artifactoryPublish {
-    dependsOn sourceJar
-}
-
-artifacts {
-    published sourceJar
-}
-
-configure(install.repositories.mavenInstaller) {
-    pom.project {
-        licenses {
-            license {
-                name 'The Apache Software License, Version 2.0'
-                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                distribution 'repo'
-            }
-        }
-    }
-}
-
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-artifactory {
-    contextUrl = ARTIFACTORY_REPO_URL
-    publish {
-        repository {
-            repoKey = REPO_KEY //The Artifactory repository key to publish to
-            //username = artifactory_user //The publisher user name, property taken from gradle.properties
-            //password = artifactory_password //The publisher password, property taken from gradle.properties
-        }
-        defaults {
-            publishConfigs('archives', 'published')
-            properties = ['build.status': "$it.project.status".toString()]
-            publishPom = true //Publish generated POM files to Artifactory (true by default)
-            publishIvy = false
-            //Publish generated Ivy descriptor files to Artifactory (true by default)
-        }
-    }
-    resolve {
-        repository {
-            repoKey = REPO_KEY //The Artifactory (preferably virtual) repository key to resolve from
-            //username = artifactory_user //Optional resolver user name (leave out to use anonymous resolution), property taken from gradle.properties
-            //password = artifactory_password //The resolver password, property taken from gradle.properties
-        }
-    }
 }
\ No newline at end of file

From f58c38e5143688f8bb824be0d5148404d5fcb427 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 23 Dec 2016 19:27:17 +0530
Subject: [PATCH 075/159] bug fix, with JsonObjectTypeAdapter while reading

---
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 626d28d7..ac1c716f 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -677,7 +677,7 @@ public JsonObject read(JsonReader in) throws IOException {
             if (null != jsonElement && !jsonElement.isJsonObject()) {
                 throw new IOException("Could not parse it as a JsonObject");
             }
-            return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonObject() : null;
+            return null != jsonElement && jsonElement.isJsonObject() ? jsonElement.getAsJsonObject() : null;
         }
     }
 

From 39d51b51614ad25d163da2b4eb0d4449e57074a3 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sun, 25 Dec 2016 00:58:02 +0530
Subject: [PATCH 076/159] do not serialize/deseriable fields that are marked
 transient

---
 .../src/main/java/com/vimeo/stag/processor/StagProcessor.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 4876a671..d8a84eb7 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -156,7 +156,8 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                                 Set<Modifier> modifiers = variableElement.getModifiers();
                                 TypeMirror enclosingClass = enclosingElement.asType();
                                 if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
-                                    if (!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) {
+                                    if (!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)
+                                            || !modifiers.contains(Modifier.TRANSIENT)) {
                                         if (!TypeUtils.isAbstract(enclosingElement)) {
                                             checkModifiers(variableElement, modifiers);
                                             mSupportedTypes.add(enclosingClass);

From 8ce9c0da0d746dac30ade91825a3637ed8519901 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sun, 25 Dec 2016 01:04:58 +0530
Subject: [PATCH 077/159] do not serialize/deseriable fields that are marked
 transient, added a model class for same

---
 .../{AccessModifiers.java => ModifierUsageModel.java}     | 8 +++++++-
 .../main/java/com/vimeo/stag/processor/StagProcessor.java | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename sample/src/main/java/com/vimeo/sample/model/{AccessModifiers.java => ModifierUsageModel.java} (87%)

diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java
similarity index 87%
rename from sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
rename to sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java
index e26e9ffd..fd49139a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java
@@ -32,7 +32,7 @@
  * Private modifier is not allowed.
  */
 @UseStag
-public class AccessModifiers {
+public class ModifierUsageModel {
 
     @GsonAdapterKey("publicModifier")
     public String publicModifier;
@@ -42,4 +42,10 @@ public class AccessModifiers {
 
     @GsonAdapterKey("defaultModifier")
     String defaultModifier;
+
+    //do not include fields of these types in TypeAdapter
+    public static final String DEMO = "demo";
+
+    //do not serialize/deserialize transient fields
+    transient String transientField;
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index d8a84eb7..e983e9ab 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -156,8 +156,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                                 Set<Modifier> modifiers = variableElement.getModifiers();
                                 TypeMirror enclosingClass = enclosingElement.asType();
                                 if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
-                                    if (!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)
-                                            || !modifiers.contains(Modifier.TRANSIENT)) {
+                                    if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
                                         if (!TypeUtils.isAbstract(enclosingElement)) {
                                             checkModifiers(variableElement, modifiers);
                                             mSupportedTypes.add(enclosingClass);

From 2c528806b7a0717506ab38be02e074e961f0f564 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sun, 25 Dec 2016 09:49:18 +0530
Subject: [PATCH 078/159] reverted the commit of class name change

---
 .../model/{ModifierUsageModel.java => AccessModifiers.java}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename sample/src/main/java/com/vimeo/sample/model/{ModifierUsageModel.java => AccessModifiers.java} (98%)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
similarity index 98%
rename from sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java
rename to sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index fd49139a..65c5d6dd 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ModifierUsageModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -32,7 +32,7 @@
  * Private modifier is not allowed.
  */
 @UseStag
-public class ModifierUsageModel {
+public class AccessModifiers {
 
     @GsonAdapterKey("publicModifier")
     public String publicModifier;

From fc940e4ad8616953975fee0eeb5e142e66007f8d Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 26 Dec 2016 16:07:53 +0530
Subject: [PATCH 079/159] generate type adapter for classes that extends
 abstract classes, and do not generate typeadapter for abstract classes

---
 .../vimeo/stag/processor/StagProcessor.java   | 54 +++++++++----------
 .../processor/generators/StagGenerator.java   | 27 +++++-----
 .../vimeo/stag/processor/utils/TypeUtils.java | 11 ++++
 3 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index e983e9ab..7ee5cd28 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -121,6 +121,26 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.RELEASE_7;
     }
 
+    private void addToSupportedTypes(@NotNull Element element, @NotNull Map<Element, List<VariableElement>> variableMap, @NotNull Element rootElement) {
+        if (element instanceof VariableElement) {
+            final VariableElement variableElement = (VariableElement) element;
+            Set<Modifier> modifiers = variableElement.getModifiers();
+            Element enclosingElement = variableElement.getEnclosingElement();
+            if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
+                checkModifiers(variableElement, modifiers);
+                if (!TypeUtils.isAbstract(element)) {
+                    mSupportedTypes.add(enclosingElement.asType());
+                }
+                addToListMap(variableMap, rootElement, variableElement);
+            }
+        } else if (element instanceof TypeElement) {
+            if (!TypeUtils.isAbstract(element)) {
+                mSupportedTypes.add(element.asType());
+            }
+            addToListMap(variableMap, element, null);
+        }
+    }
+
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (mHasBeenProcessed) {
@@ -143,35 +163,12 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         Set<? extends Element> rootElements = roundEnv.getRootElements();
         for (Element rootElement : rootElements) {
             if (rootElement.getAnnotation(UseStag.class) != null) {
-                if (ElementUtils.isEnum(rootElement)) {
+                if (!TypeUtils.isAbstract(rootElement)) {
                     mSupportedTypes.add(rootElement.asType());
                     addToListMap(variableMap, rootElement, null);
-                } else {
-                    List<? extends Element> enclosedElements = rootElement.getEnclosedElements();
-                    for (Element enclosedElement : enclosedElements) {
-                        if (enclosedElement instanceof VariableElement) {
-                            final VariableElement variableElement = (VariableElement) enclosedElement;
-                            Element enclosingElement = variableElement.getEnclosingElement();
-                            if (!ElementUtils.isEnum(enclosingElement)) {
-                                Set<Modifier> modifiers = variableElement.getModifiers();
-                                TypeMirror enclosingClass = enclosingElement.asType();
-                                if (TypeUtils.isParameterizedType(enclosingClass) || TypeUtils.isConcreteType(enclosingClass)) {
-                                    if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
-                                        if (!TypeUtils.isAbstract(enclosingElement)) {
-                                            checkModifiers(variableElement, modifiers);
-                                            mSupportedTypes.add(enclosingClass);
-                                        }
-                                        addToListMap(variableMap, enclosingElement, variableElement);
-                                    }
-                                }
-                            }
-                        } else if (enclosedElement instanceof TypeElement) {
-                            if (!TypeUtils.isAbstract(enclosedElement)) {
-                                mSupportedTypes.add(enclosedElement.asType());
-                            }
-                            addToListMap(variableMap, enclosedElement, null);
-                        }
-                    }
+                }
+                for (Element enclosedElement : rootElement.getEnclosedElements()) {
+                    addToSupportedTypes(enclosedElement, variableMap, rootElement);
                 }
             }
         }
@@ -179,8 +176,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         Filer filer = processingEnv.getFiler();
         try {
             for (Entry<Element, List<VariableElement>> entry : variableMap.entrySet()) {
-                SupportedTypesModel.getInstance()
-                        .addSupportedType(new AnnotatedClass(entry.getKey(), entry.getValue()));
+                SupportedTypesModel.getInstance().addSupportedType(new AnnotatedClass(entry.getKey(), entry.getValue()));
             }
             try {
                 mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 0422f3e3..16b2ae17 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -113,21 +113,22 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
         Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
-            String adapterFactoryMethodName = null;
-            ClassInfo classInfo = new ClassInfo(knownType);
-            List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
-            if (null == typeArguments || typeArguments.isEmpty()) {
-                adapterFactoryMethodName = classInfo.getTypeAdapterClassName();
-                if (knownFieldNames.contains(adapterFactoryMethodName)) {
-                    adapterFactoryMethodName =
-                            adapterFactoryMethodName + String.valueOf(knownFieldNames.size());
+            if (!TypeUtils.isAbstract(knownType)) {
+                String adapterFactoryMethodName = null;
+                ClassInfo classInfo = new ClassInfo(knownType);
+                List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
+                if (null == typeArguments || typeArguments.isEmpty()) {
+                    adapterFactoryMethodName = classInfo.getTypeAdapterClassName();
+                    if (knownFieldNames.contains(adapterFactoryMethodName)) {
+                        adapterFactoryMethodName = adapterFactoryMethodName + String.valueOf(knownFieldNames.size());
+                    }
+                    knownFieldNames.add(adapterFactoryMethodName);
+                } else {
+                    genericClasses.add(classInfo);
                 }
-                knownFieldNames.add(adapterFactoryMethodName);
-            } else {
-                genericClasses.add(classInfo);
+                mKnownClasses.add(classInfo);
+                mFieldNameMap.put(knownType.toString(), adapterFactoryMethodName);
             }
-            mKnownClasses.add(classInfo);
-            mFieldNameMap.put(knownType.toString(), adapterFactoryMethodName);
         }
 
         for (ClassInfo knownGenericType : genericClasses) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 43322a9e..dc9def0d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -135,6 +135,17 @@ public static boolean isAbstract(@Nullable Element element) {
         return element != null && element.getModifiers().contains(Modifier.ABSTRACT);
     }
 
+    /**
+     * Determines whether or not the Element is a abstract type.
+     *
+     * @param typeMirror the element to check.
+     * @return true if the element is abstract and
+     * contains no generic type arguments, false otherwise.
+     */
+    public static boolean isAbstract(@Nullable TypeMirror typeMirror) {
+        return (typeMirror instanceof DeclaredType) && isAbstract(((DeclaredType) typeMirror).asElement());
+    }
+
     /**
      * Determines whether or not the Element is a parameterized type.
      * If the element is a parameterized type or contains parameterized type

From 9b391d8a2c78dc8a90635019ba62e2f5ccec3342 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 02:23:25 +0530
Subject: [PATCH 080/159] Adding support for cross module POJOs if they have
 been created by Stag.

---
 sample-model/.gitignore                       |   1 +
 sample-model/build.gradle                     |  51 +++++++
 sample-model/proguard-rules.pro               |  17 +++
 sample-model/src/main/AndroidManifest.xml     |   9 ++
 .../vimeo/sample_model/ExternalModel1.java    |  14 ++
 .../sample_model/ExternalModelGeneric.java    |  14 ++
 .../sample_model/ExternalModelGeneric1.java   |  20 +++
 sample-model/src/main/res/values/strings.xml  |   3 +
 sample/build.gradle                           |   1 +
 .../sample/model/ExternalModelExample.java    |  27 ++++
 .../sample/model/ExternalModelExample1.java   |  31 +++++
 .../sample/model/ExternalModelExample2.java   |  31 +++++
 .../com/vimeo/sample/model/GenericClass.java  |   8 ++
 settings.gradle                               |   2 +-
 .../vimeo/stag/processor/StagProcessor.java   |  23 ++-
 .../generators/ExternalAdapterInfo.java       |  77 ++++++++++
 .../processor/generators/StagGenerator.java   |  33 ++++-
 .../generators/TypeAdapterGenerator.java      | 131 ++++++++++++------
 .../utils/KnownTypeAdapterUtils.java          |   5 +-
 19 files changed, 444 insertions(+), 54 deletions(-)
 create mode 100644 sample-model/.gitignore
 create mode 100644 sample-model/build.gradle
 create mode 100644 sample-model/proguard-rules.pro
 create mode 100644 sample-model/src/main/AndroidManifest.xml
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
 create mode 100644 sample-model/src/main/res/values/strings.xml
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ExternalModelExample1.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java

diff --git a/sample-model/.gitignore b/sample-model/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/sample-model/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/sample-model/build.gradle b/sample-model/build.gradle
new file mode 100644
index 00000000..639911d9
--- /dev/null
+++ b/sample-model/build.gradle
@@ -0,0 +1,51 @@
+apply plugin: 'com.android.library'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+    }
+}
+
+apply plugin: 'com.neenbedankt.android-apt'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    testCompile 'junit:junit:4.12'
+    compile project(':stag-library')
+    apt project(':stag-library-compiler')
+    compile 'com.google.code.gson:gson:2.8.0'
+}
+
+apt {
+    arguments {
+        stagGeneratedPackageName "com.vimeo.sample.sample_model.stag.generated"
+    }
+}
diff --git a/sample-model/proguard-rules.pro b/sample-model/proguard-rules.pro
new file mode 100644
index 00000000..46cb5988
--- /dev/null
+++ b/sample-model/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/mohammad.yasir/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/sample-model/src/main/AndroidManifest.xml b/sample-model/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..998b3fbe
--- /dev/null
+++ b/sample-model/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.vimeo.sample_model">
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
new file mode 100644
index 00000000..eccbafd6
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample_model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModel1 {
+
+    @SerializedName("field1")
+    public String mField1;
+
+    @SerializedName("genericField")
+    public ExternalModelGeneric<String> mGenericField;
+}
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
new file mode 100644
index 00000000..99cd4ab0
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample_model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelGeneric<T> {
+
+    @SerializedName("field2")
+    public String mField2;
+
+    @SerializedName("genericField")
+    public T mGenericField;
+}
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
new file mode 100644
index 00000000..41a6b386
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
@@ -0,0 +1,20 @@
+package com.vimeo.sample_model;
+
+import android.webkit.ValueCallback;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelGeneric1<T> {
+
+    @SerializedName("field2")
+    public String mField2;
+
+    @SerializedName("genericField")
+    public T mGenericField;
+
+    @SerializedName("unkownType")
+    public ValueCallback<T> mUnknownType;
+
+}
diff --git a/sample-model/src/main/res/values/strings.xml b/sample-model/src/main/res/values/strings.xml
new file mode 100644
index 00000000..f9da2f44
--- /dev/null
+++ b/sample-model/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">sample-model</string>
+</resources>
diff --git a/sample/build.gradle b/sample/build.gradle
index 31070023..5157f765 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.4.0'
 
     compile project(':stag-library')
+    compile project(':sample-model')
     apt project(':stag-library-compiler')
     compile 'com.google.code.gson:gson:2.8.0'
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
new file mode 100644
index 00000000..6420b98c
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
@@ -0,0 +1,27 @@
+package com.vimeo.sample.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.sample_model.ExternalModel1;
+import com.vimeo.sample_model.ExternalModelGeneric;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelExample<T> {
+
+    @SerializedName("stringField")
+    public String mStringField;
+
+    @SerializedName("externalExample")
+    public ExternalModel1 mExternalModel;
+
+    @SerializedName("externalGenericExample")
+    public ExternalModelGeneric<String> mExternalGenericExample;
+
+    @SerializedName("parametrizedExternalGenericExample")
+    public ExternalModelGeneric<T> mParametrizedExternalGenericExample;
+
+
+    @SerializedName("parametrizedInternalGenericExample")
+    public GenericClass<T> mParametrizedInternalGenericExample;
+
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample1.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample1.java
new file mode 100644
index 00000000..53f3ab0b
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample1.java
@@ -0,0 +1,31 @@
+package com.vimeo.sample.model;
+
+import android.webkit.ValueCallback;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.sample_model.ExternalModel1;
+import com.vimeo.sample_model.ExternalModelGeneric;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelExample1<T> {
+
+    @SerializedName("stringField")
+    public String mStringField;
+
+    @SerializedName("externalExample")
+    public ExternalModel1 mExternalModel;
+
+    @SerializedName("externalGenericExample")
+    public ExternalModelGeneric<String> mExternalGenericExample;
+
+    @SerializedName("parametrizedExternalGenericExample")
+    public ExternalModelGeneric<T> mParametrizedExternalGenericExample;
+
+
+    @SerializedName("parametrizedInternalGenericExample")
+    public GenericClass<T> mParametrizedInternalGenericExample;
+
+    @SerializedName("valueCallback")
+    public ValueCallback<T> mReallyUnknownType;
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
new file mode 100644
index 00000000..da43c9b3
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
@@ -0,0 +1,31 @@
+package com.vimeo.sample.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.sample_model.ExternalModel1;
+import com.vimeo.sample_model.ExternalModelGeneric;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelExample2<T> {
+
+    @SerializedName("stringField")
+    public String mStringField;
+
+    @SerializedName("externalExample")
+    public ExternalModel1 mExternalModel;
+
+    @SerializedName("externalGenericExample")
+    public ExternalModelGeneric<String> mExternalGenericExample;
+
+    @SerializedName("parametrizedExternalGenericExample")
+    public ExternalModelGeneric<T> mParametrizedExternalGenericExample;
+
+
+    @SerializedName("parametrizedInternalGenericExample")
+    public GenericClass<T> mParametrizedInternalGenericExample;
+
+
+    @SerializedName("parametrizedUnkownExternalGenericExample")
+    public ExternalModelExample2<T> mParametrizedUnkownExternalGenericExample;
+
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
index 3ef00f20..2dea0a4c 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
@@ -27,6 +27,8 @@
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -42,4 +44,10 @@ public class GenericClass<T> {
 
     @GsonAdapterKey("map")
     public Map<String, Map<String, T>> mapField;
+
+    @GsonAdapterKey("mapInteger")
+    public HashMap<Integer, T> mapIntegerField;
+
+    @GsonAdapterKey("arrayInteger")
+    public ArrayList<T> arrayIntegerField;
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 5fe8d5ed..997fe9b0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':stag-library', ':stag-library-compiler', ':sample'
+include ':stag-library', ':stag-library-compiler', ':sample', ':sample-model'
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 7ee5cd28..bca4bec3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -28,6 +28,7 @@
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.AdapterGenerator;
 import com.vimeo.stag.processor.generators.EnumTypeAdapterGenerator;
+import com.vimeo.stag.processor.generators.ExternalAdapterInfo;
 import com.vimeo.stag.processor.generators.StagGenerator;
 import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.TypeTokenConstantsGenerator;
@@ -62,11 +63,15 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
+import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
+
 @AutoService(Processor.class)
 @SupportedAnnotationTypes("com.vimeo.stag.UseStag")
 @SupportedOptions(value = {"stagGeneratedPackageName"})
@@ -77,6 +82,7 @@ public final class StagProcessor extends AbstractProcessor {
     private static final String OPTION_PACKAGE_NAME = "stagGeneratedPackageName";
     private static final String DEFAULT_GENERATED_PACKAGE_NAME = "com.vimeo.stag.generated";
     private final Set<TypeMirror> mSupportedTypes = new HashSet<>();
+    private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
     private boolean mHasBeenProcessed;
 
     private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key, @Nullable VariableElement value) {
@@ -121,7 +127,10 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.RELEASE_7;
     }
 
-    private void addToSupportedTypes(@NotNull Element element, @NotNull Map<Element, List<VariableElement>> variableMap, @NotNull Element rootElement) {
+    private void addToSupportedTypes(@NotNull Element element,
+                                     @NotNull Map<Element, List<VariableElement>> variableMap,
+                                     @NotNull Element rootElement,
+                                     @NotNull String stagFactoryGeneratedName) {
         if (element instanceof VariableElement) {
             final VariableElement variableElement = (VariableElement) element;
             Set<Modifier> modifiers = variableElement.getModifiers();
@@ -130,6 +139,13 @@ private void addToSupportedTypes(@NotNull Element element, @NotNull Map<Element,
                 checkModifiers(variableElement, modifiers);
                 if (!TypeUtils.isAbstract(element)) {
                     mSupportedTypes.add(enclosingElement.asType());
+
+                    //If this is of a type which is not part of this module, but generated by Stag, we should use it
+                    ExternalAdapterInfo externalAdapterInfo = ExternalAdapterInfo.checkAndInitialize(processingEnv.getElementUtils(),
+                            stagFactoryGeneratedName ,variableElement);
+                    if(null != externalAdapterInfo) {
+                        mExternalSupportedAdapters.add(externalAdapterInfo);
+                    }
                 }
                 addToListMap(variableMap, rootElement, variableElement);
             }
@@ -152,6 +168,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             packageName = DEFAULT_GENERATED_PACKAGE_NAME;
         }
 
+        String stagFactoryGeneratedName = StagGenerator.getGeneratedFactoryClassAndPackage(packageName);
         TypeUtils.initialize(processingEnv.getTypeUtils());
         ElementUtils.initialize(processingEnv.getElementUtils());
 
@@ -168,7 +185,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                     addToListMap(variableMap, rootElement, null);
                 }
                 for (Element enclosedElement : rootElement.getEnclosedElements()) {
-                    addToSupportedTypes(enclosedElement, variableMap, rootElement);
+                    addToSupportedTypes(enclosedElement, variableMap, rootElement, stagFactoryGeneratedName);
                 }
             }
         }
@@ -183,7 +200,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             } catch (Exception ignored) {
             }
 
-            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes);
+            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes, mExternalSupportedAdapters);
             TypeTokenConstantsGenerator typeTokenConstantsGenerator = new TypeTokenConstantsGenerator(filer, packageName);
 
             Set<Element> list = SupportedTypesModel.getInstance().getSupportedElements();
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
new file mode 100644
index 00000000..c582ed65
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -0,0 +1,77 @@
+package com.vimeo.stag.processor.generators;
+
+
+import com.vimeo.stag.UseStag;
+import com.vimeo.stag.processor.generators.model.ClassInfo;
+import com.vimeo.stag.processor.utils.ElementUtils;
+import com.vimeo.stag.processor.utils.TypeUtils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+
+public class ExternalAdapterInfo {
+
+    @NotNull
+    public final Element mExternalClassType;
+
+    @NotNull
+    public final TypeElement mAdapterType;
+
+    @NotNull
+    public final ExecutableElement mAdapterConstructor;
+
+    public ExternalAdapterInfo(Element typeElement, TypeElement adapterTypeElement, ExecutableElement adapterConstructor) {
+        this.mExternalClassType = typeElement;
+        this.mAdapterType = adapterTypeElement;
+        this.mAdapterConstructor = adapterConstructor;
+    }
+
+    @Nullable
+    public static ExternalAdapterInfo checkAndInitialize(@NotNull Elements elementUtils, @NotNull String stagFactoryGeneratedName, @NotNull VariableElement variableElement) {
+        TypeMirror typeMirror = variableElement.asType();
+        if(!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
+            DeclaredType declaredType = (DeclaredType)typeMirror;
+            Element typeElement = declaredType.asElement();
+            UseStag useStag = null != typeElement ? typeElement.getAnnotation(UseStag.class) : null;
+            if(null != useStag) {
+                TypeElement adapterTypeElement = elementUtils.getTypeElement(typeElement.toString() + "$TypeAdapter");
+                if(null != adapterTypeElement) {
+                    for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
+                        if(adapterEnclosedElement instanceof ExecutableElement) {
+                            ExecutableElement executableElement = ((ExecutableElement)adapterEnclosedElement);
+                            Name name = executableElement.getSimpleName();
+                            if(name.contentEquals("<init>") && executableElement.getParameters().size() >= 2  && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
+                                return new ExternalAdapterInfo(typeElement, adapterTypeElement,  executableElement);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @NotNull
+    public String getInitializer(@NotNull String gsonVariableName, @NotNull String concatenatedTypeAdapters) {
+        int paramsSize = mAdapterConstructor.getParameters().size();
+        if(paramsSize == 2) {
+            return "new " + mAdapterType.toString() + "(" + gsonVariableName + ", " + getFactoryInitializer() + ")";
+        } else {
+            return "new " + mAdapterType.toString() + "(" + gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
+        }
+    }
+
+    @NotNull
+    public String getFactoryInitializer() {
+        return "new " + mAdapterConstructor.getParameters().get(1).asType() + "()";
+    }
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 16b2ae17..80c24cfc 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -59,6 +59,7 @@
 
 import javax.annotation.processing.Filer;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
@@ -84,6 +85,10 @@ public class StagGenerator {
         KNOWN_COLLECTION_GENERIC_CLASSES.put(ArrayList.class.getName(), new GenericClassInfo(1, false));
     }
 
+    public static String getGeneratedFactoryClassAndPackage(String generatedPackageName) {
+        return generatedPackageName + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
+    }
+
     @NotNull
     private final Filer mFiler;
     @NotNull
@@ -105,11 +110,19 @@ public class StagGenerator {
     @NotNull
     private final Set<TypeMirror> mKnownTypes;
 
-    public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer, @NotNull Set<TypeMirror> knownTypes) {
+    @NotNull
+    private final Map<String, ExternalAdapterInfo> mExternalSupportedAdapters;
+
+    public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
+                         @NotNull Set<TypeMirror> knownTypes, @NotNull Set<ExternalAdapterInfo> externalSupportedAdapters) {
         mFiler = filer;
         mKnownTypes = knownTypes;
         mGeneratedPackageName = generatedPackageName;
         mKnownClasses = new ArrayList<>(knownTypes.size());
+        mExternalSupportedAdapters = new HashMap<>(externalSupportedAdapters.size());
+
+
+
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
         Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
@@ -131,6 +144,12 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             }
         }
 
+        for(ExternalAdapterInfo entry : externalSupportedAdapters) {
+            TypeMirror externalType = entry.mExternalClassType.asType();
+            mExternalSupportedAdapters.put(externalType.toString(), entry);
+        }
+
+
         for (ClassInfo knownGenericType : genericClasses) {
             List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
             AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
@@ -142,6 +161,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                     break;
                 }
             }
+
             mGenericClassInfo.put(knownGenericType.getType().toString(), new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
         }
     }
@@ -164,7 +184,8 @@ private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
             Element outerClassType = declaredType.asElement();
             if (!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
                     !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
-                    !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString())) {
+                    !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
+                    !mExternalSupportedAdapters.containsKey(outerClassType.toString())) {
                 return false;
             }
 
@@ -207,6 +228,7 @@ public void generateTypeAdapterFactory(@NotNull String generatedPackageName) thr
         FileGenUtils.writeToFile(javaFile, mFiler);
     }
 
+
     @NotNull
     private TypeSpec getAdapterFactorySpec() {
         TypeVariableName genericTypeName = TypeVariableName.get("T");
@@ -333,7 +355,7 @@ private TypeSpec getAdapterFactorySpec() {
                     .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
 
-            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType().toString());
+            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType());
             if (null != knownTypeAdapterForType) {
                 fieldName += knownTypeAdapterForType;
             } else {
@@ -458,6 +480,11 @@ private String generateNameFromType(@NotNull String name, boolean isArray) {
         return isArray ? fieldNameBuilder.toString() + "Array" : fieldNameBuilder.toString();
     }
 
+
+    public ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
+        return mExternalSupportedAdapters.get(fieldType.toString());
+    }
+
     static class GenericClassInfo {
         int mNumArguments;
         boolean mHasUnknownVarTypeFields;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index fd790678..67b9335f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -77,9 +77,9 @@ public TypeAdapterGenerator(@NotNull ClassInfo info) {
      * This is used to generate the type token code for the types that are unknown.
      */
     @Nullable
-    private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldType,
-                                                          @NotNull Map<TypeVariable, String> typeVarsMap,
-                                                          @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
+    private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
+                                           @NotNull Map<TypeVariable, String> typeVarsMap,
+                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
@@ -101,7 +101,7 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
                     } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
                         result += ", " + typeVarsMap.get(parameterTypeMirror);
                     } else {
-                        result += ",\n" + getTypeTokenCodeForUnknownTypes(parameterTypeMirror, typeVarsMap, typeTokenConstantsGenerator) + ".getType()";
+                        result += ",\n" + getTypeTokenCode(parameterTypeMirror, typeVarsMap, typeTokenConstantsGenerator) + ".getType()";
                     }
                 }
                 result += ")";
@@ -117,9 +117,10 @@ private static String getTypeTokenCodeForUnknownTypes(@NotNull TypeMirror fieldT
      * This is used to generate the type token code for the types that are known.
      */
     @Nullable
-    private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
-                                           @NotNull Map<TypeVariable, String> typeVarsMap,
-                                           @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator) {
+    private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                             @NotNull MethodSpec.Builder constructorBuilder,
+                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
+                                             @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
@@ -134,33 +135,40 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                 if (TypeUtils.isSupportedMap(fieldType)) {
                     TypeMirror keyTypeMirror = typeMirrors.get(0);
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
-                    if (TypeUtils.isSupportedNative(keyTypeMirror.toString())) {
-                        if (TypeUtils.isSupportedMap(valueTypeMirror)) {
-                            /*
-                             * If it is a nested map, cases where the value is also a map, recursively call the function to
-                             * gets its type adapter
-                             */
-                            result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
-                        } else {
-                            result = typeVarsMap.get(valueTypeMirror);
-                        }
-                        result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter(" + KnownTypeAdapterUtils.getKnownTypeAdapterForType(keyTypeMirror.toString())
-                                + ", " + result + ", null)";
-                    } else {
-                        result = "com.google.gson.reflect.TypeToken.getParameterized(" + declaredFieldType.asElement().toString() + ".class";
-                    }
+                    String keyAdapterAccessor = getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiater(fieldType)+ ")";
                 } else if (TypeUtils.isSupportedCollection(fieldType)) {
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
-                    if (TypeUtils.isSupportedCollection(valueTypeMirror)) {
-                        /*
-                         * If it is a nested list, cases where the value is also a List, recursively call the function to
-                         * gets its type adapter
-                         */
-                        result = getTypeTokenCode(valueTypeMirror, typeVarsMap, typeTokenConstantsGenerator);
+                    String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiater(fieldType) +")";
+                } else if(null != typeMirrors && typeMirrors.size() > 0){
+                    TypeMirror outerClass = declaredFieldType.asElement().asType();
+                    mGsonVariableUsed = true;
+                    String outerClassString = outerClass.toString();
+                    int idx = outerClassString.indexOf("<");
+                    int idx1 = fieldType.toString().indexOf("<");
+                    String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
+                    if (idx > 0) {
+                        outerClassString = outerClassString.substring(0, idx);
+                    }
+                    List<? extends TypeMirror> typeArguments = declaredFieldType.getTypeArguments();
+                    ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
+
+                    String typeAdapterCode = "";
+                    for (TypeMirror typeMirror : typeArguments) {
+                        typeAdapterCode += ", " + getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
+                                , stagGenerator, adapterFieldInfo);
+                    }
+
+
+                    String adapterCode;
+                    if(null != externalAdapterInfo) {
+                        adapterCode = externalAdapterInfo.getInitializer("gson", typeAdapterCode);
                     } else {
-                        result = typeVarsMap.get(valueTypeMirror);
+                        adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$TypeAdapter") + argument + "(gson, stagFactory" + typeAdapterCode + ")";
                     }
-                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter(" + result + ", null)";
+                    return adapterCode.replace("$", "$$");
                 }
             }
         } else {
@@ -276,7 +284,7 @@ private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull
             String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
             TypeName typeName = getAdapterFieldTypeName(fieldType);
             adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCodeForUnknownTypes(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
         }
         return fieldName;
     }
@@ -284,12 +292,12 @@ private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull
     /**
      * Returns the adapter code for the known types.
      */
-    private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+    private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                       @NotNull MethodSpec.Builder constructorBuilder,
                                       @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
                                       @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
 
-        String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType.toString());
+        String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
 
         if (null != knownTypeAdapter) {
             return knownTypeAdapter;
@@ -385,16 +393,29 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
-                if (size != 0 && stagGenerator.getKnownTypes().contains(outerClass)) {
+                if (size != 0 &&
+                        (stagGenerator.getKnownTypes().contains(outerClass) ||
+                                (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
                     String outerClassString = outerClass.toString();
                     int idx = outerClassString.indexOf("<");
+                    int idx1 = fieldType.toString().indexOf("<");
+                    String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
                     if (idx > 0) {
                         outerClassString = outerClassString.substring(0, idx);
                     }
                     List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
-                    String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + "(gson, this, ";
+                    ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
+                    String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + argument + "(gson, ";
+
+                    if(null != externalAdapterInfo) {
+                        adapterCode += externalAdapterInfo.getFactoryInitializer();
+                    } else {
+                        adapterCode += "this";
+                    }
+
+                    adapterCode += ", ";
                     for (TypeMirror typeMirror : typeArguments) {
                         adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
                                 , stagGenerator, adapterFieldInfo);
@@ -402,18 +423,13 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                     adapterCode += ")";
                     return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
                 } else {
-                    getterField = stagGenerator.addFieldForUnknownType(fieldType);
-                    mGsonVariableUsed = true;
-                    mStagFactoryUsed = true;
-                    return "mStagFactory." + "get" + getterField + "(mGson)";
+                    return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator, adapterFieldInfo);
                 }
             } else {
-                getterField = stagGenerator.addFieldForUnknownType(fieldType);
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-                return "mStagFactory." + "get" + getterField + "(mGson)";
+                return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator, adapterFieldInfo);
             }
         } else {
+
             /*
              * If the fieldType is parameterized, generate the typeadapter in the constructor itself.
              */
@@ -424,12 +440,39 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSp
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                constructorBuilder.addStatement(fieldName + " = " + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator));
+                constructorBuilder.addStatement(fieldName + " = " + getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
+                        , stagGenerator, adapterFieldInfo));
             }
             return fieldName;
         }
     }
 
+    private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                          @NotNull MethodSpec.Builder constructorBuilder,
+                                          @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+        ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(fieldType);
+        if(null != externalAdapterInfo) {
+            //Generate the Type Adapter as a member variable
+            String fieldName = adapterFieldInfo.getFieldName(fieldType);
+            if (null == fieldName) {
+                fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+                adapterFieldInfo.addField(fieldType, fieldName);
+                String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                TypeName typeName = getAdapterFieldTypeName(fieldType);
+                adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                String statement = fieldName + " = " + externalAdapterInfo.getInitializer("gson", "");
+                constructorBuilder.addStatement(statement.replace("$", "$$"));
+            }
+
+            return fieldName;
+        } else {
+            String getterField = stagGenerator.addFieldForUnknownType(fieldType);
+            mGsonVariableUsed = true;
+            mStagFactoryUsed = true;
+            return "mStagFactory." + "get" + getterField + "(mGson)";
+        }
+    }
+
     @NotNull
     private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
                                               @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 9633f2db..ae665d16 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -65,8 +65,8 @@ public class KnownTypeAdapterUtils {
     }
 
     @Nullable
-    public static String getKnownTypeAdapterForType(String type) {
-        return mKnownTypeAdapters.get(type);
+    public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror) {
+        return mKnownTypeAdapters.get(typeMirror.toString());
     }
 
     /**
@@ -167,7 +167,6 @@ public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror type
     @Nullable
     public static String getJsonElementTypeAdapter(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        System.out.println(outerClassType);
         if (outerClassType.equals(JsonElement.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.JsonElementTypeAdapter()";
         } else if (outerClassType.equals(JsonArray.class.getName())) {

From 5331091d9a3760e85d712d6eb4b320dc362bcdc1 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 11:41:30 +0530
Subject: [PATCH 081/159] Handling some more cases

---
 .../sample/model/ExternalModelExample2.java   |  3 +-
 .../generators/TypeAdapterGenerator.java      | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
index da43c9b3..e92243c8 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
@@ -5,6 +5,8 @@
 import com.vimeo.sample_model.ExternalModelGeneric;
 import com.vimeo.stag.UseStag;
 
+import java.util.Map;
+
 @UseStag
 public class ExternalModelExample2<T> {
 
@@ -27,5 +29,4 @@ public class ExternalModelExample2<T> {
 
     @SerializedName("parametrizedUnkownExternalGenericExample")
     public ExternalModelExample2<T> mParametrizedUnkownExternalGenericExample;
-
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 67b9335f..b74262f1 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -132,7 +132,11 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                if (TypeUtils.isSupportedMap(fieldType)) {
+
+                if(null == typeMirrors && typeMirrors.size() == 0) {
+                    result = typeTokenConstantsGenerator.addTypeToken(fieldType);
+                }
+                else if (TypeUtils.isSupportedMap(fieldType)) {
                     TypeMirror keyTypeMirror = typeMirrors.get(0);
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
                     String keyAdapterAccessor = getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
@@ -142,7 +146,7 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
                     String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiater(fieldType) +")";
-                } else if(null != typeMirrors && typeMirrors.size() > 0){
+                } else {
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
                     mGsonVariableUsed = true;
                     String outerClassString = outerClass.toString();
@@ -364,14 +368,25 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                   */
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
-                TypeMirror keyType = declaredType.getTypeArguments().get(0);
-                TypeMirror valueType = declaredType.getTypeArguments().get(1);
-                String keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
-                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                String valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
-                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
-                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyType.toString() + "," + valueType.toString() + "," + fieldType.toString() + ">" +
+                List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+                String keyAdapterAccessor;
+                String valueAdapterAccessor;
+                String arguments  = "";
+                if(typeArguments != null && typeArguments.size() == 2) {
+                    TypeMirror keyType = typeArguments.get(0);
+                    TypeMirror valueType = typeArguments.get(1);
+                    keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
+                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
+                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                    arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " + fieldType.toString() + ">";
+                } else {
+                    keyAdapterAccessor =  "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
+                    valueAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
+                }
+
+                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter" + arguments +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR) {
                     String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
@@ -440,8 +455,12 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                constructorBuilder.addStatement(fieldName + " = " + getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
-                        , stagGenerator, adapterFieldInfo));
+                String typeAdapterCode = getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
+                        , stagGenerator, adapterFieldInfo);
+
+                if(null != typeAdapterCode) {
+                    constructorBuilder.addStatement(fieldName + " = " + typeAdapterCode);
+                }
             }
             return fieldName;
         }

From 557f711ec4077785aa2cc55b3f44c6199f653c6e Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 13:13:19 +0530
Subject: [PATCH 082/159] Handling cases where a Map with value as an external
 module type was not working

---
 .../sample/model/ExternalModelExample.java    |  6 +++++
 .../generators/TypeAdapterGenerator.java      | 25 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
index 6420b98c..1bd2442b 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
@@ -5,6 +5,8 @@
 import com.vimeo.sample_model.ExternalModelGeneric;
 import com.vimeo.stag.UseStag;
 
+import java.util.Map;
+
 @UseStag
 public class ExternalModelExample<T> {
 
@@ -24,4 +26,8 @@ public class ExternalModelExample<T> {
     @SerializedName("parametrizedInternalGenericExample")
     public GenericClass<T> mParametrizedInternalGenericExample;
 
+
+    @SerializedName("mapExternalModel")
+    public Map<String, ExternalModel1> mMapExternalModel;
+
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index b74262f1..6b0a20ef 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -334,7 +334,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
-                    if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR) {
+                    if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                         String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
@@ -354,7 +354,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
-                if (declaredType.getKind() != TypeKind.TYPEVAR) {
+                if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                     String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
@@ -388,7 +388,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
 
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter" + arguments +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
-                if (declaredType.getKind() != TypeKind.TYPEVAR) {
+                if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                     String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
@@ -436,7 +436,12 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                                 , stagGenerator, adapterFieldInfo);
                     }
                     adapterCode += ")";
-                    return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
+                    if(!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
+                        return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
+                    } else {
+                        return adapterCode;
+                    }
+
                 } else {
                     return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator, adapterFieldInfo);
                 }
@@ -507,6 +512,18 @@ private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassIn
                 adapterAccessor = getAdapterForUnknownType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+
+                if(null != adapterAccessor && adapterAccessor.startsWith("new ")) {
+                    //Add this to a member variable
+                    String fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
+                    result.addField(fieldType, fieldName);
+                    String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+                    TypeName typeName = getAdapterFieldTypeName(fieldType);
+                    adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+                    String statement = fieldName + " = " + adapterAccessor;
+                    constructorBuilder.addStatement(statement.replace("$", "$$"));
+                    adapterAccessor = fieldName;
+                }
             }
 
             if (null != adapterAccessor) {

From b09c293dcba41f5dc80524ffd1be450dff1b9ae1 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 13:19:47 +0530
Subject: [PATCH 083/159] Handling a scenario of external generic types not
 being recognised

---
 .../main/java/com/vimeo/sample/model/ExternalModelExample.java  | 1 +
 .../java/com/vimeo/stag/processor/generators/StagGenerator.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
index 1bd2442b..4fd672e6 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
@@ -30,4 +30,5 @@ public class ExternalModelExample<T> {
     @SerializedName("mapExternalModel")
     public Map<String, ExternalModel1> mMapExternalModel;
 
+
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 80c24cfc..651bdfb0 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -185,7 +185,7 @@ private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
             if (!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
                     !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
                     !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
-                    !mExternalSupportedAdapters.containsKey(outerClassType.toString())) {
+                    !mExternalSupportedAdapters.containsKey(typeMirror.toString())) {
                 return false;
             }
 

From a1a78da2fb7f18c49d18c47d9e9df324c8138b6d Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 13:21:58 +0530
Subject: [PATCH 084/159] Adding more scenarios

---
 .../java/com/vimeo/sample/model/ExternalModelExample.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
index 4fd672e6..3c14842f 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
@@ -31,4 +31,10 @@ public class ExternalModelExample<T> {
     public Map<String, ExternalModel1> mMapExternalModel;
 
 
+    @SerializedName("mapExternalGenericModel")
+    public Map<String, ExternalModelGeneric<String>> mMapExternalGenericModel;
+
+    @SerializedName("mapExternalGenericGenericModel")
+    public Map<String, ExternalModelGeneric<T>> mMapExternalGenericGenericModel;
+
 }

From 20aaadcec33e23d40d069acfc1ccaee4b38e28be Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 18:06:05 +0530
Subject: [PATCH 085/159] Handling the case when the external type could have
 been part of a type argument

---
 .../vimeo/stag/processor/StagProcessor.java   | 10 +----
 .../generators/ExternalAdapterInfo.java       | 45 ++++++++++++++-----
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index bca4bec3..bbdb41bc 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -63,12 +63,9 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
-import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
 
@@ -141,11 +138,8 @@ private void addToSupportedTypes(@NotNull Element element,
                     mSupportedTypes.add(enclosingElement.asType());
 
                     //If this is of a type which is not part of this module, but generated by Stag, we should use it
-                    ExternalAdapterInfo externalAdapterInfo = ExternalAdapterInfo.checkAndInitialize(processingEnv.getElementUtils(),
-                            stagFactoryGeneratedName ,variableElement);
-                    if(null != externalAdapterInfo) {
-                        mExternalSupportedAdapters.add(externalAdapterInfo);
-                    }
+                    ExternalAdapterInfo.addExternalAdapters(processingEnv.getElementUtils(),
+                            stagFactoryGeneratedName , variableElement.asType(), mExternalSupportedAdapters);
                 }
                 addToListMap(variableMap, rootElement, variableElement);
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index c582ed65..98fe53de 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -4,11 +4,17 @@
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.utils.ElementUtils;
+import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Name;
@@ -35,29 +41,46 @@ public ExternalAdapterInfo(Element typeElement, TypeElement adapterTypeElement,
         this.mAdapterConstructor = adapterConstructor;
     }
 
+    private static Set<String> sCheckedClasses = new HashSet<>();
+
     @Nullable
-    public static ExternalAdapterInfo checkAndInitialize(@NotNull Elements elementUtils, @NotNull String stagFactoryGeneratedName, @NotNull VariableElement variableElement) {
-        TypeMirror typeMirror = variableElement.asType();
+    public static void addExternalAdapters(@NotNull Elements elementUtils,
+                                                          @NotNull String stagFactoryGeneratedName,
+                                                          @NotNull TypeMirror typeMirror,
+                                                          @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
         if(!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
             DeclaredType declaredType = (DeclaredType)typeMirror;
             Element typeElement = declaredType.asElement();
             UseStag useStag = null != typeElement ? typeElement.getAnnotation(UseStag.class) : null;
             if(null != useStag) {
-                TypeElement adapterTypeElement = elementUtils.getTypeElement(typeElement.toString() + "$TypeAdapter");
-                if(null != adapterTypeElement) {
-                    for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
-                        if(adapterEnclosedElement instanceof ExecutableElement) {
-                            ExecutableElement executableElement = ((ExecutableElement)adapterEnclosedElement);
-                            Name name = executableElement.getSimpleName();
-                            if(name.contentEquals("<init>") && executableElement.getParameters().size() >= 2  && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
-                                return new ExternalAdapterInfo(typeElement, adapterTypeElement,  executableElement);
+                ClassInfo classInfo = new ClassInfo(typeElement.asType());
+                String classAdapterName = FileGenUtils.unescapeEscapedString(classInfo.getTypeAdapterQualifiedClassName());
+                if(!sCheckedClasses.contains(classAdapterName)) {
+                    sCheckedClasses.add(classAdapterName);
+                    TypeElement adapterTypeElement = elementUtils.getTypeElement(classAdapterName);
+                    if(null != adapterTypeElement) {
+                        for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
+                            if(adapterEnclosedElement instanceof ExecutableElement) {
+                                ExecutableElement executableElement = ((ExecutableElement)adapterEnclosedElement);
+                                Name name = executableElement.getSimpleName();
+                                if(name.contentEquals("<init>") && executableElement.getParameters().size() >= 2  && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
+                                    ExternalAdapterInfo result = new ExternalAdapterInfo(typeElement, adapterTypeElement,  executableElement);
+                                    System.out.println("Yasir Adding : " + typeMirror.toString());
+                                    sCheckedClasses.add(classAdapterName);
+                                    externalAdapterInfos.add(result);
+                                }
                             }
                         }
                     }
                 }
             }
+            List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+            if(null != typeArguments) {
+                for(TypeMirror typeArgument : typeArguments) {
+                    addExternalAdapters(elementUtils, stagFactoryGeneratedName, typeArgument, externalAdapterInfos);
+                }
+            }
         }
-        return null;
     }
 
     @NotNull

From c02c79fbf9147c618156cdf40fd22189b19fd247 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Tue, 27 Dec 2016 22:48:49 +0530
Subject: [PATCH 086/159] Removing the errorneous println statement

---
 .../com/vimeo/stag/processor/generators/ExternalAdapterInfo.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 98fe53de..5d1c3974 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -65,7 +65,6 @@ public static void addExternalAdapters(@NotNull Elements elementUtils,
                                 Name name = executableElement.getSimpleName();
                                 if(name.contentEquals("<init>") && executableElement.getParameters().size() >= 2  && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
                                     ExternalAdapterInfo result = new ExternalAdapterInfo(typeElement, adapterTypeElement,  executableElement);
-                                    System.out.println("Yasir Adding : " + typeMirror.toString());
                                     sCheckedClasses.add(classAdapterName);
                                     externalAdapterInfos.add(result);
                                 }

From 67de7b98110c717a478beccc0a094e5a19d88ee4 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 28 Dec 2016 11:46:52 +0530
Subject: [PATCH 087/159] Since the gson variable and stag variable are
 initialized after the field name using the function parameter instead of the
 memeber variable in those cases

---
 .../processor/generators/TypeAdapterGenerator.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 6b0a20ef..5bbb5a51 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -464,13 +464,17 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                         , stagGenerator, adapterFieldInfo);
 
                 if(null != typeAdapterCode) {
-                    constructorBuilder.addStatement(fieldName + " = " + typeAdapterCode);
+                    constructorBuilder.addStatement(fieldName + " = " + getCleanedFieldInitializer(typeAdapterCode));
                 }
             }
             return fieldName;
         }
     }
 
+    private static String getCleanedFieldInitializer(String code) {
+        return code.replace("mStagFactory", "stagFactory").replace("mGson", "gson");
+    }
+
     private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
                                           @NotNull MethodSpec.Builder constructorBuilder,
                                           @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
@@ -484,7 +488,7 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                String statement = fieldName + " = " + externalAdapterInfo.getInitializer("gson", "");
+                String statement = fieldName + " = " + getCleanedFieldInitializer(externalAdapterInfo.getInitializer("gson", ""));
                 constructorBuilder.addStatement(statement.replace("$", "$$"));
             }
 
@@ -520,8 +524,8 @@ private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassIn
                     String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                     TypeName typeName = getAdapterFieldTypeName(fieldType);
                     adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    String statement = fieldName + " = " + adapterAccessor;
-                    constructorBuilder.addStatement(statement.replace("$", "$$"));
+                    String statement = fieldName + " = " + getCleanedFieldInitializer(adapterAccessor).replace("$", "$$");
+                    constructorBuilder.addStatement(statement);
                     adapterAccessor = fieldName;
                 }
             }

From c7c883fac9599f30acb29d6cc89cbc32de5f47e6 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 28 Dec 2016 14:57:11 +0530
Subject: [PATCH 088/159] Adding more scenarios and fixing them

---
 .../sample/model/TestExternalExample.java     | 14 ++++++++
 .../generators/ExternalAdapterInfo.java       |  4 +--
 .../processor/generators/StagGenerator.java   |  6 +---
 .../generators/TypeAdapterGenerator.java      | 32 +++++++------------
 4 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java b/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java
new file mode 100644
index 00000000..f36612f3
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.sample_model.ExternalModel1;
+import com.vimeo.stag.UseStag;
+
+/**
+ * Created by mohammad.yasir on 28/12/16.
+ */
+
+@UseStag
+public class TestExternalExample {
+
+    public GenericClass<ExternalModel1> mTesting;
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 5d1c3974..61075934 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -86,9 +86,9 @@ public static void addExternalAdapters(@NotNull Elements elementUtils,
     public String getInitializer(@NotNull String gsonVariableName, @NotNull String concatenatedTypeAdapters) {
         int paramsSize = mAdapterConstructor.getParameters().size();
         if(paramsSize == 2) {
-            return "new " + mAdapterType.toString() + "(" + gsonVariableName + ", " + getFactoryInitializer() + ")";
+            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + ")";
         } else {
-            return "new " + mAdapterType.toString() + "(" + gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
+            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
         }
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 651bdfb0..f624494c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -400,11 +400,7 @@ private void generateAdapterMethod(String fieldType, String adapterCode, TypeSpe
                 .returns(parameterizedTypeName);
         getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
 
-        if (containsTypeArg) {
-            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode, "$");
-        } else {
-            getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
-        }
+        getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
 
         getAdapterMethodBuilder.endControlFlow();
         getAdapterMethodBuilder.addStatement("return " + variableName);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 5bbb5a51..65f2e404 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -149,13 +149,6 @@ else if (TypeUtils.isSupportedMap(fieldType)) {
                 } else {
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
                     mGsonVariableUsed = true;
-                    String outerClassString = outerClass.toString();
-                    int idx = outerClassString.indexOf("<");
-                    int idx1 = fieldType.toString().indexOf("<");
-                    String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
-                    if (idx > 0) {
-                        outerClassString = outerClassString.substring(0, idx);
-                    }
                     List<? extends TypeMirror> typeArguments = declaredFieldType.getTypeArguments();
                     ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
 
@@ -170,9 +163,12 @@ else if (TypeUtils.isSupportedMap(fieldType)) {
                     if(null != externalAdapterInfo) {
                         adapterCode = externalAdapterInfo.getInitializer("gson", typeAdapterCode);
                     } else {
-                        adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$TypeAdapter") + argument + "(gson, stagFactory" + typeAdapterCode + ")";
+                        ClassInfo classInfo = new ClassInfo(outerClass);
+                        int idx1 = fieldType.toString().indexOf("<");
+                        String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
+                        adapterCode = "new " + classInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, stagFactory" + typeAdapterCode + ")";
                     }
-                    return adapterCode.replace("$", "$$");
+                    return adapterCode;
                 }
             }
         } else {
@@ -335,7 +331,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                        String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
                         return adapterCode;
@@ -413,21 +409,17 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                                 (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
-                    String outerClassString = outerClass.toString();
-                    int idx = outerClassString.indexOf("<");
+                    ClassInfo outerClassInfo = new ClassInfo(outerClass);
                     int idx1 = fieldType.toString().indexOf("<");
                     String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
-                    if (idx > 0) {
-                        outerClassString = outerClassString.substring(0, idx);
-                    }
                     List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                     ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
-                    String adapterCode = "new " + outerClassString + FileGenUtils.unescapeEscapedString("$LTypeAdapter") + argument + "(gson, ";
+                    String adapterCode = "new " + outerClassInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, ";
 
                     if(null != externalAdapterInfo) {
                         adapterCode += externalAdapterInfo.getFactoryInitializer();
                     } else {
-                        adapterCode += "this";
+                        adapterCode += "mStagFactory";
                     }
 
                     adapterCode += ", ";
@@ -437,7 +429,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     }
                     adapterCode += ")";
                     if(!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson")) + "(mGson)";
+                        return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson")) + "(mGson)";
                     } else {
                         return adapterCode;
                     }
@@ -489,7 +481,7 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
                 String statement = fieldName + " = " + getCleanedFieldInitializer(externalAdapterInfo.getInitializer("gson", ""));
-                constructorBuilder.addStatement(statement.replace("$", "$$"));
+                constructorBuilder.addStatement(statement);
             }
 
             return fieldName;
@@ -524,7 +516,7 @@ private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassIn
                     String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                     TypeName typeName = getAdapterFieldTypeName(fieldType);
                     adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                    String statement = fieldName + " = " + getCleanedFieldInitializer(adapterAccessor).replace("$", "$$");
+                    String statement = fieldName + " = " + getCleanedFieldInitializer(adapterAccessor);
                     constructorBuilder.addStatement(statement);
                     adapterAccessor = fieldName;
                 }

From c45df1163bd1758630f4dc5298c4acb45856e665 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 29 Dec 2016 20:26:32 +0530
Subject: [PATCH 089/159] Fixing the ArrayAdapter

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index ac1c716f..dc4f9d6c 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -41,6 +41,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.google.gson.stream.JsonToken.BEGIN_ARRAY;
 import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
 
 /**
@@ -221,8 +222,10 @@ public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayConstruct
         @Override
         public void write(JsonWriter writer, T[] value) throws IOException {
             writer.beginArray();
-            for (T item : value) {
-                mValueTypeAdapter.write(writer, item);
+            if(null != value) {
+                for (T item : value) {
+                    mValueTypeAdapter.write(writer, item);
+                }
             }
             writer.endArray();
         }
@@ -233,33 +236,18 @@ public T[] read(JsonReader reader) throws IOException {
                 reader.nextNull();
                 return null;
             }
-            if (reader.peek() != BEGIN_OBJECT) {
+            if (reader.peek() != BEGIN_ARRAY) {
                 reader.skipValue();
                 return null;
             }
-            reader.beginObject();
+            reader.beginArray();
 
             ArrayList<T> object = new ArrayList<>();
-
             while (reader.hasNext()) {
-                com.google.gson.stream.JsonToken jsonToken = reader.peek();
-                if (jsonToken == com.google.gson.stream.JsonToken.NULL) {
-                    reader.skipValue();
-                    continue;
-                }
-
-                if (jsonToken == com.google.gson.stream.JsonToken.BEGIN_ARRAY) {
-                    reader.beginArray();
-                    while (reader.hasNext()) {
-                        object.add(mValueTypeAdapter.read(reader));
-                    }
-                    reader.endArray();
-                } else {
-                    reader.skipValue();
-                }
+                object.add(mValueTypeAdapter.read(reader));
             }
 
-            reader.endObject();
+            reader.endArray();
 
             T[] result = this.mObjectCreator.construct(object.size());
             return object.toArray(result);
@@ -461,8 +449,10 @@ public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> obj
         @Override
         public void write(JsonWriter writer, T value) throws IOException {
             writer.beginArray();
-            for (V item : value) {
-                valueTypeAdapter.write(writer, item);
+            if(null != value) {
+                for (V item : value) {
+                    valueTypeAdapter.write(writer, item);
+                }
             }
             writer.endArray();
         }
@@ -474,6 +464,11 @@ public T read(JsonReader reader) throws IOException {
                 return null;
             }
 
+            if (reader.peek() != BEGIN_ARRAY) {
+                reader.skipValue();
+                return null;
+            }
+
             T collection = objectConstructor.construct();
             reader.beginArray();
             while (reader.hasNext()) {

From c030fca0a8d1729b2f337828c05bc3eb6181b808 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 29 Dec 2016 20:41:49 +0530
Subject: [PATCH 090/159] Null check for Map

---
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index dc4f9d6c..f186d192 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -496,6 +496,10 @@ public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAda
 
         @Override
         public void write(JsonWriter writer, T value) throws IOException {
+            if(null == value) {
+                writer.nullValue();
+                return;
+            }
             boolean hasComplexKeys = false;
             List<JsonElement> keys = new ArrayList<>(value.size());
 

From 1c58ac477f9e34561dc9d141fd48f8e28de874e3 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 01:06:08 +0530
Subject: [PATCH 091/159] Code Indentations and documentation added for newer
 code

---
 .../vimeo/stag/processor/StagProcessor.java   |   4 +-
 .../generators/ExternalAdapterInfo.java       |  66 ++++++------
 .../processor/generators/StagGenerator.java   |  15 +--
 .../generators/TypeAdapterGenerator.java      | 102 ++++++++++--------
 .../generators/model/AnnotatedClass.java      |   5 +-
 5 files changed, 101 insertions(+), 91 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index bbdb41bc..d97cbd8f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -137,9 +137,9 @@ private void addToSupportedTypes(@NotNull Element element,
                 if (!TypeUtils.isAbstract(element)) {
                     mSupportedTypes.add(enclosingElement.asType());
 
-                    //If this is of a type which is not part of this module, but generated by Stag, we should use it
+                    //If this is of a type which is not part of this module, but generated by Stag, we should use it.
                     ExternalAdapterInfo.addExternalAdapters(processingEnv.getElementUtils(),
-                            stagFactoryGeneratedName , variableElement.asType(), mExternalSupportedAdapters);
+                            stagFactoryGeneratedName, variableElement.asType(), mExternalSupportedAdapters);
                 }
                 addToListMap(variableMap, rootElement, variableElement);
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 61075934..0956271f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -3,14 +3,11 @@
 
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
-import com.vimeo.stag.processor.utils.ElementUtils;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -19,7 +16,6 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
@@ -27,44 +23,50 @@
 public class ExternalAdapterInfo {
 
     @NotNull
-    public final Element mExternalClassType;
-
+    private static Set<String> sCheckedClasses = new HashSet<>();
     @NotNull
-    public final TypeElement mAdapterType;
-
+    final Element mExternalClassType;
     @NotNull
-    public final ExecutableElement mAdapterConstructor;
+    private final TypeElement mAdapterType;
+    @NotNull
+    private final ExecutableElement mAdapterConstructor;
 
-    public ExternalAdapterInfo(Element typeElement, TypeElement adapterTypeElement, ExecutableElement adapterConstructor) {
+    public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement adapterTypeElement, @NotNull ExecutableElement adapterConstructor) {
         this.mExternalClassType = typeElement;
         this.mAdapterType = adapterTypeElement;
         this.mAdapterConstructor = adapterConstructor;
     }
 
-    private static Set<String> sCheckedClasses = new HashSet<>();
-
-    @Nullable
-    public static void addExternalAdapters(@NotNull Elements elementUtils,
-                                                          @NotNull String stagFactoryGeneratedName,
-                                                          @NotNull TypeMirror typeMirror,
-                                                          @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
-        if(!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
-            DeclaredType declaredType = (DeclaredType)typeMirror;
+    /**
+     * Add adapters for the external models.
+     *
+     * @param elementUtils             elementUtils
+     * @param stagFactoryGeneratedName stagFactoryGeneratedName
+     * @param typeMirror               typeMirror
+     * @param externalAdapterInfos     externalAdapterInfos
+     */
+    public static void addExternalAdapters(@NotNull Elements elementUtils, @NotNull String stagFactoryGeneratedName,
+                                           @NotNull TypeMirror typeMirror, @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
+        if (!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
+            DeclaredType declaredType = (DeclaredType) typeMirror;
             Element typeElement = declaredType.asElement();
             UseStag useStag = null != typeElement ? typeElement.getAnnotation(UseStag.class) : null;
-            if(null != useStag) {
+            /*
+             * Make sure the external model is annotated with @UseStag
+             */
+            if (null != useStag) {
                 ClassInfo classInfo = new ClassInfo(typeElement.asType());
                 String classAdapterName = FileGenUtils.unescapeEscapedString(classInfo.getTypeAdapterQualifiedClassName());
-                if(!sCheckedClasses.contains(classAdapterName)) {
+                if (!sCheckedClasses.contains(classAdapterName)) {
                     sCheckedClasses.add(classAdapterName);
                     TypeElement adapterTypeElement = elementUtils.getTypeElement(classAdapterName);
-                    if(null != adapterTypeElement) {
+                    if (null != adapterTypeElement) {
                         for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
-                            if(adapterEnclosedElement instanceof ExecutableElement) {
-                                ExecutableElement executableElement = ((ExecutableElement)adapterEnclosedElement);
+                            if (adapterEnclosedElement instanceof ExecutableElement) {
+                                ExecutableElement executableElement = ((ExecutableElement) adapterEnclosedElement);
                                 Name name = executableElement.getSimpleName();
-                                if(name.contentEquals("<init>") && executableElement.getParameters().size() >= 2  && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
-                                    ExternalAdapterInfo result = new ExternalAdapterInfo(typeElement, adapterTypeElement,  executableElement);
+                                if (name.contentEquals("<init>") && executableElement.getParameters().size() >= 2 && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
+                                    ExternalAdapterInfo result = new ExternalAdapterInfo(typeElement, adapterTypeElement, executableElement);
                                     sCheckedClasses.add(classAdapterName);
                                     externalAdapterInfos.add(result);
                                 }
@@ -74,8 +76,8 @@ public static void addExternalAdapters(@NotNull Elements elementUtils,
                 }
             }
             List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
-            if(null != typeArguments) {
-                for(TypeMirror typeArgument : typeArguments) {
+            if (null != typeArguments) {
+                for (TypeMirror typeArgument : typeArguments) {
                     addExternalAdapters(elementUtils, stagFactoryGeneratedName, typeArgument, externalAdapterInfos);
                 }
             }
@@ -83,9 +85,9 @@ public static void addExternalAdapters(@NotNull Elements elementUtils,
     }
 
     @NotNull
-    public String getInitializer(@NotNull String gsonVariableName, @NotNull String concatenatedTypeAdapters) {
+    String getInitializer(@NotNull String gsonVariableName, @NotNull String concatenatedTypeAdapters) {
         int paramsSize = mAdapterConstructor.getParameters().size();
-        if(paramsSize == 2) {
+        if (paramsSize == 2) {
             return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + ")";
         } else {
             return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
@@ -93,7 +95,7 @@ public String getInitializer(@NotNull String gsonVariableName, @NotNull String c
     }
 
     @NotNull
-    public String getFactoryInitializer() {
+    String getFactoryInitializer() {
         return "new " + mAdapterConstructor.getParameters().get(1).asType() + "()";
     }
-}
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index f624494c..c3a84ecd 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -59,7 +59,6 @@
 
 import javax.annotation.processing.Filer;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
@@ -85,10 +84,6 @@ public class StagGenerator {
         KNOWN_COLLECTION_GENERIC_CLASSES.put(ArrayList.class.getName(), new GenericClassInfo(1, false));
     }
 
-    public static String getGeneratedFactoryClassAndPackage(String generatedPackageName) {
-        return generatedPackageName + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
-    }
-
     @NotNull
     private final Filer mFiler;
     @NotNull
@@ -109,7 +104,6 @@ public static String getGeneratedFactoryClassAndPackage(String generatedPackageN
     private final HashMap<String, String> mGenericAdapterFieldMap = new HashMap<>();
     @NotNull
     private final Set<TypeMirror> mKnownTypes;
-
     @NotNull
     private final Map<String, ExternalAdapterInfo> mExternalSupportedAdapters;
 
@@ -122,7 +116,6 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         mExternalSupportedAdapters = new HashMap<>(externalSupportedAdapters.size());
 
 
-
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
         Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
@@ -144,7 +137,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             }
         }
 
-        for(ExternalAdapterInfo entry : externalSupportedAdapters) {
+        for (ExternalAdapterInfo entry : externalSupportedAdapters) {
             TypeMirror externalType = entry.mExternalClassType.asType();
             mExternalSupportedAdapters.put(externalType.toString(), entry);
         }
@@ -166,6 +159,10 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
     }
 
+    public static String getGeneratedFactoryClassAndPackage(String generatedPackageName) {
+        return generatedPackageName + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
+    }
+
     Set<TypeMirror> getKnownTypes() {
         return mKnownTypes;
     }
@@ -228,7 +225,6 @@ public void generateTypeAdapterFactory(@NotNull String generatedPackageName) thr
         FileGenUtils.writeToFile(javaFile, mFiler);
     }
 
-
     @NotNull
     private TypeSpec getAdapterFactorySpec() {
         TypeVariableName genericTypeName = TypeVariableName.get("T");
@@ -476,7 +472,6 @@ private String generateNameFromType(@NotNull String name, boolean isArray) {
         return isArray ? fieldNameBuilder.toString() + "Array" : fieldNameBuilder.toString();
     }
 
-
     public ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
         return mExternalSupportedAdapters.get(fieldType.toString());
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 65f2e404..5b1ea968 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -126,27 +126,31 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
                 result = typeVarsMap.get(fieldType);
             } else if (fieldType instanceof DeclaredType) {
-                /*
-                 * If it is of ParameterizedType, {@link com.vimeo.stag.utils.ParameterizedTypeUtil} is used to get the
-                 * type token of the parameter type.
-                 */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
 
-                if(null == typeMirrors && typeMirrors.size() == 0) {
+                if (null == typeMirrors || typeMirrors.size() == 0) {
                     result = typeTokenConstantsGenerator.addTypeToken(fieldType);
-                }
-                else if (TypeUtils.isSupportedMap(fieldType)) {
+                } else if (TypeUtils.isSupportedMap(fieldType)) {
+                    /**
+                     * If the fieldType is of {@link Map} type, generate the MapTypeAdapter with its key and valueTypeAdapter
+                     */
                     TypeMirror keyTypeMirror = typeMirrors.get(0);
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
                     String keyAdapterAccessor = getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiater(fieldType)+ ")";
+                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiater(fieldType) + ")";
                 } else if (TypeUtils.isSupportedCollection(fieldType)) {
+                    /**
+                     * If the fieldType is of {@link java.util.Collection} type, generate the ListTypeAdapter with its valueTypeAdapter
+                     */
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
                     String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiater(fieldType) +")";
+                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiater(fieldType) + ")";
                 } else {
+                    /**
+                     * If the fieldType is of Known parameterized type, recursively call the function to generate the typeadapter code.
+                     */
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
                     mGsonVariableUsed = true;
                     List<? extends TypeMirror> typeArguments = declaredFieldType.getTypeArguments();
@@ -158,9 +162,9 @@ else if (TypeUtils.isSupportedMap(fieldType)) {
                                 , stagGenerator, adapterFieldInfo);
                     }
 
-
                     String adapterCode;
-                    if(null != externalAdapterInfo) {
+                    if (null != externalAdapterInfo) {
+                        //if the field type is an external model
                         adapterCode = externalAdapterInfo.getInitializer("gson", typeAdapterCode);
                     } else {
                         ClassInfo classInfo = new ClassInfo(outerClass);
@@ -270,32 +274,13 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
         }
     }
 
-    /**
-     * Returns the adapter code for the unknown types.
-     */
-    private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                            @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                            @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
-
-        String fieldName = adapterFieldInfo.getFieldName(fieldType);
-        if (null == fieldName) {
-            fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
-            adapterFieldInfo.addField(fieldType, fieldName);
-            String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
-            TypeName typeName = getAdapterFieldTypeName(fieldType);
-            adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
-        }
-        return fieldName;
-    }
-
     /**
      * Returns the adapter code for the known types.
      */
     private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                      @NotNull MethodSpec.Builder constructorBuilder,
-                                      @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
-                                      @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                             @NotNull MethodSpec.Builder constructorBuilder,
+                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
+                                             @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
 
@@ -358,7 +343,6 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 }
             } else if (TypeUtils.isSupportedMap(fieldType)) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
-
                  /*
                   * If the fieldType is of type Map
                   */
@@ -368,8 +352,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                 String keyAdapterAccessor;
                 String valueAdapterAccessor;
-                String arguments  = "";
-                if(typeArguments != null && typeArguments.size() == 2) {
+                String arguments = "";
+                if (typeArguments != null && typeArguments.size() == 2) {
                     TypeMirror keyType = typeArguments.get(0);
                     TypeMirror valueType = typeArguments.get(1);
                     keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
@@ -378,7 +362,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                             typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " + fieldType.toString() + ">";
                 } else {
-                    keyAdapterAccessor =  "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
+                    //If the map does not have any type arguments, use Object as typeparams in this case
+                    keyAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                     valueAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 }
 
@@ -391,16 +376,25 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     return adapterCode;
                 }
             } else if (TypeUtils.isNativeObject(fieldType)) {
+                /*
+                 * If the fieldType is Object, use ObjectTypeAdapter
+                 */
                 mGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else if (TypeUtils.isJsonElement(fieldType)) {
+                 /*
+                 * If the fieldType is JsonElement, use JsonElementTypeAdapters, and its subclass type adaptersl
+                 */
                 mGsonVariableUsed = true;
                 mStagFactoryUsed = true;
                 String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
                 return adapterCode != null ? "mStagFactory." + stagGenerator.addFieldForConcreteType(fieldType, adapterCode) + "(mGson)" : "";
             } else if (fieldType instanceof DeclaredType) {
+                /*
+                 * If the field type is generic and does not belong to above cases.
+                 */
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
@@ -416,7 +410,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
                     String adapterCode = "new " + outerClassInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, ";
 
-                    if(null != externalAdapterInfo) {
+                    if (null != externalAdapterInfo) {
                         adapterCode += externalAdapterInfo.getFactoryInitializer();
                     } else {
                         adapterCode += "mStagFactory";
@@ -428,7 +422,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                                 , stagGenerator, adapterFieldInfo);
                     }
                     adapterCode += ")";
-                    if(!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
+                    if (!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                         return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson")) + "(mGson)";
                     } else {
                         return adapterCode;
@@ -455,7 +449,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String typeAdapterCode = getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
                         , stagGenerator, adapterFieldInfo);
 
-                if(null != typeAdapterCode) {
+                if (null != typeAdapterCode) {
                     constructorBuilder.addStatement(fieldName + " = " + getCleanedFieldInitializer(typeAdapterCode));
                 }
             }
@@ -468,10 +462,10 @@ private static String getCleanedFieldInitializer(String code) {
     }
 
     private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                          @NotNull MethodSpec.Builder constructorBuilder,
-                                          @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                                 @NotNull MethodSpec.Builder constructorBuilder,
+                                                 @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
         ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(fieldType);
-        if(null != externalAdapterInfo) {
+        if (null != externalAdapterInfo) {
             //Generate the Type Adapter as a member variable
             String fieldName = adapterFieldInfo.getFieldName(fieldType);
             if (null == fieldName) {
@@ -493,6 +487,25 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
         }
     }
 
+    /**
+     * Returns the adapter code for the unknown types.
+     */
+    private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                            @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                            @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
+
+        String fieldName = adapterFieldInfo.getFieldName(fieldType);
+        if (null == fieldName) {
+            fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
+            adapterFieldInfo.addField(fieldType, fieldName);
+            String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
+            TypeName typeName = getAdapterFieldTypeName(fieldType);
+            adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
+            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+        }
+        return fieldName;
+    }
+
     @NotNull
     private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
                                               @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
@@ -509,7 +522,7 @@ private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassIn
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
 
-                if(null != adapterAccessor && adapterAccessor.startsWith("new ")) {
+                if (null != adapterAccessor && adapterAccessor.startsWith("new ")) {
                     //Add this to a member variable
                     String fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
                     result.addField(fieldType, fieldName);
@@ -626,6 +639,7 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                     adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
                     String paramName;
                     if (genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields) {
+                        //If the classInfo has unknown types, pass type... as param in constructor.
                         paramName = "type[" + String.valueOf(idx) + "]";
                     } else {
                         ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index c12b8a1b..0e426c78 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -101,7 +101,7 @@ public Map<Element, TypeMirror> getMemberVariables() {
                     SupportedTypesModel.getInstance().getSupportedType(mInheritedType);
 
             map.putAll(TypeUtils.getConcreteMembers(mInheritedType, genericInheritedType.getElement(),
-                                                    genericInheritedType.getMemberVariables()));
+                    genericInheritedType.getMemberVariables()));
         }
 
         if (StagProcessor.DEBUG) {
@@ -112,5 +112,4 @@ public Map<Element, TypeMirror> getMemberVariables() {
 
         return map;
     }
-
-}
+}
\ No newline at end of file

From 0c503857118e9d46991ba8623295820dcca75a3c Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 01:15:43 +0530
Subject: [PATCH 092/159] added unit test dependency

---
 stag-library/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index c82f7225..8985cca7 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -7,7 +7,8 @@ compileJava {
 }
 
 dependencies {
-compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.google.code.gson:gson:2.8.0'
+    testCompile 'junit:junit:4.12'
 }
 
 // custom tasks for creating source/javadoc jars

From fb7a6195bb8698d16ec07c454ecdbd041514f72c Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 01:16:10 +0530
Subject: [PATCH 093/159] Added 1st Unit Test for IntegerTypeAdapter in
 KnownTypeAdapters

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
new file mode 100644
index 00000000..7eba8f4c
--- /dev/null
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -0,0 +1,34 @@
+package com.vimeo.stag;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+public class KnownTypeAdaptersTest {
+
+    /**
+     * Test for {@link KnownTypeAdapters#INTEGER}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForIntegerTypeAdapter() throws Exception {
+        Integer value = 250;
+        TypeAdapter<Integer> integerTypeAdapter = KnownTypeAdapters.INTEGER;
+        //create a string writer, and write the value to it using adapter
+        StringWriter stringWriter = new StringWriter();
+        integerTypeAdapter.write(new JsonWriter(stringWriter), value);
+        String jsonString = stringWriter.toString();
+
+        //call the typeadapter#read method
+        Integer readValue = integerTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(value.intValue(), readValue.intValue());
+    }
+}
\ No newline at end of file

From 74b6419f3a550c670882c100ce1c5cc5e126725e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 01:24:17 +0530
Subject: [PATCH 094/159] Added test cases for primitive type adapters

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
index 7eba8f4c..6fc39394 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -31,4 +31,90 @@ public void testForIntegerTypeAdapter() throws Exception {
 
         Assert.assertEquals(value.intValue(), readValue.intValue());
     }
+
+    /**
+     * Test for {@link KnownTypeAdapters#BYTE}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForByteTypeAdapter() throws Exception {
+        Byte value = 1;
+        TypeAdapter<Byte> byteTypeAdapter = KnownTypeAdapters.BYTE;
+        //create a string writer, and write the value to it using adapter
+        StringWriter stringWriter = new StringWriter();
+        byteTypeAdapter.write(new JsonWriter(stringWriter), value);
+        String jsonString = stringWriter.toString();
+
+        //call the typeadapter#read method
+        Byte readValue = byteTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(value.intValue(), readValue.intValue());
+        Assert.assertEquals(value.byteValue(), readValue.byteValue());
+    }
+
+    /**
+     * Test for {@link KnownTypeAdapters#SHORT}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForShortTypeAdapter() throws Exception {
+        Short value = 1;
+        TypeAdapter<Short> shortTypeAdapter = KnownTypeAdapters.SHORT;
+        //create a string writer, and write the value to it using adapter
+        StringWriter stringWriter = new StringWriter();
+        shortTypeAdapter.write(new JsonWriter(stringWriter), value);
+        String jsonString = stringWriter.toString();
+
+        //call the typeadapter#read method
+        Short readValue = shortTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(value.intValue(), readValue.intValue());
+        Assert.assertEquals(value.shortValue(), readValue.shortValue());
+    }
+
+    /**
+     * Test for {@link KnownTypeAdapters#LONG}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForLongTypeAdapter() throws Exception {
+        Long value = 121223444L;
+        TypeAdapter<Long> longTypeAdapter = KnownTypeAdapters.LONG;
+        //create a string writer, and write the value to it using adapter
+        StringWriter stringWriter = new StringWriter();
+        longTypeAdapter.write(new JsonWriter(stringWriter), value);
+        String jsonString = stringWriter.toString();
+
+        //call the typeadapter#read method
+        Long readValue = longTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(value.intValue(), readValue.intValue());
+        Assert.assertEquals(value.longValue(), readValue.longValue());
+    }
+
+
+    /**
+     * Test for {@link KnownTypeAdapters#FLOAT}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForFloatTypeAdapter() throws Exception {
+        Float value = 1234.1243F;
+        TypeAdapter<Float> floatTypeAdapter = KnownTypeAdapters.FLOAT;
+        //create a string writer, and write the value to it using adapter
+        StringWriter stringWriter = new StringWriter();
+        floatTypeAdapter.write(new JsonWriter(stringWriter), value);
+        String jsonString = stringWriter.toString();
+
+        //call the typeadapter#read method
+        Float readValue = floatTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(value.intValue(), readValue.intValue());
+        Assert.assertEquals(value.doubleValue(), readValue.doubleValue(), 0);
+        Assert.assertEquals(value, readValue, 0);
+    }
 }
\ No newline at end of file

From da61ca0b27316c2f4e7df16afe1cbe5c43986395 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 30 Dec 2016 15:59:35 +0530
Subject: [PATCH 095/159] Code cleanup

---
 .../model/KnownTypeAdaptersExample.java       |  25 ++
 .../generators/TypeAdapterGenerator.java      |  15 +-
 .../utils/KnownTypeAdapterUtils.java          | 133 +++++----
 .../vimeo/stag/processor/utils/TypeUtils.java |   8 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     | 273 ++++++++++--------
 5 files changed, 253 insertions(+), 201 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/KnownTypeAdaptersExample.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/KnownTypeAdaptersExample.java b/sample/src/main/java/com/vimeo/sample/model/KnownTypeAdaptersExample.java
new file mode 100644
index 00000000..c75f6fb9
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/KnownTypeAdaptersExample.java
@@ -0,0 +1,25 @@
+package com.vimeo.sample.model;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+
+@UseStag
+public class KnownTypeAdaptersExample {
+
+    @SerializedName("jsonElement")
+    public JsonElement mJsonElement;
+
+    @SerializedName("jsonObject")
+    public JsonObject mJsonObject;
+
+    @SerializedName("jsonArray")
+    public JsonArray mJsonArray;
+
+    @SerializedName("jsonPrimitive")
+    public JsonPrimitive mJsonPrimitive;
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 5b1ea968..b7df6051 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -322,16 +322,19 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                         return adapterCode;
                     }
                 }
-            } else if (TypeUtils.isSupportedCollection(fieldType)) {
+            } else if (TypeUtils.isSupportedList(fieldType)) {
                 DeclaredType declaredType = (DeclaredType) fieldType;
                 /*
                  * If the fieldType is of type List
                  */
                 mStagFactoryUsed = true;
                 mGsonVariableUsed = true;
-                TypeMirror param = declaredType.getTypeArguments().get(0);
+                List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+                TypeMirror param = typeArguments.get(0);
                 String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
                         typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+
+
                 String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
@@ -383,14 +386,6 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
-            } else if (TypeUtils.isJsonElement(fieldType)) {
-                 /*
-                 * If the fieldType is JsonElement, use JsonElementTypeAdapters, and its subclass type adaptersl
-                 */
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
-                String adapterCode = KnownTypeAdapterUtils.getJsonElementTypeAdapter(fieldType);
-                return adapterCode != null ? "mStagFactory." + stagGenerator.addFieldForConcreteType(fieldType, adapterCode) + "(mGson)" : "";
             } else if (fieldType instanceof DeclaredType) {
                 /*
                  * If the field type is generic and does not belong to above cases.
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index ae665d16..72bf6b57 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -2,7 +2,9 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -31,42 +33,73 @@
  */
 public class KnownTypeAdapterUtils {
     @NotNull
-    private static final HashMap<String, String> mKnownTypeAdapters = new HashMap<>();
+    private static final HashMap<String, String> KNOWN_TYPE_ADAPTERS = new HashMap<>();
+
+    @NotNull
+    private static final HashMap<String, String> SUPPORTED_COLLECTION_INFO = new HashMap<>();
+
+
+    @NotNull
+    private static final HashMap<String, String> SUPPORTED_PRIMITIVE_ARRAY = new HashMap<>();
 
     static {
-        mKnownTypeAdapters.put(BitSet.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIT_SET");
-        mKnownTypeAdapters.put(Boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
-        mKnownTypeAdapters.put(boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
-        mKnownTypeAdapters.put(Byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
-        mKnownTypeAdapters.put(byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
-        mKnownTypeAdapters.put(Short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
-        mKnownTypeAdapters.put(short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
-        mKnownTypeAdapters.put(Integer.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
-        mKnownTypeAdapters.put(int.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
-        mKnownTypeAdapters.put(Long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
-        mKnownTypeAdapters.put(long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
-        mKnownTypeAdapters.put(Float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
-        mKnownTypeAdapters.put(float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
-        mKnownTypeAdapters.put(Double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
-        mKnownTypeAdapters.put(double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
-        mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
-        mKnownTypeAdapters.put(Character.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
-        mKnownTypeAdapters.put(char.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
-        mKnownTypeAdapters.put(String.class.getName(), "com.google.gson.internal.bind.TypeAdapters.STRING");
-        mKnownTypeAdapters.put(BigDecimal.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_DECIMAL");
-        mKnownTypeAdapters.put(BigInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_INTEGER");
-        mKnownTypeAdapters.put(AtomicBoolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_BOOLEAN");
-        mKnownTypeAdapters.put(AtomicInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER");
-        mKnownTypeAdapters.put(AtomicIntegerArray.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER_ARRAY");
-        mKnownTypeAdapters.put(Currency.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CURRENCY");
-        mKnownTypeAdapters.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
-        mKnownTypeAdapters.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
-        mKnownTypeAdapters.put(JsonElement.class.getName(), "com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT");
+        KNOWN_TYPE_ADAPTERS.put(BitSet.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIT_SET");
+        KNOWN_TYPE_ADAPTERS.put(Boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
+        KNOWN_TYPE_ADAPTERS.put(boolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BOOLEAN");
+        KNOWN_TYPE_ADAPTERS.put(Byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
+        KNOWN_TYPE_ADAPTERS.put(byte.class.getName(), "com.vimeo.stag.KnownTypeAdapters.BYTE");
+        KNOWN_TYPE_ADAPTERS.put(Short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
+        KNOWN_TYPE_ADAPTERS.put(short.class.getName(), "com.vimeo.stag.KnownTypeAdapters.SHORT");
+        KNOWN_TYPE_ADAPTERS.put(Integer.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
+        KNOWN_TYPE_ADAPTERS.put(int.class.getName(), "com.vimeo.stag.KnownTypeAdapters.INTEGER");
+        KNOWN_TYPE_ADAPTERS.put(Long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
+        KNOWN_TYPE_ADAPTERS.put(long.class.getName(), "com.vimeo.stag.KnownTypeAdapters.LONG");
+        KNOWN_TYPE_ADAPTERS.put(Float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
+        KNOWN_TYPE_ADAPTERS.put(float.class.getName(), "com.vimeo.stag.KnownTypeAdapters.FLOAT");
+        KNOWN_TYPE_ADAPTERS.put(Double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
+        KNOWN_TYPE_ADAPTERS.put(double.class.getName(), "com.vimeo.stag.KnownTypeAdapters.DOUBLE");
+        KNOWN_TYPE_ADAPTERS.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
+        KNOWN_TYPE_ADAPTERS.put(Character.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
+        KNOWN_TYPE_ADAPTERS.put(char.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CHARACTER");
+        KNOWN_TYPE_ADAPTERS.put(String.class.getName(), "com.google.gson.internal.bind.TypeAdapters.STRING");
+        KNOWN_TYPE_ADAPTERS.put(BigDecimal.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_DECIMAL");
+        KNOWN_TYPE_ADAPTERS.put(BigInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.BIG_INTEGER");
+        KNOWN_TYPE_ADAPTERS.put(AtomicBoolean.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_BOOLEAN");
+        KNOWN_TYPE_ADAPTERS.put(AtomicInteger.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER");
+        KNOWN_TYPE_ADAPTERS.put(AtomicIntegerArray.class.getName(), "com.google.gson.internal.bind.TypeAdapters.ATOMIC_INTEGER_ARRAY");
+        KNOWN_TYPE_ADAPTERS.put(Currency.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CURRENCY");
+        KNOWN_TYPE_ADAPTERS.put(Calendar.class.getName(), "com.google.gson.internal.bind.TypeAdapters.CALENDAR");
+        KNOWN_TYPE_ADAPTERS.put(Number.class.getName(), "com.google.gson.internal.bind.TypeAdapters.NUMBER");
+        KNOWN_TYPE_ADAPTERS.put(JsonElement.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_ELEMENT_TYPE_ADAPTER");
+        KNOWN_TYPE_ADAPTERS.put(JsonObject.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_OBJECT_TYPE_ADAPTER");
+        KNOWN_TYPE_ADAPTERS.put(JsonArray.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_ARRAY_TYPE_ADAPTER");
+        KNOWN_TYPE_ADAPTERS.put(JsonPrimitive.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_PRIMITIVE_TYPE_ADAPTER");
+        KNOWN_TYPE_ADAPTERS.put(JsonNull.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_NULL_TYPE_ADAPTER");
+
+
+
+        SUPPORTED_COLLECTION_INFO.put(ArrayList.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater");
+        SUPPORTED_COLLECTION_INFO.put(List.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ListInstantiater");
+        SUPPORTED_COLLECTION_INFO.put(Collection.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater");
+
+
+        SUPPORTED_PRIMITIVE_ARRAY.put(int[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveIntegerArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(long[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveLongArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(double[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveDoubleArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(short[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveShortArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(char[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveCharArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(float[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveFloatArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(boolean[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveBooleanArrayAdapter");
+        SUPPORTED_PRIMITIVE_ARRAY.put(byte[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveByteArrayAdapter");
     }
 
+
+
+
+
     @Nullable
     public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror) {
-        return mKnownTypeAdapters.get(typeMirror.toString());
+        return KNOWN_TYPE_ADAPTERS.get(typeMirror.toString());
     }
 
     /**
@@ -81,15 +114,7 @@ public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
         TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null && !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments().get(0) : null;
         String postFix = valueType != null ? "<" + valueType.toString() + ">()" : "()";
-        if (outerClassType.equals(ArrayList.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater" + postFix;
-        } else if (outerClassType.equals(List.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.ListInstantiater" + postFix;
-        } else if (outerClassType.equals(Collection.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater" + postFix;
-        } else {
-            return "new com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater" + postFix;
-        }
+        return "new " + SUPPORTED_COLLECTION_INFO.get(outerClassType) + postFix;
     }
 
     /**
@@ -146,34 +171,8 @@ public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror)
     @Nullable
     public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        if (outerClassType.equals(int[].class.getSimpleName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveIntegerArrayAdapter";
-        } else if (outerClassType.equals(long[].class.getSimpleName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveLongArrayAdapter";
-        } else if (outerClassType.equals(double[].class.getSimpleName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveDoubleArrayAdapter";
-        } else if (outerClassType.equals(short[].class.getSimpleName())) {
-            return "com.vimeo.stag.KnownTypeAdapters.PrimitiveShortArrayAdapter";
-        }
-        return null;
+        return SUPPORTED_PRIMITIVE_ARRAY.get(outerClassType);
     }
 
-    /**
-     * Get the type adapter for {@link JsonElement} types
-     *
-     * @param typeMirror TypeMirror typeMirror
-     * @return adapterName
-     */
-    @Nullable
-    public static String getJsonElementTypeAdapter(@NotNull TypeMirror typeMirror) {
-        String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        if (outerClassType.equals(JsonElement.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.JsonElementTypeAdapter()";
-        } else if (outerClassType.equals(JsonArray.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.JsonArrayTypeAdapter()";
-        } else if (outerClassType.equals(JsonObject.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.JsonObjectTypeAdapter()";
-        }
-        return null;
-    }
+
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index dc9def0d..25526695 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -411,8 +411,7 @@ public static boolean isSupportedCollection(@Nullable TypeMirror type) {
         if (isNativeArray(type)) {
             return true;
         }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return isSupportedList(type) || outerClassType.equals(Collection.class.getName());
+        return isSupportedList(type);
     }
 
     /**
@@ -421,13 +420,14 @@ public static boolean isSupportedCollection(@Nullable TypeMirror type) {
      * @param type :TypeMirror type
      * @return boolean
      */
-    private static boolean isSupportedList(@Nullable TypeMirror type) {
+    public static boolean isSupportedList(@Nullable TypeMirror type) {
         if (type == null) {
             return false;
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(ArrayList.class.getName()) ||
-                outerClassType.equals(List.class.getName());
+                outerClassType.equals(List.class.getName()) ||
+                outerClassType.equals(Collection.class.getName());
     }
 
     /**
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index f186d192..5ea135a4 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -24,10 +24,10 @@
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.JsonReaderInternalAccess;
-import com.google.gson.internal.LazilyParsedNumber;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -43,6 +43,7 @@
 
 import static com.google.gson.stream.JsonToken.BEGIN_ARRAY;
 import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
+import static com.google.gson.stream.JsonToken.BOOLEAN;
 
 /**
  * This class contains a list of KnownTypeAdapters such as {@link MapTypeAdapter}, {@link ListTypeAdapter} and more.
@@ -200,6 +201,9 @@ public void write(JsonWriter out, Double value) throws IOException {
     public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiater<Long>());
     public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiater<Double>());
     public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiater<Short>());
+    public static final TypeAdapter<ArrayList<Float>> FLOAT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(FLOAT, new ArrayListInstantiater<Float>());
+    public static final TypeAdapter<ArrayList<Boolean>> BOOLEAN_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(TypeAdapters.BOOLEAN, new ArrayListInstantiater<Boolean>());
+    public static final TypeAdapter<ArrayList<Byte>> BYTE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(BYTE, new ArrayListInstantiater<Byte>());
 
     public interface PrimitiveArrayConstructor<T> {
         T[] construct(int size);
@@ -270,12 +274,12 @@ public static void write(JsonWriter writer, int[] value) throws IOException {
         }
 
         public static int[] read(JsonReader reader) throws IOException {
-            ArrayList<Integer> integerArrayList = INTEGER_ARRAY_LIST_ADAPTER.read(reader);
+            ArrayList<Integer> arrayList = INTEGER_ARRAY_LIST_ADAPTER.read(reader);
             int[] result = null;
-            if (null != integerArrayList) {
-                result = new int[integerArrayList.size()];
-                for (int idx = 0; idx < integerArrayList.size(); idx++) {
-                    result[idx] = integerArrayList.get(idx);
+            if (null != arrayList) {
+                result = new int[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
                 }
             }
             return result;
@@ -297,12 +301,12 @@ public static void write(JsonWriter writer, long[] value) throws IOException {
         }
 
         public static long[] read(JsonReader reader) throws IOException {
-            ArrayList<Long> longArrayList = LONG_ARRAY_LIST_ADAPTER.read(reader);
+            ArrayList<Long> arrayList = LONG_ARRAY_LIST_ADAPTER.read(reader);
             long[] result = null;
-            if (null != longArrayList) {
-                result = new long[longArrayList.size()];
-                for (int idx = 0; idx < longArrayList.size(); idx++) {
-                    result[idx] = longArrayList.get(idx);
+            if (null != arrayList) {
+                result = new long[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
                 }
             }
             return result;
@@ -324,12 +328,12 @@ public static void write(JsonWriter writer, double[] value) throws IOException {
         }
 
         public static double[] read(JsonReader reader) throws IOException {
-            ArrayList<Double> longArrayList = DOUBLE_ARRAY_LIST_ADAPTER.read(reader);
+            ArrayList<Double> arrayList = DOUBLE_ARRAY_LIST_ADAPTER.read(reader);
             double[] result = null;
-            if (null != longArrayList) {
-                result = new double[longArrayList.size()];
-                for (int idx = 0; idx < longArrayList.size(); idx++) {
-                    result[idx] = longArrayList.get(idx);
+            if (null != arrayList) {
+                result = new double[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
                 }
             }
             return result;
@@ -351,18 +355,118 @@ public static void write(JsonWriter writer, short[] value) throws IOException {
         }
 
         public static short[] read(JsonReader reader) throws IOException {
-            ArrayList<Short> longArrayList = SHORT_ARRAY_LIST_ADAPTER.read(reader);
+            ArrayList<Short> arrayList = SHORT_ARRAY_LIST_ADAPTER.read(reader);
             short[] result = null;
-            if (null != longArrayList) {
-                result = new short[longArrayList.size()];
-                for (int idx = 0; idx < longArrayList.size(); idx++) {
-                    result[idx] = longArrayList.get(idx);
+            if (null != arrayList) {
+                result = new short[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+    /**
+     * Type Adapter for float[] type. This can be directly accessed to read and write
+     */
+    public static final class PrimitiveFloatArrayAdapter {
+        public static void write(JsonWriter writer, float[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (float item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static float[] read(JsonReader reader) throws IOException {
+            ArrayList<Float> arrayList = FLOAT_ARRAY_LIST_ADAPTER.read(reader);
+            float[] result = null;
+            if (null != arrayList) {
+                result = new float[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * Type Adapter for boolean[] type. This can be directly accessed to read and write
+     */
+    public static final class PrimitiveBooleanArrayAdapter {
+        public static void write(JsonWriter writer, boolean[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (boolean item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static boolean[] read(JsonReader reader) throws IOException {
+            ArrayList<Boolean> arrayList = BOOLEAN_ARRAY_LIST_ADAPTER.read(reader);
+            boolean[] result = null;
+            if (null != arrayList) {
+                result = new boolean[arrayList.size()];
+                for (int idx = 0; idx < arrayList.size(); idx++) {
+                    result[idx] = arrayList.get(idx);
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * Type Adapter for byte[] type. This can be directly accessed to read and write
+     */
+    public static final class PrimitiveByteArrayAdapter {
+        public static void write(JsonWriter writer, byte[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (byte item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static byte[] read(JsonReader reader) throws IOException {
+            ArrayList<Byte> byteArrayList = BYTE_ARRAY_LIST_ADAPTER.read(reader);
+            byte[] result = null;
+            if (null != byteArrayList) {
+                result = new byte[byteArrayList.size()];
+                for (int idx = 0; idx < byteArrayList.size(); idx++) {
+                    result[idx] = byteArrayList.get(idx);
                 }
             }
             return result;
         }
     }
 
+    /**
+     * Type Adapter for char[] type. This can be directly accessed to read and write
+     */
+    public static final class PrimitiveCharArrayAdapter {
+        public static void write(JsonWriter writer, char[] value) throws IOException {
+            if (null != value) {
+                writer.beginArray();
+                for (char item : value) {
+                    writer.value(item);
+                }
+                writer.endArray();
+            }
+        }
+
+        public static char[] read(JsonReader reader) throws IOException {
+            String string = com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe().read(reader);
+            return null != string ? string.toCharArray() : null;
+        }
+    }
+
     /**
      * Default Instantiater for List, by default it will create the Map of {@link ArrayList} type
      */
@@ -660,129 +764,58 @@ public void write(JsonWriter out, Object value) throws IOException {
         }
     }
 
-    /**
-     * Type Adapter for {@link JsonObject}
-     */
-    public static final class JsonObjectTypeAdapter extends TypeAdapter<JsonObject> {
-
+    public static final TypeAdapter<JsonElement> JSON_ELEMENT_TYPE_ADAPTER = com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT.nullSafe();
+    public static final TypeAdapter<JsonObject> JSON_OBJECT_TYPE_ADAPTER = new TypeAdapter<JsonObject>() {
         @Override
         public void write(JsonWriter out, JsonObject value) throws IOException {
-            JsonElementTypeAdapter.writeJsonElement(out, value);
+            JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
         }
 
         @Override
         public JsonObject read(JsonReader in) throws IOException {
-            JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
-            if (null != jsonElement && !jsonElement.isJsonObject()) {
-                throw new IOException("Could not parse it as a JsonObject");
-            }
-            return null != jsonElement && jsonElement.isJsonObject() ? jsonElement.getAsJsonObject() : null;
+            JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
+            return jsonElement != null && jsonElement.isJsonObject() ? jsonElement.getAsJsonObject() : null;
         }
-    }
-
-    /**
-     * Type Adapter for {@link JsonArray}
-     */
-    public static final class JsonArrayTypeAdapter extends TypeAdapter<JsonArray> {
+    };
 
+    public static final TypeAdapter<JsonArray> JSON_ARRAY_TYPE_ADAPTER = new TypeAdapter<JsonArray>() {
         @Override
         public void write(JsonWriter out, JsonArray value) throws IOException {
-            JsonElementTypeAdapter.writeJsonElement(out, value);
+            JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
         }
 
         @Override
         public JsonArray read(JsonReader in) throws IOException {
-            JsonElement jsonElement = JsonElementTypeAdapter.readJsonElement(in);
-            if (null != jsonElement && !jsonElement.isJsonArray()) {
-                throw new IOException("Could not parse it as a JsonArray");
-            }
-            return null != jsonElement && jsonElement.isJsonArray() ? jsonElement.getAsJsonArray() : null;
+            JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
+            return jsonElement != null && jsonElement.isJsonArray() ? jsonElement.getAsJsonArray() : null;
         }
-    }
+    };
 
-    /**
-     * Type Adapter for {@link JsonElement}
-     */
-    public static final class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
+    public static final TypeAdapter<JsonPrimitive> JSON_PRIMITIVE_TYPE_ADAPTER = new TypeAdapter<JsonPrimitive>() {
 
-        public static JsonElement readJsonElement(JsonReader in) throws IOException {
-            switch (in.peek()) {
-                case STRING:
-                    return new JsonPrimitive(in.nextString());
-                case NUMBER:
-                    String number = in.nextString();
-                    return new JsonPrimitive(new LazilyParsedNumber(number));
-                case BOOLEAN:
-                    return new JsonPrimitive(in.nextBoolean());
-                case NULL:
-                    in.nextNull();
-                    return JsonNull.INSTANCE;
-                case BEGIN_ARRAY:
-                    JsonArray array = new JsonArray();
-                    in.beginArray();
-                    while (in.hasNext()) {
-                        array.add(readJsonElement(in));
-                    }
-                    in.endArray();
-                    return array;
-                case BEGIN_OBJECT:
-                    JsonObject object = new JsonObject();
-                    in.beginObject();
-                    while (in.hasNext()) {
-                        object.add(in.nextName(), readJsonElement(in));
-                    }
-                    in.endObject();
-                    return object;
-                case END_DOCUMENT:
-                case NAME:
-                case END_OBJECT:
-                case END_ARRAY:
-                default:
-                    throw new IllegalArgumentException();
-            }
+        @Override
+        public void write(JsonWriter out, JsonPrimitive value) throws IOException {
+            JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
         }
 
-        public static void writeJsonElement(JsonWriter out, JsonElement value) throws IOException {
-            if (value == null || value.isJsonNull()) {
-                out.nullValue();
-            } else if (value.isJsonPrimitive()) {
-                JsonPrimitive primitive = value.getAsJsonPrimitive();
-                if (primitive.isNumber()) {
-                    out.value(primitive.getAsNumber());
-                } else if (primitive.isBoolean()) {
-                    out.value(primitive.getAsBoolean());
-                } else {
-                    out.value(primitive.getAsString());
-                }
-
-            } else if (value.isJsonArray()) {
-                out.beginArray();
-                for (JsonElement e : value.getAsJsonArray()) {
-                    writeJsonElement(out, e);
-                }
-                out.endArray();
-
-            } else if (value.isJsonObject()) {
-                out.beginObject();
-                for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
-                    out.name(e.getKey());
-                    writeJsonElement(out, e.getValue());
-                }
-                out.endObject();
-
-            } else {
-                throw new IllegalArgumentException("Couldn't write " + value.getClass());
-            }
+        @Override
+        public JsonPrimitive read(JsonReader in) throws IOException {
+            JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
+            return jsonElement != null && jsonElement.isJsonPrimitive() ? jsonElement.getAsJsonPrimitive() : null;
         }
+    };
+
+    public static final TypeAdapter<JsonNull> JSON_NULL_TYPE_ADAPTER = new TypeAdapter<JsonNull>() {
 
         @Override
-        public JsonElement read(JsonReader in) throws IOException {
-            return JsonElementTypeAdapter.readJsonElement(in);
+        public void write(JsonWriter out, JsonNull value) throws IOException {
+            JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
         }
 
         @Override
-        public void write(JsonWriter out, JsonElement value) throws IOException {
-            writeJsonElement(out, value);
+        public JsonNull read(JsonReader in) throws IOException {
+            JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
+            return jsonElement != null && jsonElement.isJsonNull() ? jsonElement.getAsJsonNull() : null;
         }
-    }
+    };
 }
\ No newline at end of file

From c308fdf897ed25b5dc4f0a0fb1b75ea7641cc672 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 20:28:51 +0530
Subject: [PATCH 096/159] made variable public, and added method to get simple
 name of outer class

---
 .../stag/processor/utils/FileGenUtils.java    |  2 +-
 .../vimeo/stag/processor/utils/TypeUtils.java | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
index 72ee2627..4a2fcd4d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
@@ -43,7 +43,7 @@
 
 public final class FileGenUtils {
 
-    private static final String UNESCAPED_SEPARATOR = "$";
+    public static final String UNESCAPED_SEPARATOR = "$";
     private static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
 
     private FileGenUtils() {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 25526695..54c9e366 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -87,6 +87,26 @@ public static String getOuterClassType(@NotNull TypeMirror type) {
         }
     }
 
+    /**
+     * Retrieves the outer type of a parameterized class.
+     * e.g. an ArrayList{@literal <T>} would be returned as
+     * just ArrayList. If an interface is passed in, i.e. a
+     * List, the underlying implementation will be returned,
+     * i.e. ArrayList.
+     *
+     * @param type the type to get the outer class from/
+     * @return the outer class of the type passed in, or the
+     * type itself if it is not parameterized.
+     */
+    @NotNull
+    public static String getSimpleOuterClassType(@NotNull TypeMirror type) {
+        if (type instanceof DeclaredType) {
+            return ((DeclaredType) type).asElement().getSimpleName().toString();
+        } else {
+            return type.toString();
+        }
+    }
+
     /**
      * Determines whether or not the type has type parameters.
      *

From a6cb0b3f199bec1064b0909b6f9a2dffb2a8c94e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 20:30:04 +0530
Subject: [PATCH 097/159] added logic to generate more readable method names,
 and field names. Removed the special case of handling generic classes, and
 merged it into known type handling

---
 .../processor/generators/StagGenerator.java   | 126 ++++++++----------
 .../generators/TypeAdapterGenerator.java      |  10 +-
 .../processor/generators/model/ClassInfo.java |   2 +-
 3 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index c3a84ecd..49fde498 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -68,11 +68,11 @@ public class StagGenerator {
 
     private static final String CLASS_STAG = "Stag";
     private static final String CLASS_TYPE_ADAPTER_FACTORY = "Factory";
-    //Type.toString() -> NumberOf
     @NotNull
     private final static HashMap<String, GenericClassInfo> KNOWN_MAP_GENERIC_CLASSES = new HashMap<>();
     @NotNull
     private final static HashMap<String, GenericClassInfo> KNOWN_COLLECTION_GENERIC_CLASSES = new HashMap<>();
+    private static final String TYPE_ADAPTER_SUFFIX = "TypeAdapter";
 
     static {
         KNOWN_MAP_GENERIC_CLASSES.put(Map.class.getName(), new GenericClassInfo(2, false));
@@ -99,13 +99,13 @@ public class StagGenerator {
     @NotNull
     private final String mGeneratedPackageName;
     @NotNull
-    private final HashMap<String, String> mConcreteAdapterFieldMap = new HashMap<>();
-    @NotNull
-    private final HashMap<String, String> mGenericAdapterFieldMap = new HashMap<>();
-    @NotNull
     private final Set<TypeMirror> mKnownTypes;
     @NotNull
     private final Map<String, ExternalAdapterInfo> mExternalSupportedAdapters;
+    @NotNull
+    private final HashMap<String, String> mKnownAdapterFieldMap = new HashMap<>();
+    @NotNull
+    private final HashMap<String, String> mKnownFieldToMethodNameMap = new HashMap<>();
 
     public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                          @NotNull Set<TypeMirror> knownTypes, @NotNull Set<ExternalAdapterInfo> externalSupportedAdapters) {
@@ -142,7 +142,6 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             mExternalSupportedAdapters.put(externalType.toString(), entry);
         }
 
-
         for (ClassInfo knownGenericType : genericClasses) {
             List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
             AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
@@ -256,13 +255,12 @@ private TypeSpec getAdapterFactorySpec() {
                 String variableName = mFieldNameMap.get(classInfo.getType().toString());
                 TypeName typeName = TypeVariableName.get(classInfo.getType());
                 TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-                String fieldName = "mAdapter" + variableName;
+                String fieldName = "m" + variableName;
                 FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
                 adapterFactoryBuilder.addField(fieldSpecBuilder.build());
                 String getAdapterFactoryMethodName = "get" + variableName;
                 //Build a getter method
-                MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(
-                        FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
+                MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
                         .addModifiers(Modifier.PUBLIC)
                         .addParameter(Gson.class, "gson")
                         .returns(parameterizedTypeName);
@@ -365,17 +363,23 @@ private TypeSpec getAdapterFactorySpec() {
         /*
          * Iterate through all the registered concrete fields, and map the fields to its corresponding type adapters.
          */
-        Set<Map.Entry<String, String>> concreteAdapterFieldEntries = mConcreteAdapterFieldMap.entrySet();
+        Set<Map.Entry<String, String>> concreteAdapterFieldEntries = mKnownAdapterFieldMap.entrySet();
         for (Map.Entry<String, String> entry : concreteAdapterFieldEntries) {
-            generateAdapterMethod(entry.getKey(), entry.getValue(), adapterFactoryBuilder, false);
-        }
-
-        /*
-         * Iterate through all the registered generic fields, and map the fields to its corresponding type adapters.
-         */
-        Set<Map.Entry<String, String>> genericAdapterFieldEntries = mGenericAdapterFieldMap.entrySet();
-        for (Map.Entry<String, String> entry : genericAdapterFieldEntries) {
-            generateAdapterMethod(entry.getKey(), entry.getValue(), adapterFactoryBuilder, true);
+            String methodName = mKnownFieldToMethodNameMap.get(entry.getKey());
+            TypeName typeName = TypeVariableName.get(entry.getKey());
+            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            String variableName = "m" + methodName;
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + methodName)
+                    .addModifiers(Modifier.PUBLIC)
+                    .addParameter(Gson.class, "gson")
+                    .returns(parameterizedTypeName);
+            getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
+            getAdapterMethodBuilder.addStatement(variableName + " = " + entry.getValue());
+            getAdapterMethodBuilder.endControlFlow();
+            getAdapterMethodBuilder.addStatement("return " + variableName);
+            adapterFactoryBuilder.addField(fieldSpecBuilder.build());
+            adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
         }
 
         createMethodBuilder.addStatement("return null");
@@ -384,26 +388,6 @@ private TypeSpec getAdapterFactorySpec() {
         return adapterFactoryBuilder.build();
     }
 
-    private void generateAdapterMethod(String fieldType, String adapterCode, TypeSpec.Builder adapterFactoryBuilder, boolean containsTypeArg) {
-        TypeName typeName = TypeVariableName.get(fieldType);
-        TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
-        String getterName = containsTypeArg ? generateNameFromType(fieldType, false) : generateNameFromType(fieldType, true);
-        String variableName = "m" + getterName;
-        FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
-        MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + getterName)
-                .addModifiers(Modifier.PUBLIC)
-                .addParameter(Gson.class, "gson")
-                .returns(parameterizedTypeName);
-        getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
-
-        getAdapterMethodBuilder.addStatement(variableName + " = " + adapterCode);
-
-        getAdapterMethodBuilder.endControlFlow();
-        getAdapterMethodBuilder.addStatement("return " + variableName);
-        adapterFactoryBuilder.addField(fieldSpecBuilder.build());
-        adapterFactoryBuilder.addMethod(getAdapterMethodBuilder.build());
-    }
-
     /**
      * Returns the {@link TypeVariableName} of Stag.Factory file. This is used to get the type adapters
      * that are already generated in the stag file, avoiding recreating the same type adapters.
@@ -424,7 +408,7 @@ String addFieldForUnknownType(@NotNull TypeMirror fieldType) {
         String result = mUnknownAdapterFieldMap.get(fieldTypeString);
         if (null == result) {
             ClassInfo classInfo = new ClassInfo(fieldType);
-            result = generateNameFromType(fieldTypeString, false);
+            result = generateMethodName(fieldType);
             mUnknownClasses.add(classInfo);
             mUnknownAdapterFieldMap.put(fieldTypeString, result);
         }
@@ -433,46 +417,52 @@ String addFieldForUnknownType(@NotNull TypeMirror fieldType) {
 
     /**
      * Used to add fields for the concrete types such as for {@link Map} or {@link List} or any other
-     * concrete class
+     * known class
      */
     @NotNull
-    String addFieldForConcreteType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
-        if (!mConcreteAdapterFieldMap.containsKey(fieldType.toString())) {
-            mConcreteAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
+    String addFieldForKnownType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
+        String methodName = FileGenUtils.unescapeEscapedString(generateMethodName(fieldType)) + TYPE_ADAPTER_SUFFIX;
+        if (!mKnownAdapterFieldMap.containsKey(fieldType.toString())) {
+            mKnownAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
+            mKnownFieldToMethodNameMap.put(fieldType.toString(), methodName);
         }
-        return "get" + generateNameFromType(fieldType.toString(), true);
+        return "get" + methodName;
     }
 
-    /**
-     * Used to add fields for the generic types eg: generic classes
-     */
     @NotNull
-    String addFieldForGenericType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
-        if (!mGenericAdapterFieldMap.containsKey(fieldType.toString())) {
-            mGenericAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
+    private String generateMethodName(@NotNull TypeMirror typeMirror) {
+        String result = "";
+        String outerClassType = TypeUtils.getSimpleOuterClassType(typeMirror);
+        if (TypeUtils.isConcreteType(typeMirror)) {
+            if (TypeUtils.isNativeArray(typeMirror)) {
+                result = removeSpecialCharacters(typeMirror);
+                return result + "Primitive";
+            } else if (typeMirror instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
+                if (typeArguments == null || typeArguments.size() == 0) {
+                    result = removeSpecialCharacters(typeMirror);
+                } else {
+                    result += outerClassType;
+                    for (TypeMirror innerType : typeArguments) {
+                        result += generateMethodName(innerType);
+                    }
+                }
+            }
         }
-        return "get" + generateNameFromType(fieldType.toString(), false);
+
+        return result;
     }
 
     @NotNull
-    private String generateNameFromType(@NotNull String name, boolean isArray) {
-        name = name.replaceAll("\\[", "").replaceAll("\\]", "");
-        StringBuilder fieldNameBuilder = new StringBuilder();
-        boolean makeCapital = true;
-        for (int idx = 0; idx < name.length(); idx++) {
-            char c = name.charAt(idx);
-            if (c == '.' || c == '<' || c == ',' || c == '>') {
-                makeCapital = true;
-            } else {
-                fieldNameBuilder.append(makeCapital ? Character.toUpperCase(c) : c);
-                makeCapital = false;
-            }
-        }
-
-        return isArray ? fieldNameBuilder.toString() + "Array" : fieldNameBuilder.toString();
+    private String removeSpecialCharacters(TypeMirror typeMirror) {
+        String typeString = typeMirror.toString();
+        typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
+        typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
+        typeString = typeString.replace(",", "").replace(".", "");
+        return typeString;
     }
 
-    public ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
+    ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
         return mExternalSupportedAdapters.get(fieldType.toString());
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index b7df6051..bd68c877 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -316,7 +316,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
                             "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson"));
+                        String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
                         return adapterCode;
@@ -339,7 +339,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                    String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -373,7 +373,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter" + arguments +
                         "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                    String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -384,7 +384,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                  */
                 mGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
-                String getterName = stagGenerator.addFieldForConcreteType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else if (fieldType instanceof DeclaredType) {
                 /*
@@ -418,7 +418,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     }
                     adapterCode += ")";
                     if (!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        return "mStagFactory." + stagGenerator.addFieldForGenericType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson")) + "(mGson)";
+                        return "mStagFactory." + stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson")) + "(mGson)";
                     } else {
                         return adapterCode;
                     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
index 4da0ef95..276d32e2 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
@@ -85,7 +85,7 @@ public String getPackageName() {
      */
     @NotNull
     public String getTypeAdapterClassName() {
-        return FileGenUtils.escapeStringForCodeBlock(mClassName + "$TypeAdapter");
+        return FileGenUtils.escapeStringForCodeBlock(mClassName + "TypeAdapter");
     }
 
     /**

From 0d7515169b1d8e5bdbdd0f4d4a4a404bced885c7 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 30 Dec 2016 20:57:41 +0530
Subject: [PATCH 098/159] handling the scenario where two classes with same
 name exists in different packages. This change will make sure that if same
 class exists append the last string of package name to the getter method

---
 .../java/com/vimeo/sample/model/Video.java    |  2 ++
 .../java/com/vimeo/sample/model1/Video.java   | 22 +++++++++++++++++++
 .../processor/generators/StagGenerator.java   | 13 +++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model1/Video.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/Video.java b/sample/src/main/java/com/vimeo/sample/model/Video.java
index 27b1a01f..f56ac8a1 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Video.java
@@ -40,6 +40,8 @@ public class Video {
     @GsonAdapterKey("link")
     public String mLink;
 
+    public com.vimeo.sample.model1.Video video;
+
     @GsonAdapterKey("name")
     public String mName;
 
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Video.java b/sample/src/main/java/com/vimeo/sample/model1/Video.java
new file mode 100644
index 00000000..f36d7cfa
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model1/Video.java
@@ -0,0 +1,22 @@
+package com.vimeo.sample.model1;
+
+import com.vimeo.sample.model.User;
+import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
+
+/**
+ * This class has been added to repro the scenario where two classes with same names exists in different packages.
+ * This will make sure that the getter type adapter method for these classes are generated with the correct name (appending package name)
+ * so that two getters with same name is not created.
+ * <p>
+ * This class has been referenced as a member variable in {@link com.vimeo.sample.model.Video} class
+ */
+@UseStag
+public class Video {
+
+    @GsonAdapterKey("user")
+    public User mUser;
+
+    @GsonAdapterKey("link")
+    public String mLink;
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 49fde498..8af1b20d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -115,7 +115,6 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         mKnownClasses = new ArrayList<>(knownTypes.size());
         mExternalSupportedAdapters = new HashMap<>(externalSupportedAdapters.size());
 
-
         Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
         Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
@@ -126,7 +125,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                 if (null == typeArguments || typeArguments.isEmpty()) {
                     adapterFactoryMethodName = classInfo.getTypeAdapterClassName();
                     if (knownFieldNames.contains(adapterFactoryMethodName)) {
-                        adapterFactoryMethodName = adapterFactoryMethodName + String.valueOf(knownFieldNames.size());
+                        adapterFactoryMethodName = removeSpecialCharacters(classInfo.getPackageName()) + adapterFactoryMethodName;
                     }
                     knownFieldNames.add(adapterFactoryMethodName);
                 } else {
@@ -462,6 +461,16 @@ private String removeSpecialCharacters(TypeMirror typeMirror) {
         return typeString;
     }
 
+    @NotNull
+    private String removeSpecialCharacters(String typeString) {
+        typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
+        typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
+        typeString = typeString.replace(",", "").replace(".", "");
+        //this is done to make the first char as upper case.
+        typeString = typeString.substring(0, 1).toUpperCase() + typeString.substring(1);
+        return typeString;
+    }
+
     ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
         return mExternalSupportedAdapters.get(fieldType.toString());
     }

From 2e02fa09b186c8f8b96f5975e76f1e1d03d895fd Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 30 Dec 2016 22:07:23 +0530
Subject: [PATCH 099/159] Null Safe checks

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 46 ++++---------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 5ea135a4..085a0810 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -42,8 +42,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.gson.stream.JsonToken.BEGIN_ARRAY;
-import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
-import static com.google.gson.stream.JsonToken.BOOLEAN;
 
 /**
  * This class contains a list of KnownTypeAdapters such as {@link MapTypeAdapter}, {@link ListTypeAdapter} and more.
@@ -72,10 +70,6 @@ public class KnownTypeAdapters {
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
         @Override
         public Byte read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             try {
                 int intValue = in.nextInt();
                 return (byte) intValue;
@@ -88,7 +82,7 @@ public Byte read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Byte value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     /**
      * Type Adapter for {@link Short}.
@@ -96,10 +90,6 @@ public void write(JsonWriter out, Byte value) throws IOException {
     public static final TypeAdapter<Short> SHORT = new TypeAdapter<Short>() {
         @Override
         public Short read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             try {
                 return (short) in.nextInt();
             } catch (NumberFormatException e) {
@@ -111,7 +101,7 @@ public Short read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Short value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     /**
      * Type Adapter for {@link Integer}.
@@ -119,10 +109,6 @@ public void write(JsonWriter out, Short value) throws IOException {
     public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
         @Override
         public Integer read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             try {
                 return in.nextInt();
             } catch (NumberFormatException e) {
@@ -134,7 +120,7 @@ public Integer read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Integer value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     /**
      * Type Adapter for {@link Long}.
@@ -142,10 +128,6 @@ public void write(JsonWriter out, Integer value) throws IOException {
     public static final TypeAdapter<Long> LONG = new TypeAdapter<Long>() {
         @Override
         public Long read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             try {
                 return in.nextLong();
             } catch (NumberFormatException e) {
@@ -157,7 +139,7 @@ public Long read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Long value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     /**
      * Type Adapter for {@link Float}.
@@ -165,10 +147,6 @@ public void write(JsonWriter out, Long value) throws IOException {
     public static final TypeAdapter<Float> FLOAT = new TypeAdapter<Float>() {
         @Override
         public Float read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             return (float) in.nextDouble();
         }
 
@@ -176,7 +154,7 @@ public Float read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Float value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     /**
      * Type Adapter for {@link Double}.
@@ -184,10 +162,6 @@ public void write(JsonWriter out, Float value) throws IOException {
     public static final TypeAdapter<Double> DOUBLE = new TypeAdapter<Double>() {
         @Override
         public Double read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
             return in.nextDouble();
         }
 
@@ -195,7 +169,7 @@ public Double read(JsonReader in) throws IOException {
         public void write(JsonWriter out, Double value) throws IOException {
             out.value(value);
         }
-    };
+    }.nullSafe();
 
     public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(INTEGER, new ArrayListInstantiater<Integer>());
     public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiater<Long>());
@@ -776,7 +750,7 @@ public JsonObject read(JsonReader in) throws IOException {
             JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
             return jsonElement != null && jsonElement.isJsonObject() ? jsonElement.getAsJsonObject() : null;
         }
-    };
+    }.nullSafe();
 
     public static final TypeAdapter<JsonArray> JSON_ARRAY_TYPE_ADAPTER = new TypeAdapter<JsonArray>() {
         @Override
@@ -789,7 +763,7 @@ public JsonArray read(JsonReader in) throws IOException {
             JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
             return jsonElement != null && jsonElement.isJsonArray() ? jsonElement.getAsJsonArray() : null;
         }
-    };
+    }.nullSafe();
 
     public static final TypeAdapter<JsonPrimitive> JSON_PRIMITIVE_TYPE_ADAPTER = new TypeAdapter<JsonPrimitive>() {
 
@@ -803,7 +777,7 @@ public JsonPrimitive read(JsonReader in) throws IOException {
             JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
             return jsonElement != null && jsonElement.isJsonPrimitive() ? jsonElement.getAsJsonPrimitive() : null;
         }
-    };
+    }.nullSafe();
 
     public static final TypeAdapter<JsonNull> JSON_NULL_TYPE_ADAPTER = new TypeAdapter<JsonNull>() {
 
@@ -817,5 +791,5 @@ public JsonNull read(JsonReader in) throws IOException {
             JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
             return jsonElement != null && jsonElement.isJsonNull() ? jsonElement.getAsJsonNull() : null;
         }
-    };
+    }.nullSafe();
 }
\ No newline at end of file

From 503943e8fcc367c62a1c0c8ddf0b62193be77db8 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Fri, 30 Dec 2016 23:06:01 +0530
Subject: [PATCH 100/159] More deterministic names for clashing classes

---
 .../com/vimeo/sample/model/ConcreteClass.java |  3 ++
 .../processor/generators/StagGenerator.java   | 39 ++++++++++++++++---
 .../generators/TypeAdapterGenerator.java      |  2 +-
 .../processor/generators/model/ClassInfo.java |  2 +-
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java b/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
index f97f841f..ac4d7e53 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ConcreteClass.java
@@ -30,16 +30,19 @@
  * This class provides an example of using
  * nested static inner model classes.
  */
+@UseStag
 public class ConcreteClass {
 
     @SerializedName("doublyNestedModel")
     NestedModel.DoublyNestedModel doublyNestedModel;
 
+    @UseStag
     public static class NestedModel {
 
         @SerializedName("message")
         public String message;
 
+        @UseStag
         public static class DoublyNestedModel {
 
             @SerializedName("message")
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 8af1b20d..d44d2e3a 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -115,7 +115,8 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         mKnownClasses = new ArrayList<>(knownTypes.size());
         mExternalSupportedAdapters = new HashMap<>(externalSupportedAdapters.size());
 
-        Set<String> knownFieldNames = new HashSet<>(knownTypes.size());
+        Map<String, ClassInfo> knownFieldNames = new HashMap<>(knownTypes.size());
+        Map<String, List<ClassInfo>> clashingClassNames = new HashMap<>(knownTypes.size());
         Set<ClassInfo> genericClasses = new HashSet<>();
         for (TypeMirror knownType : knownTypes) {
             if (!TypeUtils.isAbstract(knownType)) {
@@ -124,10 +125,18 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                 List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
                 if (null == typeArguments || typeArguments.isEmpty()) {
                     adapterFactoryMethodName = classInfo.getTypeAdapterClassName();
-                    if (knownFieldNames.contains(adapterFactoryMethodName)) {
-                        adapterFactoryMethodName = removeSpecialCharacters(classInfo.getPackageName()) + adapterFactoryMethodName;
+                    ClassInfo clashingClass = knownFieldNames.get(adapterFactoryMethodName);
+                    if (null != clashingClass) {
+                        List<ClassInfo> classInfos = clashingClassNames.get(adapterFactoryMethodName);
+                        if(null == classInfos) {
+                            classInfos = new ArrayList<>();
+                            classInfos.add(clashingClass);
+                            clashingClassNames.put(adapterFactoryMethodName, classInfos);
+                        }
+                        classInfos.add(classInfo);
+                    } else {
+                        knownFieldNames.put(adapterFactoryMethodName, classInfo);
                     }
-                    knownFieldNames.add(adapterFactoryMethodName);
                 } else {
                     genericClasses.add(classInfo);
                 }
@@ -136,6 +145,22 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             }
         }
 
+        //Resolve names for clashing classes
+        for(Map.Entry<String, List<ClassInfo>> entry : clashingClassNames.entrySet()) {
+            String adapterFactoryMethodName = entry.getKey();
+            for(ClassInfo classInfo : entry.getValue()) {
+                StringBuilder newAdapterName = new StringBuilder();
+                for(String path : classInfo.getPackageName().split("\\.")){
+                    newAdapterName.append(Character.toUpperCase(path.charAt(0)));
+                    if(path.length() > 1){
+                        newAdapterName.append(path.substring(1));
+                    }
+                }
+                newAdapterName.append(adapterFactoryMethodName);
+                mFieldNameMap.put(classInfo.getType().toString(), newAdapterName.toString());
+            }
+        }
+
         for (ExternalAdapterInfo entry : externalSupportedAdapters) {
             TypeMirror externalType = entry.mExternalClassType.asType();
             mExternalSupportedAdapters.put(externalType.toString(), entry);
@@ -161,8 +186,8 @@ public static String getGeneratedFactoryClassAndPackage(String generatedPackageN
         return generatedPackageName + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
     }
 
-    Set<TypeMirror> getKnownTypes() {
-        return mKnownTypes;
+    boolean isKnownType(@NotNull TypeMirror mirror) {
+        return mKnownTypes.contains(mirror);
     }
 
     private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
@@ -463,11 +488,13 @@ private String removeSpecialCharacters(TypeMirror typeMirror) {
 
     @NotNull
     private String removeSpecialCharacters(String typeString) {
+        String input = typeString;
         typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
         typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
         typeString = typeString.replace(",", "").replace(".", "");
         //this is done to make the first char as upper case.
         typeString = typeString.substring(0, 1).toUpperCase() + typeString.substring(1);
+        System.out.println("Input : " + input + " Output: " + typeString);
         return typeString;
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index bd68c877..bb3f55db 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -394,7 +394,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
                 if (size != 0 &&
-                        (stagGenerator.getKnownTypes().contains(outerClass) ||
+                        (stagGenerator.isKnownType(outerClass) ||
                                 (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
                     mGsonVariableUsed = true;
                     mStagFactoryUsed = true;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
index 276d32e2..4da0ef95 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/ClassInfo.java
@@ -85,7 +85,7 @@ public String getPackageName() {
      */
     @NotNull
     public String getTypeAdapterClassName() {
-        return FileGenUtils.escapeStringForCodeBlock(mClassName + "TypeAdapter");
+        return FileGenUtils.escapeStringForCodeBlock(mClassName + "$TypeAdapter");
     }
 
     /**

From 4f5e4705d379424dc6cc113ba52c40ef56d9271c Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 31 Dec 2016 00:25:32 +0530
Subject: [PATCH 101/159] generating methods with $ char in the name

---
 .../processor/generators/StagGenerator.java   | 24 +++++--------------
 .../utils/KnownTypeAdapterUtils.java          | 10 --------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index d44d2e3a..eeb32e0e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -393,8 +393,8 @@ private TypeSpec getAdapterFactorySpec() {
             TypeName typeName = TypeVariableName.get(entry.getKey());
             TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
             String variableName = "m" + methodName;
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, variableName, Modifier.PRIVATE);
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + methodName)
+            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(variableName), Modifier.PRIVATE);
+            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + FileGenUtils.unescapeEscapedString(methodName))
                     .addModifiers(Modifier.PUBLIC)
                     .addParameter(Gson.class, "gson")
                     .returns(parameterizedTypeName);
@@ -445,7 +445,7 @@ String addFieldForUnknownType(@NotNull TypeMirror fieldType) {
      */
     @NotNull
     String addFieldForKnownType(@NotNull TypeMirror fieldType, @NotNull String adapterAccessorCode) {
-        String methodName = FileGenUtils.unescapeEscapedString(generateMethodName(fieldType)) + TYPE_ADAPTER_SUFFIX;
+        String methodName = generateMethodName(fieldType) + TYPE_ADAPTER_SUFFIX;
         if (!mKnownAdapterFieldMap.containsKey(fieldType.toString())) {
             mKnownAdapterFieldMap.put(fieldType.toString(), adapterAccessorCode);
             mKnownFieldToMethodNameMap.put(fieldType.toString(), methodName);
@@ -460,13 +460,13 @@ private String generateMethodName(@NotNull TypeMirror typeMirror) {
         if (TypeUtils.isConcreteType(typeMirror)) {
             if (TypeUtils.isNativeArray(typeMirror)) {
                 result = removeSpecialCharacters(typeMirror);
-                return result + "Primitive";
+                return result + "$$PrimitiveArray" + "$$";
             } else if (typeMirror instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
                 if (typeArguments == null || typeArguments.size() == 0) {
-                    result = removeSpecialCharacters(typeMirror);
+                    result = removeSpecialCharacters(typeMirror) + "$$";
                 } else {
-                    result += outerClassType;
+                    result += outerClassType + "$$";
                     for (TypeMirror innerType : typeArguments) {
                         result += generateMethodName(innerType);
                     }
@@ -486,18 +486,6 @@ private String removeSpecialCharacters(TypeMirror typeMirror) {
         return typeString;
     }
 
-    @NotNull
-    private String removeSpecialCharacters(String typeString) {
-        String input = typeString;
-        typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
-        typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
-        typeString = typeString.replace(",", "").replace(".", "");
-        //this is done to make the first char as upper case.
-        typeString = typeString.substring(0, 1).toUpperCase() + typeString.substring(1);
-        System.out.println("Input : " + input + " Output: " + typeString);
-        return typeString;
-    }
-
     ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
         return mExternalSupportedAdapters.get(fieldType.toString());
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 72bf6b57..b2693721 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -38,7 +38,6 @@ public class KnownTypeAdapterUtils {
     @NotNull
     private static final HashMap<String, String> SUPPORTED_COLLECTION_INFO = new HashMap<>();
 
-
     @NotNull
     private static final HashMap<String, String> SUPPORTED_PRIMITIVE_ARRAY = new HashMap<>();
 
@@ -76,13 +75,10 @@ public class KnownTypeAdapterUtils {
         KNOWN_TYPE_ADAPTERS.put(JsonPrimitive.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_PRIMITIVE_TYPE_ADAPTER");
         KNOWN_TYPE_ADAPTERS.put(JsonNull.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_NULL_TYPE_ADAPTER");
 
-
-
         SUPPORTED_COLLECTION_INFO.put(ArrayList.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater");
         SUPPORTED_COLLECTION_INFO.put(List.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ListInstantiater");
         SUPPORTED_COLLECTION_INFO.put(Collection.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater");
 
-
         SUPPORTED_PRIMITIVE_ARRAY.put(int[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveIntegerArrayAdapter");
         SUPPORTED_PRIMITIVE_ARRAY.put(long[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveLongArrayAdapter");
         SUPPORTED_PRIMITIVE_ARRAY.put(double[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveDoubleArrayAdapter");
@@ -93,10 +89,6 @@ public class KnownTypeAdapterUtils {
         SUPPORTED_PRIMITIVE_ARRAY.put(byte[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveByteArrayAdapter");
     }
 
-
-
-
-
     @Nullable
     public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror) {
         return KNOWN_TYPE_ADAPTERS.get(typeMirror.toString());
@@ -173,6 +165,4 @@ public static String getNativePrimitiveArrayTypeAdapter(@NotNull TypeMirror type
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         return SUPPORTED_PRIMITIVE_ARRAY.get(outerClassType);
     }
-
-
 }
\ No newline at end of file

From 5c1960533a12bddda9d7245a8c6f9aca186fc078 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 31 Dec 2016 00:35:14 +0530
Subject: [PATCH 102/159] added unit test case for listTypeAdapter, and a util
 class for creating dummy list

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 44 +++++++++++++++++++
 .../src/test/java/com/vimeo/stag/Utils.java   | 28 ++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 stag-library/src/test/java/com/vimeo/stag/Utils.java

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
index 6fc39394..1531b572 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -1,6 +1,7 @@
 package com.vimeo.stag;
 
 import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
@@ -9,6 +10,7 @@
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.ArrayList;
 
 public class KnownTypeAdaptersTest {
 
@@ -117,4 +119,46 @@ public void testForFloatTypeAdapter() throws Exception {
         Assert.assertEquals(value.doubleValue(), readValue.doubleValue(), 0);
         Assert.assertEquals(value, readValue, 0);
     }
+
+    /**
+     * Test for ListTypeAdapter
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForListTypeAdapter() throws Exception {
+
+        //for string arrays
+        ArrayList<String> dummyList = Utils.createStringDummyList();
+
+        TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
+                new KnownTypeAdapters.ArrayListInstantiater<String>());
+
+        StringWriter stringWriter = new StringWriter();
+        listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
+        String jsonString = stringWriter.toString();
+
+        ArrayList<String> readValue = listTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(dummyList.size(), readValue.size());
+        for (int i = 0; i < dummyList.size(); i++) {
+            Assert.assertEquals(dummyList.get(i), readValue.get(i));
+        }
+
+        //for integer arrays
+        ArrayList<Integer> intDummyList = Utils.createIntegerDummyList();
+
+        TypeAdapter<ArrayList<Integer>> listTypeAdapter1 = new KnownTypeAdapters.ListTypeAdapter<>(KnownTypeAdapters.INTEGER,
+                new KnownTypeAdapters.ArrayListInstantiater<Integer>());
+        stringWriter = new StringWriter();
+        listTypeAdapter1.write(new JsonWriter(stringWriter), intDummyList);
+        jsonString = stringWriter.toString();
+
+        ArrayList<Integer> readValue1 = listTypeAdapter1.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(intDummyList.size(), readValue1.size());
+        for (int i = 0; i < intDummyList.size(); i++) {
+            Assert.assertEquals(intDummyList.get(i), readValue1.get(i));
+        }
+    }
 }
\ No newline at end of file
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.java b/stag-library/src/test/java/com/vimeo/stag/Utils.java
new file mode 100644
index 00000000..94cdadff
--- /dev/null
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.java
@@ -0,0 +1,28 @@
+package com.vimeo.stag;
+
+import java.util.ArrayList;
+
+public class Utils {
+
+    public static ArrayList<String> createStringDummyList() {
+        ArrayList<String> stringList = new ArrayList<>();
+        stringList.add("abc");
+        stringList.add("abc1");
+        stringList.add("abc2");
+        stringList.add("abc3");
+        stringList.add("abc4");
+        stringList.add("abc5");
+        return stringList;
+    }
+
+    public static ArrayList<Integer> createIntegerDummyList() {
+        ArrayList<Integer> integerArrayList = new ArrayList<>();
+        integerArrayList.add(1);
+        integerArrayList.add(2);
+        integerArrayList.add(3);
+        integerArrayList.add(4);
+        integerArrayList.add(5);
+        integerArrayList.add(6);
+        return integerArrayList;
+    }
+}
\ No newline at end of file

From 02e3cb4bfb8b8cee94f259e770eb92a70e8b7897 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sun, 1 Jan 2017 10:37:22 +0530
Subject: [PATCH 103/159] added unit test case for jsonobject and jsonarray
 typeadapter

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 43 +++++++++++++++++++
 .../src/test/java/com/vimeo/stag/Utils.java   | 22 ++++++++++
 2 files changed, 65 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
index 1531b572..01170e07 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -1,5 +1,7 @@
 package com.vimeo.stag;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
@@ -161,4 +163,45 @@ public void testForListTypeAdapter() throws Exception {
             Assert.assertEquals(intDummyList.get(i), readValue1.get(i));
         }
     }
+
+    /**
+     * Test for {@link KnownTypeAdapters#JSON_OBJECT_TYPE_ADAPTER}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForJsonObjectTypeAdapter() throws Exception {
+        JsonObject jsonObject = Utils.createDummyJsonObject();
+
+        TypeAdapter<JsonObject> jsonObjectTypeAdapter = KnownTypeAdapters.JSON_OBJECT_TYPE_ADAPTER;
+        StringWriter stringWriter = new StringWriter();
+        jsonObjectTypeAdapter.write(new JsonWriter(stringWriter), jsonObject);
+        String jsonString = stringWriter.toString();
+
+        JsonObject readValue = jsonObjectTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(jsonObject.size(), readValue.size());
+    }
+
+    /**
+     * Test for {@link KnownTypeAdapters#JSON_ARRAY_TYPE_ADAPTER}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testForJsonArrayTypeAdapter() throws Exception {
+        JsonArray jsonArray = Utils.createDummyJsonArray();
+
+        TypeAdapter<JsonArray> jsonObjectTypeAdapter = KnownTypeAdapters.JSON_ARRAY_TYPE_ADAPTER;
+        StringWriter stringWriter = new StringWriter();
+        jsonObjectTypeAdapter.write(new JsonWriter(stringWriter), jsonArray);
+        String jsonString = stringWriter.toString();
+
+        JsonArray readValue = jsonObjectTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        Assert.assertEquals(jsonArray.size(), readValue.size());
+        for (int i = 0; i < jsonArray.size(); i++) {
+            Assert.assertEquals(jsonArray.get(i), readValue.get(i));
+        }
+    }
 }
\ No newline at end of file
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.java b/stag-library/src/test/java/com/vimeo/stag/Utils.java
index 94cdadff..4f408b6f 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.java
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.java
@@ -1,5 +1,8 @@
 package com.vimeo.stag;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
 import java.util.ArrayList;
 
 public class Utils {
@@ -25,4 +28,23 @@ public static ArrayList<Integer> createIntegerDummyList() {
         integerArrayList.add(6);
         return integerArrayList;
     }
+
+    public static JsonObject createDummyJsonObject() {
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("key", "value");
+        jsonObject.addProperty("key1", "value1");
+        jsonObject.addProperty("key2", "value2");
+        jsonObject.addProperty("key3", "value3");
+        jsonObject.addProperty("key4", "value4");
+        return jsonObject;
+    }
+
+    public static JsonArray createDummyJsonArray() {
+        JsonArray jsonArray = new JsonArray();
+        jsonArray.add("item1");
+        jsonArray.add("item2");
+        jsonArray.add("item3");
+        jsonArray.add("item4");
+        return jsonArray;
+    }
 }
\ No newline at end of file

From 2bb2c1d926aa9b519c4d35a4233eb11bcdeefefe Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Mon, 2 Jan 2017 11:50:21 +0530
Subject: [PATCH 104/159] this is avoid to generate duplicate method names when
 the inner class have same name in diff package, using packagname in that
 scenario

---
 .../vimeo/stag/processor/generators/StagGenerator.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index eeb32e0e..bb9f9af1 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -480,7 +480,14 @@ private String generateMethodName(@NotNull TypeMirror typeMirror) {
     @NotNull
     private String removeSpecialCharacters(TypeMirror typeMirror) {
         String typeString = typeMirror.toString();
-        typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
+        /**
+         * This is done to avoid generating duplicate method names, where the inner class type
+         *has same name (in different packages). In that case we are using the complete package name
+         *of the class to avoid class. We'll come up with a better solution for this case.
+         */
+        if (TypeUtils.isSupportedNative(typeMirror.toString())) {
+            typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
+        }
         typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
         typeString = typeString.replace(",", "").replace(".", "");
         return typeString;

From 5ebfa6133e8b8d920da17f7488d76382e7565195 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 5 Jan 2017 00:16:00 +0530
Subject: [PATCH 105/159] Code Cleanup. This now also handles the class where a
 class is inherited from another module

---
 .../sample_model/ExternalAbstractClass.java   | 14 +++
 .../vimeo/sample_model/ExternalModel2.java    | 12 +++
 .../sample/model/ExternalModelExample3.java   | 13 +++
 .../vimeo/stag/processor/StagProcessor.java   | 75 ++--------------
 .../generators/ExternalAdapterInfo.java       |  7 +-
 .../generators/model/AnnotatedClass.java      | 89 ++++++++++++-------
 .../generators/model/SupportedTypesModel.java | 30 ++++++-
 .../stag/processor/utils/ElementUtils.java    | 10 ++-
 8 files changed, 140 insertions(+), 110 deletions(-)
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ExternalModelExample3.java

diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
new file mode 100644
index 00000000..a5b9c57d
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample_model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public abstract class ExternalAbstractClass {
+
+    @SerializedName("type")
+    public String mType;
+
+    @SerializedName("externalModel2")
+    public ExternalModel2 mExternalModel2;
+}
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
new file mode 100644
index 00000000..91bce6a8
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
@@ -0,0 +1,12 @@
+package com.vimeo.sample_model;
+
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModel2 {
+
+    @SerializedName("externalModelString")
+    public String mExternalModelString;
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample3.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample3.java
new file mode 100644
index 00000000..0080eb89
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample3.java
@@ -0,0 +1,13 @@
+package com.vimeo.sample.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.sample_model.ExternalAbstractClass;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class ExternalModelExample3 extends ExternalAbstractClass {
+
+    @SerializedName("mainModuleValue")
+    public String mMainModuleValue;
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index d97cbd8f..ad285aa8 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -78,40 +78,8 @@ public final class StagProcessor extends AbstractProcessor {
     public static final boolean DEBUG = false;
     private static final String OPTION_PACKAGE_NAME = "stagGeneratedPackageName";
     private static final String DEFAULT_GENERATED_PACKAGE_NAME = "com.vimeo.stag.generated";
-    private final Set<TypeMirror> mSupportedTypes = new HashSet<>();
-    private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
     private boolean mHasBeenProcessed;
 
-    private static void addToListMap(@NotNull Map<Element, List<VariableElement>> map, @Nullable Element key, @Nullable VariableElement value) {
-        if (key == null) {
-            return;
-        }
-        List<VariableElement> list = map.get(key);
-        if (list == null) {
-            list = new ArrayList<>();
-        }
-        if (value != null) {
-            list.add(value);
-        }
-        map.put(key, list);
-    }
-
-    private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
-        if (modifiers.contains(Modifier.FINAL)) {
-            if (!modifiers.contains(Modifier.STATIC)) {
-                throw new RuntimeException("Unable to access field \"" +
-                        variableElement.getSimpleName().toString() + "\" in class " +
-                        variableElement.getEnclosingElement().asType() +
-                        ", field must not be final.");
-            }
-        } else if (modifiers.contains(Modifier.PRIVATE)) {
-            throw new RuntimeException("Unable to access field \"" +
-                    variableElement.getSimpleName().toString() + "\" in class " +
-                    variableElement.getEnclosingElement().asType() +
-                    ", field must not be private.");
-        }
-    }
-
     @Override
     public Set<String> getSupportedAnnotationTypes() {
         Set<String> set = new HashSet<>();
@@ -124,32 +92,7 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.RELEASE_7;
     }
 
-    private void addToSupportedTypes(@NotNull Element element,
-                                     @NotNull Map<Element, List<VariableElement>> variableMap,
-                                     @NotNull Element rootElement,
-                                     @NotNull String stagFactoryGeneratedName) {
-        if (element instanceof VariableElement) {
-            final VariableElement variableElement = (VariableElement) element;
-            Set<Modifier> modifiers = variableElement.getModifiers();
-            Element enclosingElement = variableElement.getEnclosingElement();
-            if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
-                checkModifiers(variableElement, modifiers);
-                if (!TypeUtils.isAbstract(element)) {
-                    mSupportedTypes.add(enclosingElement.asType());
-
-                    //If this is of a type which is not part of this module, but generated by Stag, we should use it.
-                    ExternalAdapterInfo.addExternalAdapters(processingEnv.getElementUtils(),
-                            stagFactoryGeneratedName, variableElement.asType(), mExternalSupportedAdapters);
-                }
-                addToListMap(variableMap, rootElement, variableElement);
-            }
-        } else if (element instanceof TypeElement) {
-            if (!TypeUtils.isAbstract(element)) {
-                mSupportedTypes.add(element.asType());
-            }
-            addToListMap(variableMap, element, null);
-        }
-    }
+
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
@@ -165,36 +108,28 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         String stagFactoryGeneratedName = StagGenerator.getGeneratedFactoryClassAndPackage(packageName);
         TypeUtils.initialize(processingEnv.getTypeUtils());
         ElementUtils.initialize(processingEnv.getElementUtils());
+        SupportedTypesModel.getInstance().initialize(stagFactoryGeneratedName);
 
         DebugLog.log("\nBeginning @UseStag annotation processing\n");
 
         mHasBeenProcessed = true;
-        Map<Element, List<VariableElement>> variableMap = new HashMap<>();
 
         Set<? extends Element> rootElements = roundEnv.getRootElements();
         for (Element rootElement : rootElements) {
             if (rootElement.getAnnotation(UseStag.class) != null) {
-                if (!TypeUtils.isAbstract(rootElement)) {
-                    mSupportedTypes.add(rootElement.asType());
-                    addToListMap(variableMap, rootElement, null);
-                }
-                for (Element enclosedElement : rootElement.getEnclosedElements()) {
-                    addToSupportedTypes(enclosedElement, variableMap, rootElement, stagFactoryGeneratedName);
-                }
+                SupportedTypesModel.getInstance().getSupportedType(rootElement.asType());
             }
         }
 
         Filer filer = processingEnv.getFiler();
         try {
-            for (Entry<Element, List<VariableElement>> entry : variableMap.entrySet()) {
-                SupportedTypesModel.getInstance().addSupportedType(new AnnotatedClass(entry.getKey(), entry.getValue()));
-            }
+            Set<TypeMirror> mSupportedTypes = SupportedTypesModel.getInstance().getSupportedTypesMirror();
             try {
                 mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
             } catch (Exception ignored) {
             }
 
-            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes, mExternalSupportedAdapters);
+            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes, SupportedTypesModel.getInstance().getExternalSupportedAdapters());
             TypeTokenConstantsGenerator typeTokenConstantsGenerator = new TypeTokenConstantsGenerator(filer, packageName);
 
             Set<Element> list = SupportedTypesModel.getInstance().getSupportedElements();
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 0956271f..86254108 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -3,6 +3,7 @@
 
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
+import com.vimeo.stag.processor.utils.ElementUtils;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
@@ -45,7 +46,7 @@ public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement ad
      * @param typeMirror               typeMirror
      * @param externalAdapterInfos     externalAdapterInfos
      */
-    public static void addExternalAdapters(@NotNull Elements elementUtils, @NotNull String stagFactoryGeneratedName,
+    public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
                                            @NotNull TypeMirror typeMirror, @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
         if (!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
             DeclaredType declaredType = (DeclaredType) typeMirror;
@@ -59,7 +60,7 @@ public static void addExternalAdapters(@NotNull Elements elementUtils, @NotNull
                 String classAdapterName = FileGenUtils.unescapeEscapedString(classInfo.getTypeAdapterQualifiedClassName());
                 if (!sCheckedClasses.contains(classAdapterName)) {
                     sCheckedClasses.add(classAdapterName);
-                    TypeElement adapterTypeElement = elementUtils.getTypeElement(classAdapterName);
+                    TypeElement adapterTypeElement = ElementUtils.getTypeElementFromQualifiedName(classAdapterName);
                     if (null != adapterTypeElement) {
                         for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
                             if (adapterEnclosedElement instanceof ExecutableElement) {
@@ -78,7 +79,7 @@ public static void addExternalAdapters(@NotNull Elements elementUtils, @NotNull
             List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
             if (null != typeArguments) {
                 for (TypeMirror typeArgument : typeArguments) {
-                    addExternalAdapters(elementUtils, stagFactoryGeneratedName, typeArgument, externalAdapterInfos);
+                    addExternalAdapters(stagFactoryGeneratedName, typeArgument, externalAdapterInfos);
                 }
             }
         }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 0e426c78..9899d517 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -24,6 +24,7 @@
 package com.vimeo.stag.processor.generators.model;
 
 import com.vimeo.stag.processor.StagProcessor;
+import com.vimeo.stag.processor.generators.ExternalAdapterInfo;
 import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
@@ -35,8 +36,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
@@ -51,16 +55,62 @@ public class AnnotatedClass {
     private final Element mElement;
 
     @NotNull
-    private final List<VariableElement> mMemberVariables;
+    private final Map<Element, TypeMirror> mMemberVariables;
 
-    @Nullable
-    private final TypeMirror mInheritedType;
-
-    public AnnotatedClass(@NotNull Element element, @NotNull List<VariableElement> members) {
+    AnnotatedClass(@NotNull Element element) {
         mType = element.asType();
         mElement = element;
-        mInheritedType = TypeUtils.getInheritedType(element);
-        mMemberVariables = new ArrayList<>(members);
+        TypeMirror inheritedType = TypeUtils.getInheritedType(element);
+        mMemberVariables = new HashMap<>();
+        for (Element enclosedElement : element.getEnclosedElements()) {
+            addToSupportedTypes(enclosedElement);
+        }
+
+        if (inheritedType != null) {
+            DebugLog.log(TAG, "\t\tInherited Type - " + inheritedType.toString());
+
+            AnnotatedClass genericInheritedType =
+                    SupportedTypesModel.getInstance().getSupportedType(inheritedType);
+
+            mMemberVariables.putAll(TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
+                    genericInheritedType.getMemberVariables()));
+        }
+
+    }
+
+    private void addToSupportedTypes(@NotNull Element element) {
+        if (element instanceof VariableElement) {
+            final VariableElement variableElement = (VariableElement) element;
+            Set<Modifier> modifiers = variableElement.getModifiers();
+            if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
+                checkModifiers(variableElement, modifiers);
+                if (!TypeUtils.isAbstract(element)) {
+                    SupportedTypesModel.getInstance().checkAndAddExternalAdapter(variableElement);
+                }
+                if (StagProcessor.DEBUG) {
+                    DebugLog.log(TAG, "\t\tMember variables - " + variableElement.asType().toString());
+                }
+                mMemberVariables.put(variableElement, variableElement.asType());
+            }
+        } else if (element instanceof TypeElement) {
+           SupportedTypesModel.getInstance().getSupportedType(element.asType());
+        }
+    }
+
+    private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
+        if (modifiers.contains(Modifier.FINAL)) {
+            if (!modifiers.contains(Modifier.STATIC)) {
+                throw new RuntimeException("Unable to access field \"" +
+                        variableElement.getSimpleName().toString() + "\" in class " +
+                        variableElement.getEnclosingElement().asType() +
+                        ", field must not be final.");
+            }
+        } else if (modifiers.contains(Modifier.PRIVATE)) {
+            throw new RuntimeException("Unable to access field \"" +
+                    variableElement.getSimpleName().toString() + "\" in class " +
+                    variableElement.getEnclosingElement().asType() +
+                    ", field must not be private.");
+        }
     }
 
     @NotNull
@@ -87,29 +137,6 @@ public Element getElement() {
      */
     @NotNull
     public Map<Element, TypeMirror> getMemberVariables() {
-        Map<Element, TypeMirror> map = new HashMap<>();
-        for (VariableElement element : mMemberVariables) {
-            map.put(element, element.asType());
-        }
-
-        DebugLog.log(TAG, "getMemberVariables() - " + mType.toString());
-
-        if (mInheritedType != null) {
-            DebugLog.log(TAG, "\t\tInherited Type - " + mInheritedType.toString());
-
-            AnnotatedClass genericInheritedType =
-                    SupportedTypesModel.getInstance().getSupportedType(mInheritedType);
-
-            map.putAll(TypeUtils.getConcreteMembers(mInheritedType, genericInheritedType.getElement(),
-                    genericInheritedType.getMemberVariables()));
-        }
-
-        if (StagProcessor.DEBUG) {
-            for (Entry<Element, TypeMirror> entry : map.entrySet()) {
-                DebugLog.log(TAG, "\t\tMember variables - " + entry.toString());
-            }
-        }
-
-        return map;
+        return new HashMap<>(mMemberVariables);
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index 9b65c62a..e432da1b 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
@@ -23,17 +23,18 @@
  */
 package com.vimeo.stag.processor.generators.model;
 
+import com.vimeo.stag.processor.generators.ExternalAdapterInfo;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
@@ -57,6 +58,13 @@ public static synchronized SupportedTypesModel getInstance() {
 
     private final Map<String, AnnotatedClass> mSupportedTypesMap = new HashMap<>();
     private final Set<Element> mSupportedTypes = new HashSet<>();
+    private final Set<TypeMirror> mSupportedTypesMirror = new HashSet<>();
+    private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
+    private String mGeneratedStagFactoryName;
+
+    public void initialize(@NotNull String generatedStagFactoryName) {
+        mGeneratedStagFactoryName = generatedStagFactoryName;
+    }
 
     /**
      * Tells the model that we support this type.
@@ -64,9 +72,10 @@ public static synchronized SupportedTypesModel getInstance() {
      * @param object the annotated class that we
      *               should track.
      */
-    public void addSupportedType(@NotNull AnnotatedClass object) {
+    private void addSupportedType(@NotNull AnnotatedClass object) {
         mSupportedTypesMap.put(TypeUtils.getOuterClassType(object.getType()), object);
         mSupportedTypes.add(object.getElement());
+        mSupportedTypesMirror.add(object.getType());
     }
 
     /**
@@ -83,13 +92,15 @@ public AnnotatedClass getSupportedType(@NotNull TypeMirror type) {
         AnnotatedClass model = mSupportedTypesMap.get(TypeUtils.getOuterClassType(type));
 
         if (model == null) {
-            model = new AnnotatedClass(TypeUtils.getUtils().asElement(type),
-                                       new ArrayList<VariableElement>());
+            model = new AnnotatedClass(TypeUtils.getUtils().asElement(type));
             addSupportedType(model);
         }
         return model;
     }
 
+
+
+
     /**
      * A set of all supported elements (these map 1 to 1
      * to an AnnotatedClass). This may return both generic
@@ -102,4 +113,15 @@ public Set<Element> getSupportedElements() {
         return new HashSet<>(mSupportedTypes);
     }
 
+    @NotNull
+    public Set<TypeMirror> getSupportedTypesMirror() {
+        return new HashSet<>(mSupportedTypesMirror);
+    }
+
+    public void checkAndAddExternalAdapter(VariableElement variableElement) {
+        //If this is of a type which is not part of this module, but generated by Stag, we should use it.
+        ExternalAdapterInfo.addExternalAdapters(mGeneratedStagFactoryName, variableElement.asType(), mExternalSupportedAdapters);
+    }
+
+    public Set<ExternalAdapterInfo> getExternalSupportedAdapters() {return new HashSet<>(mExternalSupportedAdapters);}
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
index a9dff622..9f5fdd29 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
@@ -53,9 +53,15 @@ private static Elements getUtils() {
 
     @Nullable
     public static TypeMirror getTypeFromQualifiedName(@NotNull String qualifiedName) {
+        TypeElement typeElement = getTypeElementFromQualifiedName(qualifiedName);
+        return null != typeElement ? typeElement.asType() : null;
+    }
+
+
+    @Nullable
+    public static TypeElement getTypeElementFromQualifiedName(@NotNull String qualifiedName){
         Elements elements = ElementUtils.getUtils();
-        TypeElement typeElement = elements.getTypeElement(qualifiedName);
-        return typeElement.asType();
+        return elements.getTypeElement(qualifiedName);
     }
 
     @NotNull

From a6a923f4d4c29dac7930bbfd8329fca5fe7f3981 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 5 Jan 2017 11:36:57 +0530
Subject: [PATCH 106/159] added "." char in the generated stag name file

---
 .../com/vimeo/stag/processor/StagProcessor.java    | 14 --------------
 .../stag/processor/generators/StagGenerator.java   | 12 ++++++------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index ad285aa8..9d599039 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -28,11 +28,9 @@
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.generators.AdapterGenerator;
 import com.vimeo.stag.processor.generators.EnumTypeAdapterGenerator;
-import com.vimeo.stag.processor.generators.ExternalAdapterInfo;
 import com.vimeo.stag.processor.generators.StagGenerator;
 import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.TypeTokenConstantsGenerator;
-import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.utils.DebugLog;
@@ -41,16 +39,8 @@
 import com.vimeo.stag.processor.utils.KnownTypeAdapterFactoriesUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.annotation.processing.AbstractProcessor;
@@ -63,9 +53,7 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
 
@@ -92,8 +80,6 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.RELEASE_7;
     }
 
-
-
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (mHasBeenProcessed) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index bb9f9af1..821e1110 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -128,7 +128,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                     ClassInfo clashingClass = knownFieldNames.get(adapterFactoryMethodName);
                     if (null != clashingClass) {
                         List<ClassInfo> classInfos = clashingClassNames.get(adapterFactoryMethodName);
-                        if(null == classInfos) {
+                        if (null == classInfos) {
                             classInfos = new ArrayList<>();
                             classInfos.add(clashingClass);
                             clashingClassNames.put(adapterFactoryMethodName, classInfos);
@@ -146,13 +146,13 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
         }
 
         //Resolve names for clashing classes
-        for(Map.Entry<String, List<ClassInfo>> entry : clashingClassNames.entrySet()) {
+        for (Map.Entry<String, List<ClassInfo>> entry : clashingClassNames.entrySet()) {
             String adapterFactoryMethodName = entry.getKey();
-            for(ClassInfo classInfo : entry.getValue()) {
+            for (ClassInfo classInfo : entry.getValue()) {
                 StringBuilder newAdapterName = new StringBuilder();
-                for(String path : classInfo.getPackageName().split("\\.")){
+                for (String path : classInfo.getPackageName().split("\\.")) {
                     newAdapterName.append(Character.toUpperCase(path.charAt(0)));
-                    if(path.length() > 1){
+                    if (path.length() > 1) {
                         newAdapterName.append(path.substring(1));
                     }
                 }
@@ -183,7 +183,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
     }
 
     public static String getGeneratedFactoryClassAndPackage(String generatedPackageName) {
-        return generatedPackageName + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
+        return generatedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
     }
 
     boolean isKnownType(@NotNull TypeMirror mirror) {

From 32d5b80f1bd77dbc22497d2451faac0d7bad5a33 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 5 Jan 2017 11:37:55 +0530
Subject: [PATCH 107/159] ran reformat code, and optimized import statements

---
 .../generators/ExternalAdapterInfo.java       |  2 -
 .../generators/model/AnnotatedClass.java      | 39 ++++++++-----------
 .../generators/model/SupportedTypesModel.java | 24 +++++-------
 .../stag/processor/utils/ElementUtils.java    |  2 +-
 .../utils/KnownTypeAdapterFactoriesUtils.java |  2 +-
 .../stag/processor/ElementUtilsUnitTest.java  | 38 +++++++++---------
 .../stag/processor/TypeUtilsUnitTest.java     | 28 ++++++-------
 .../java/com/vimeo/stag/processor/Utils.java  |  8 ++--
 8 files changed, 66 insertions(+), 77 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 86254108..64404a69 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -19,7 +19,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Elements;
 
 public class ExternalAdapterInfo {
 
@@ -41,7 +40,6 @@ public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement ad
     /**
      * Add adapters for the external models.
      *
-     * @param elementUtils             elementUtils
      * @param stagFactoryGeneratedName stagFactoryGeneratedName
      * @param typeMirror               typeMirror
      * @param externalAdapterInfos     externalAdapterInfos
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 9899d517..13025e4e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -24,18 +24,13 @@
 package com.vimeo.stag.processor.generators.model;
 
 import com.vimeo.stag.processor.StagProcessor;
-import com.vimeo.stag.processor.generators.ExternalAdapterInfo;
 import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.lang.model.element.Element;
@@ -78,6 +73,22 @@ public class AnnotatedClass {
 
     }
 
+    private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
+        if (modifiers.contains(Modifier.FINAL)) {
+            if (!modifiers.contains(Modifier.STATIC)) {
+                throw new RuntimeException("Unable to access field \"" +
+                        variableElement.getSimpleName().toString() + "\" in class " +
+                        variableElement.getEnclosingElement().asType() +
+                        ", field must not be final.");
+            }
+        } else if (modifiers.contains(Modifier.PRIVATE)) {
+            throw new RuntimeException("Unable to access field \"" +
+                    variableElement.getSimpleName().toString() + "\" in class " +
+                    variableElement.getEnclosingElement().asType() +
+                    ", field must not be private.");
+        }
+    }
+
     private void addToSupportedTypes(@NotNull Element element) {
         if (element instanceof VariableElement) {
             final VariableElement variableElement = (VariableElement) element;
@@ -93,23 +104,7 @@ private void addToSupportedTypes(@NotNull Element element) {
                 mMemberVariables.put(variableElement, variableElement.asType());
             }
         } else if (element instanceof TypeElement) {
-           SupportedTypesModel.getInstance().getSupportedType(element.asType());
-        }
-    }
-
-    private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
-        if (modifiers.contains(Modifier.FINAL)) {
-            if (!modifiers.contains(Modifier.STATIC)) {
-                throw new RuntimeException("Unable to access field \"" +
-                        variableElement.getSimpleName().toString() + "\" in class " +
-                        variableElement.getEnclosingElement().asType() +
-                        ", field must not be final.");
-            }
-        } else if (modifiers.contains(Modifier.PRIVATE)) {
-            throw new RuntimeException("Unable to access field \"" +
-                    variableElement.getSimpleName().toString() + "\" in class " +
-                    variableElement.getEnclosingElement().asType() +
-                    ", field must not be private.");
+            SupportedTypesModel.getInstance().getSupportedType(element.asType());
         }
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index e432da1b..e752f0fd 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
@@ -34,18 +34,21 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
 public final class SupportedTypesModel {
 
-    private SupportedTypesModel() {
-    }
-
     @Nullable
     private static SupportedTypesModel sInstance;
+    private final Map<String, AnnotatedClass> mSupportedTypesMap = new HashMap<>();
+    private final Set<Element> mSupportedTypes = new HashSet<>();
+    private final Set<TypeMirror> mSupportedTypesMirror = new HashSet<>();
+    private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
+    private String mGeneratedStagFactoryName;
+    private SupportedTypesModel() {
+    }
 
     @NotNull
     public static synchronized SupportedTypesModel getInstance() {
@@ -56,12 +59,6 @@ public static synchronized SupportedTypesModel getInstance() {
         return sInstance;
     }
 
-    private final Map<String, AnnotatedClass> mSupportedTypesMap = new HashMap<>();
-    private final Set<Element> mSupportedTypes = new HashSet<>();
-    private final Set<TypeMirror> mSupportedTypesMirror = new HashSet<>();
-    private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
-    private String mGeneratedStagFactoryName;
-
     public void initialize(@NotNull String generatedStagFactoryName) {
         mGeneratedStagFactoryName = generatedStagFactoryName;
     }
@@ -98,9 +95,6 @@ public AnnotatedClass getSupportedType(@NotNull TypeMirror type) {
         return model;
     }
 
-
-
-
     /**
      * A set of all supported elements (these map 1 to 1
      * to an AnnotatedClass). This may return both generic
@@ -123,5 +117,7 @@ public void checkAndAddExternalAdapter(VariableElement variableElement) {
         ExternalAdapterInfo.addExternalAdapters(mGeneratedStagFactoryName, variableElement.asType(), mExternalSupportedAdapters);
     }
 
-    public Set<ExternalAdapterInfo> getExternalSupportedAdapters() {return new HashSet<>(mExternalSupportedAdapters);}
+    public Set<ExternalAdapterInfo> getExternalSupportedAdapters() {
+        return new HashSet<>(mExternalSupportedAdapters);
+    }
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
index 9f5fdd29..18dc0b98 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/ElementUtils.java
@@ -59,7 +59,7 @@ public static TypeMirror getTypeFromQualifiedName(@NotNull String qualifiedName)
 
 
     @Nullable
-    public static TypeElement getTypeElementFromQualifiedName(@NotNull String qualifiedName){
+    public static TypeElement getTypeElementFromQualifiedName(@NotNull String qualifiedName) {
         Elements elements = ElementUtils.getUtils();
         return elements.getTypeElement(qualifiedName);
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
index e7cf6f49..d1cc1428 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
@@ -78,7 +78,7 @@ public static void writeKnownTypes(@NotNull ProcessingEnvironment processingEnv,
             knownTypesBuilder.append(knownType).append("\n");
         }
         FileGenUtils.writeToResource(filer, generatedPackageName, KNOWN_FACTORIES_RESOURCE,
-                                     knownTypesBuilder.toString());
+                knownTypesBuilder.toString());
     }
 
     private static void loadKnownTypesFromFiler(@NotNull Elements elementUtils, @NotNull Filer filer,
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.java
index 75f9f5e5..734fe3c8 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.java
@@ -56,51 +56,51 @@ public void testConstructor() throws Exception {
     @Test
     public void testGetTypeFromQualifiedName() throws Exception {
         Assert.assertEquals(Utils.getTypeMirrorFromClass(String.class),
-                            ElementUtils.getTypeFromQualifiedName(String.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(String.class.getName()));
         Assert.assertEquals(Utils.getTypeMirrorFromClass(Object.class),
-                            ElementUtils.getTypeFromQualifiedName(Object.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(Object.class.getName()));
         Assert.assertEquals(Utils.getTypeMirrorFromClass(ArrayList.class),
-                            ElementUtils.getTypeFromQualifiedName(ArrayList.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(ArrayList.class.getName()));
         Assert.assertEquals(Utils.getTypeMirrorFromClass(DummyConcreteClass.class),
-                            ElementUtils.getTypeFromQualifiedName(DummyConcreteClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyConcreteClass.class.getName()));
         Assert.assertEquals(Utils.getTypeMirrorFromClass(DummyGenericClass.class),
-                            ElementUtils.getTypeFromQualifiedName(DummyGenericClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyGenericClass.class.getName()));
         Assert.assertEquals(Utils.getTypeMirrorFromClass(DummyInheritedClass.class),
-                            ElementUtils.getTypeFromQualifiedName(DummyInheritedClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyInheritedClass.class.getName()));
 
         Assert.assertNotEquals(Utils.getTypeMirrorFromClass(DummyConcreteClass.class),
-                               ElementUtils.getTypeFromQualifiedName(DummyInheritedClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyInheritedClass.class.getName()));
         Assert.assertNotEquals(Utils.getTypeMirrorFromClass(DummyGenericClass.class),
-                               ElementUtils.getTypeFromQualifiedName(DummyConcreteClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyConcreteClass.class.getName()));
         Assert.assertNotEquals(Utils.getTypeMirrorFromClass(DummyInheritedClass.class),
-                               ElementUtils.getTypeFromQualifiedName(DummyGenericClass.class.getName()));
+                ElementUtils.getTypeFromQualifiedName(DummyGenericClass.class.getName()));
     }
 
     @Test
     public void testGetPackage() throws Exception {
         Assert.assertEquals(String.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(String.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(String.class)));
         Assert.assertEquals(ArrayList.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(ArrayList.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(ArrayList.class)));
         Assert.assertEquals(Object.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(Object.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(Object.class)));
         Assert.assertEquals(DummyGenericClass.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyGenericClass.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyGenericClass.class)));
 
         Assert.assertEquals(DummyGenericClass.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
         Assert.assertEquals(DummyConcreteClass.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyInheritedClass.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyInheritedClass.class)));
         Assert.assertEquals(DummyInheritedClass.class.getPackage().getName(),
-                            ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyGenericClass.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(DummyGenericClass.class)));
 
 
         Assert.assertNotEquals(Object.class.getPackage().getName(),
-                               ElementUtils.getPackage(Utils.getTypeMirrorFromClass(ArrayList.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(ArrayList.class)));
         Assert.assertNotEquals(List.class.getPackage().getName(),
-                               ElementUtils.getPackage(Utils.getTypeMirrorFromClass(String.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(String.class)));
         Assert.assertNotEquals(DummyInheritedClass.class.getPackage().getName(),
-                               ElementUtils.getPackage(Utils.getTypeMirrorFromClass(Object.class)));
+                ElementUtils.getPackage(Utils.getTypeMirrorFromClass(Object.class)));
     }
 
     @Test
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
index d6255f63..ba5cf78b 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
@@ -96,7 +96,7 @@ public void getInheritedType_isCorrect() throws Exception {
 
         TypeMirror realConcreteType =
                 types.getDeclaredType((TypeElement) Utils.getElementFromClass(DummyGenericClass.class),
-                                      Utils.getTypeMirrorFromClass(String.class));
+                        Utils.getTypeMirrorFromClass(String.class));
 
         assertTrue(realConcreteType.toString().equals(concreteType.toString()));
 
@@ -148,26 +148,26 @@ public void getConcreteMembers_isCorrect() throws Exception {
             } else if (entry.getKey().getSimpleName().contentEquals("testList")) {
 
                 assertTrue(entry.getValue()
-                                   .toString()
-                                   .equals(types.getDeclaredType(
-                                           (TypeElement) Utils.getElementFromClass(ArrayList.class),
-                                           stringType).toString()));
+                        .toString()
+                        .equals(types.getDeclaredType(
+                                (TypeElement) Utils.getElementFromClass(ArrayList.class),
+                                stringType).toString()));
 
             } else if (entry.getKey().getSimpleName().contentEquals("testMap")) {
 
                 assertTrue(entry.getValue()
-                                   .toString()
-                                   .equals(types.getDeclaredType(
-                                           (TypeElement) Utils.getElementFromClass(HashMap.class), stringType,
-                                           stringType).toString()));
+                        .toString()
+                        .equals(types.getDeclaredType(
+                                (TypeElement) Utils.getElementFromClass(HashMap.class), stringType,
+                                stringType).toString()));
 
             } else if (entry.getKey().getSimpleName().contentEquals("testSet")) {
 
                 assertTrue(entry.getValue()
-                                   .toString()
-                                   .equals(types.getDeclaredType(
-                                           (TypeElement) Utils.getElementFromClass(HashSet.class), stringType)
-                                                   .toString()));
+                        .toString()
+                        .equals(types.getDeclaredType(
+                                (TypeElement) Utils.getElementFromClass(HashSet.class), stringType)
+                                .toString()));
             }
         }
     }
@@ -214,7 +214,7 @@ public void getOuterClassType_isCorrect() throws Exception {
 
         // Test primitives
         assertTrue(int.class.getName()
-                           .equals(TypeUtils.getOuterClassType(types.getPrimitiveType(TypeKind.INT))));
+                .equals(TypeUtils.getOuterClassType(types.getPrimitiveType(TypeKind.INT))));
     }
 
     @Test
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.java
index 61b8d193..b1c30bca 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.java
@@ -46,6 +46,9 @@ public final class Utils {
     private static Elements elements;
     private static Types types;
 
+    private Utils() {
+    }
+
     public static void setup(@NotNull Elements elements, @NotNull Types types) {
         Preconditions.checkNotNull(elements);
         Preconditions.checkNotNull(types);
@@ -54,9 +57,6 @@ public static void setup(@NotNull Elements elements, @NotNull Types types) {
         Utils.types = types;
     }
 
-    private Utils() {
-    }
-
     public static <T> void testZeroArgumentConstructorFinalClass(Class<T> clazz) throws Exception {
         boolean exceptionThrown = false;
         try {
@@ -102,7 +102,7 @@ public static TypeMirror getGenericVersionOfClass(@NotNull Class clazz) {
             genericTypes[n] = params.get(n).asType();
         }
         return types.getDeclaredType(elements.getTypeElement(DummyGenericClass.class.getName()),
-                                     genericTypes);
+                genericTypes);
     }
 
 }

From 0924b965a4befa10b436bd4516e53afbe9b443a0 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:26:51 +0530
Subject: [PATCH 108/159] cleaned up sample-model module, removed unused
 dependency

---
 sample-model/build.gradle                             |  9 +--------
 sample-model/src/main/AndroidManifest.xml             | 11 ++---------
 .../com/vimeo/sample_model/ExternalAbstractClass.java |  2 +-
 .../java/com/vimeo/sample_model/ExternalModel1.java   |  2 +-
 .../java/com/vimeo/sample_model/ExternalModel2.java   |  3 +--
 .../com/vimeo/sample_model/ExternalModelGeneric.java  |  2 +-
 .../com/vimeo/sample_model/ExternalModelGeneric1.java |  3 +--
 sample-model/src/main/res/values/strings.xml          |  3 ---
 8 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 sample-model/src/main/res/values/strings.xml

diff --git a/sample-model/build.gradle b/sample-model/build.gradle
index 639911d9..4a840fd9 100644
--- a/sample-model/build.gradle
+++ b/sample-model/build.gradle
@@ -20,9 +20,6 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -34,11 +31,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:23.4.0'
-    testCompile 'junit:junit:4.12'
     compile project(':stag-library')
     apt project(':stag-library-compiler')
     compile 'com.google.code.gson:gson:2.8.0'
@@ -48,4 +41,4 @@ apt {
     arguments {
         stagGeneratedPackageName "com.vimeo.sample.sample_model.stag.generated"
     }
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/AndroidManifest.xml b/sample-model/src/main/AndroidManifest.xml
index 998b3fbe..b8a500b8 100644
--- a/sample-model/src/main/AndroidManifest.xml
+++ b/sample-model/src/main/AndroidManifest.xml
@@ -1,9 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vimeo.sample_model">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
+<manifest package="com.vimeo.sample_model">
+</manifest>
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
index a5b9c57d..f24a1e92 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalAbstractClass.java
@@ -11,4 +11,4 @@ public abstract class ExternalAbstractClass {
 
     @SerializedName("externalModel2")
     public ExternalModel2 mExternalModel2;
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
index eccbafd6..846f96bc 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel1.java
@@ -11,4 +11,4 @@ public class ExternalModel1 {
 
     @SerializedName("genericField")
     public ExternalModelGeneric<String> mGenericField;
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
index 91bce6a8..d3f25873 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModel2.java
@@ -1,6 +1,5 @@
 package com.vimeo.sample_model;
 
-
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
@@ -9,4 +8,4 @@ public class ExternalModel2 {
 
     @SerializedName("externalModelString")
     public String mExternalModelString;
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
index 99cd4ab0..a6afee74 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric.java
@@ -11,4 +11,4 @@ public class ExternalModelGeneric<T> {
 
     @SerializedName("genericField")
     public T mGenericField;
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
index 41a6b386..1839cafa 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
@@ -16,5 +16,4 @@ public class ExternalModelGeneric1<T> {
 
     @SerializedName("unkownType")
     public ValueCallback<T> mUnknownType;
-
-}
+}
\ No newline at end of file
diff --git a/sample-model/src/main/res/values/strings.xml b/sample-model/src/main/res/values/strings.xml
deleted file mode 100644
index f9da2f44..00000000
--- a/sample-model/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">sample-model</string>
-</resources>

From c449c242730183b0074b26a53dfda425d0ab8050 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:28:44 +0530
Subject: [PATCH 109/159] deleted the type adpater generator test, moved to
 TypeUtils test, since all the utility methods were moved

---
 .../stag/processor/TypeUtilsUnitTest.java     | 114 +++++++++++-
 .../TypeAdapterGeneratorUnitTest.java         | 165 ------------------
 2 files changed, 113 insertions(+), 166 deletions(-)
 delete mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
index ba5cf78b..a1a4b927 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
@@ -28,6 +28,7 @@
 import com.vimeo.stag.processor.dummy.DummyEnumClass;
 import com.vimeo.stag.processor.dummy.DummyGenericClass;
 import com.vimeo.stag.processor.dummy.DummyInheritedClass;
+import com.vimeo.stag.processor.dummy.DummyMapClass;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.junit.Assert;
@@ -35,11 +36,16 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Stack;
+import java.util.Vector;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
@@ -264,7 +270,6 @@ public void isConcreteType_TypeMirror_isCorrect() throws Exception {
                 }
             }
         }
-
     }
 
     @Test
@@ -301,4 +306,111 @@ public void isParameterizedType_Element_isCorrect() throws Exception {
         assertFalse(TypeUtils.isParameterizedType(Utils.getElementFromObject(testObject)));
     }
 
+    @Test
+    public void testIsSupportedPrimitive_supportsTypes() throws Exception {
+
+        // Check supported primitives
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(long.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(int.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(boolean.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(float.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(double.class.getName()));
+
+        // Check unsupported primitives
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(byte.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(char.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(short.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(void.class.getName()));
+
+        // Check non-primitives
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(String.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedPrimitive(Object.class.getName()));
+    }
+
+    @Test
+    public void testIsSupportedCollection_supportsTypes() throws Exception {
+        // Check supported list types
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
+
+        // Check unsupported list types
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
+
+        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
+
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
+
+        // Check array types
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+    }
+
+    @Test
+    public void testIsSupportedList_supportsTypes() throws Exception {
+        // Check supported types
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
+
+        // Check unsupported list types
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
+
+        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
+
+        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
+
+        // Check unsupported array types
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
+        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+    }
+
+    @Test
+    public void testIsSupportedNative_supportsCorrectTypes() throws Exception {
+        // Check supported primitives
+        Assert.assertTrue(TypeUtils.isSupportedNative(long.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(int.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(boolean.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(float.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(double.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(String.class.getName()));
+
+        // Check unsupported primitives
+        Assert.assertFalse(TypeUtils.isSupportedNative(byte.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(char.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(short.class.getName()));
+        Assert.assertFalse(TypeUtils.isSupportedNative(void.class.getName()));
+
+        // Check non-primitives
+        Assert.assertFalse(TypeUtils.isSupportedNative(Object.class.getName()));
+    }
+
+    @Test
+    public void testIsMap_supportsCorrectTypes() throws Exception {
+        // Check null
+        Assert.assertFalse(TypeUtils.isSupportedMap(null));
+
+        // Check supported types
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Map.class)));
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(HashMap.class)));
+        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(LinkedHashMap.class)));
+
+        // Check type that implements map
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyMapClass.class)));
+
+        // Check other types
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Object.class)));
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
+        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String.class)));
+    }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java
deleted file mode 100644
index 45415e4e..00000000
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/generators/TypeAdapterGeneratorUnitTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * The MIT License (MIT)
- * <p/>
- * Copyright (c) 2016 Vimeo
- * <p/>
- * 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:
- * <p/>
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * <p/>
- * 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.
- */
-package com.vimeo.stag.processor.generators;
-
-import com.vimeo.stag.processor.BaseUnitTest;
-import com.vimeo.stag.processor.Utils;
-import com.vimeo.stag.processor.dummy.DummyConcreteClass;
-import com.vimeo.stag.processor.dummy.DummyMapClass;
-import com.vimeo.stag.processor.utils.TypeUtils;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.Vector;
-
-import javax.lang.model.type.TypeKind;
-
-/**
- * Unit test for {@link TypeAdapterGenerator}
- */
-public class TypeAdapterGeneratorUnitTest extends BaseUnitTest {
-
-    @Test
-    public void testIsSupportedPrimitive_supportsTypes() throws Exception {
-
-        // Check supported primitives
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(long.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(int.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(boolean.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(float.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(double.class.getName()));
-
-        // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(byte.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(char.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(short.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(void.class.getName()));
-
-        // Check non-primitives
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(String.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(Object.class.getName()));
-    }
-
-    @Test
-    public void testIsSupportedCollection_supportsTypes() throws Exception {
-        // Check supported list types
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
-
-        // Check unsupported list types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
-
-        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
-
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
-
-        // Check array types
-        Assert.assertTrue(
-                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
-        Assert.assertTrue(
-                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
-        Assert.assertTrue(
-                TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
-        Assert.assertTrue(
-                TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
-        Assert.assertTrue(
-                TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
-    }
-
-    @Test
-    public void testIsSupportedList_supportsTypes() throws Exception {
-        // Check supported types
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
-
-        // Check unsupported list types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
-
-        Assert.assertFalse(TypeUtils.isSupportedCollection(null));
-
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
-
-        // Check unsupported array types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
-    }
-
-    @Test
-    public void testIsSupportedNative_supportsCorrectTypes() throws Exception {
-        // Check supported primitives
-        Assert.assertTrue(TypeUtils.isSupportedNative(long.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedNative(int.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedNative(boolean.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedNative(float.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedNative(double.class.getName()));
-        Assert.assertTrue(TypeUtils.isSupportedNative(String.class.getName()));
-
-        // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedNative(byte.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedNative(char.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedNative(short.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedNative(void.class.getName()));
-
-        // Check non-primitives
-        Assert.assertFalse(TypeUtils.isSupportedNative(Object.class.getName()));
-    }
-
-    @Test
-    public void testIsMap_supportsCorrectTypes() throws Exception {
-        // Check null
-        Assert.assertFalse(TypeUtils.isSupportedMap(null));
-
-        // Check supported types
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Map.class)));
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(HashMap.class)));
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(LinkedHashMap.class)));
-
-        // Check type that implements map
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyMapClass.class)));
-
-        // Check other types
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Object.class)));
-        Assert.assertFalse(
-                TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass.class)));
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String.class)));
-    }
-}
\ No newline at end of file

From 62e2eca8cb1fa5e7a86e6b55ff8687b670ca3b3b Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:33:29 +0530
Subject: [PATCH 110/159] made class final, and private constructor to avoid
 instantiaing this class

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 085a0810..fa2f8e69 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -41,8 +41,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.google.gson.stream.JsonToken.BEGIN_ARRAY;
-
 /**
  * This class contains a list of KnownTypeAdapters such as {@link MapTypeAdapter}, {@link ListTypeAdapter} and more.
  * These type adapters are referenced in the Stag Compiler library, where we generate the code for the type adapters.
@@ -62,7 +60,11 @@
  * is used to read and write the values, and the ObjectConstructor tells the type of List to be instantiated. This will also support the scenario
  * where we have a nested list. In that case the valueTypeAdapter will be again a {@link ListTypeAdapter} with its value TypeAdapter
  */
-public class KnownTypeAdapters {
+public final class KnownTypeAdapters {
+
+    private KnownTypeAdapters() {
+        throw new IllegalStateException("KnownTypeAdapters cannot be instantiated");
+    }
 
     /**
      * Type Adapter for {@link Byte}.
@@ -214,7 +216,7 @@ public T[] read(JsonReader reader) throws IOException {
                 reader.nextNull();
                 return null;
             }
-            if (reader.peek() != BEGIN_ARRAY) {
+            if (reader.peek() != JsonToken.BEGIN_ARRAY) {
                 reader.skipValue();
                 return null;
             }
@@ -447,7 +449,7 @@ public static char[] read(JsonReader reader) throws IOException {
     public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
         @Override
         public List<V> construct() {
-            return new ArrayList<V>();
+            return new ArrayList<>();
         }
     }
 
@@ -457,7 +459,7 @@ public List<V> construct() {
     public static class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
         @Override
         public Collection<V> construct() {
-            return new ArrayList<V>();
+            return new ArrayList<>();
         }
     }
 
@@ -467,7 +469,7 @@ public Collection<V> construct() {
     public static class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
         @Override
         public ArrayList<V> construct() {
-            return new ArrayList<V>();
+            return new ArrayList<>();
         }
     }
 
@@ -477,7 +479,7 @@ public ArrayList<V> construct() {
     public static class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
         @Override
         public HashMap<K, V> construct() {
-            return new HashMap<K, V>();
+            return new HashMap<>();
         }
     }
 
@@ -487,7 +489,7 @@ public HashMap<K, V> construct() {
     public static class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
         @Override
         public ConcurrentHashMap<K, V> construct() {
-            return new ConcurrentHashMap<K, V>();
+            return new ConcurrentHashMap<>();
         }
     }
 
@@ -497,7 +499,7 @@ public ConcurrentHashMap<K, V> construct() {
     public static class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
         @Override
         public LinkedHashMap<K, V> construct() {
-            return new LinkedHashMap<K, V>();
+            return new LinkedHashMap<>();
         }
     }
 
@@ -542,7 +544,7 @@ public T read(JsonReader reader) throws IOException {
                 return null;
             }
 
-            if (reader.peek() != BEGIN_ARRAY) {
+            if (reader.peek() != JsonToken.BEGIN_ARRAY) {
                 reader.skipValue();
                 return null;
             }
@@ -582,7 +584,7 @@ public void write(JsonWriter writer, T value) throws IOException {
             List<JsonElement> keys = new ArrayList<>(value.size());
 
             List<V> values = new ArrayList<>(value.size());
-            for (T.Entry<K, V> entry : value.entrySet()) {
+            for (Map.Entry<K, V> entry : value.entrySet()) {
                 JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
                 keys.add(keyElement);
                 values.add(entry.getValue());

From 99dffba4f6aaf291131153a6d4872e805c77bb15 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:37:57 +0530
Subject: [PATCH 111/159] incorporated review comments, made methods static,
 and variables renamed

---
 .../generators/TypeAdapterGenerator.java      | 58 +++++++++----------
 .../utils/KnownTypeAdapterUtils.java          |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index bb3f55db..8173ec65 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -64,8 +64,8 @@
 public class TypeAdapterGenerator extends AdapterGenerator {
 
     private static final String TYPE_ADAPTER_FIELD_PREFIX = "mTypeAdapter";
-    private static boolean mGsonVariableUsed;
-    private static boolean mStagFactoryUsed;
+    private static boolean sGsonVariableUsed;
+    private static boolean sStagFactoryUsed;
     @NotNull
     private final ClassInfo mInfo;
 
@@ -129,7 +129,7 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
 
-                if (null == typeMirrors || typeMirrors.size() == 0) {
+                if (typeMirrors.isEmpty()) {
                     result = typeTokenConstantsGenerator.addTypeToken(fieldType);
                 } else if (TypeUtils.isSupportedMap(fieldType)) {
                     /**
@@ -152,7 +152,7 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                      * If the fieldType is of Known parameterized type, recursively call the function to generate the typeadapter code.
                      */
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
-                    mGsonVariableUsed = true;
+                    sGsonVariableUsed = true;
                     List<? extends TypeMirror> typeArguments = declaredFieldType.getTypeArguments();
                     ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
 
@@ -293,8 +293,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
             String getterField = stagGenerator.getClassAdapterFactoryMethod(fieldType);
 
             if (null != getterField) {
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
+                sGsonVariableUsed = true;
+                sStagFactoryUsed = true;
                 /*
                  * If we already have the adapter generated for the fieldType in Stag.Factory class
                  */
@@ -307,8 +307,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 if (TypeUtils.isSupportedPrimitive(arrayInnerType.toString())) {
                     return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
                 } else {
-                    mStagFactoryUsed = true;
-                    mGsonVariableUsed = true;
+                    sStagFactoryUsed = true;
+                    sGsonVariableUsed = true;
                     ArrayType arrayType = (ArrayType) fieldType;
                     String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
                             typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
@@ -327,8 +327,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 /*
                  * If the fieldType is of type List
                  */
-                mStagFactoryUsed = true;
-                mGsonVariableUsed = true;
+                sStagFactoryUsed = true;
+                sGsonVariableUsed = true;
                 List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                 TypeMirror param = typeArguments.get(0);
                 String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
@@ -349,8 +349,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                  /*
                   * If the fieldType is of type Map
                   */
-                mGsonVariableUsed = true;
-                mStagFactoryUsed = true;
+                sGsonVariableUsed = true;
+                sStagFactoryUsed = true;
                 String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
                 List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                 String keyAdapterAccessor;
@@ -382,7 +382,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 /*
                  * If the fieldType is Object, use ObjectTypeAdapter
                  */
-                mGsonVariableUsed = true;
+                sGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
@@ -396,8 +396,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 if (size != 0 &&
                         (stagGenerator.isKnownType(outerClass) ||
                                 (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
-                    mGsonVariableUsed = true;
-                    mStagFactoryUsed = true;
+                    sGsonVariableUsed = true;
+                    sStagFactoryUsed = true;
                     ClassInfo outerClassInfo = new ClassInfo(outerClass);
                     int idx1 = fieldType.toString().indexOf("<");
                     String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
@@ -476,8 +476,8 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
             return fieldName;
         } else {
             String getterField = stagGenerator.addFieldForUnknownType(fieldType);
-            mGsonVariableUsed = true;
-            mStagFactoryUsed = true;
+            sGsonVariableUsed = true;
+            sStagFactoryUsed = true;
             return "mStagFactory." + "get" + getterField + "(mGson)";
         }
     }
@@ -485,9 +485,9 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
     /**
      * Returns the adapter code for the unknown types.
      */
-    private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                            @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                            @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+                                                   @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                                   @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
         if (null == fieldName) {
@@ -502,10 +502,10 @@ private String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull
     }
 
     @NotNull
-    private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
-                                              @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
-                                              @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                              @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
+    private static AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
+                                                     @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
+                                                     @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                                     @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
@@ -538,7 +538,7 @@ private AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassIn
     }
 
     @NotNull
-    private MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> memberVariables, @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> memberVariables, @NotNull AdapterFieldInfo adapterFieldInfo) {
         final MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
                 .addParameter(JsonWriter.class, "writer")
                 .addParameter(typeName, "object")
@@ -602,8 +602,8 @@ public void run() {
     @Override
     @NotNull
     public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator) {
-        mGsonVariableUsed = false;
-        mStagFactoryUsed = false;
+        sGsonVariableUsed = false;
+        sStagFactoryUsed = false;
         TypeMirror typeMirror = mInfo.getType();
         TypeName typeVariableName = TypeVariableName.get(typeMirror);
 
@@ -661,12 +661,12 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
 
-        if (mGsonVariableUsed) {
+        if (sGsonVariableUsed) {
             adapterBuilder.addField(Gson.class, "mGson", Modifier.FINAL, Modifier.PRIVATE);
             constructorBuilder.addStatement("this.mGson = gson");
         }
 
-        if (mStagFactoryUsed) {
+        if (sStagFactoryUsed) {
             adapterBuilder.addField(stagFactoryTypeName, "mStagFactory", Modifier.FINAL, Modifier.PRIVATE);
             constructorBuilder.addStatement("this.mStagFactory = stagFactory");
         }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index b2693721..2267064a 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -31,7 +31,7 @@
 /**
  * This maintains a list of type vs the known type adapters.
  */
-public class KnownTypeAdapterUtils {
+public final class KnownTypeAdapterUtils {
     @NotNull
     private static final HashMap<String, String> KNOWN_TYPE_ADAPTERS = new HashMap<>();
 

From 5dfef9baa5ffa4abd8641e57ef0655c0690808ad Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:48:16 +0530
Subject: [PATCH 112/159] reformatted code, made classes final and added doc
 for a method in TypeUtils

---
 .../sample/model/ExternalModelExample.java    |  6 +-
 .../sample/model/PrimitiveTypesExample.java   |  6 +-
 .../generators/ExternalAdapterInfo.java       |  2 +-
 .../processor/generators/StagGenerator.java   | 82 ++++++++++---------
 .../stag/processor/utils/FileGenUtils.java    |  7 +-
 .../vimeo/stag/processor/utils/TypeUtils.java |  8 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     | 20 ++---
 7 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
index 3c14842f..2e118d06 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample.java
@@ -22,19 +22,15 @@ public class ExternalModelExample<T> {
     @SerializedName("parametrizedExternalGenericExample")
     public ExternalModelGeneric<T> mParametrizedExternalGenericExample;
 
-
     @SerializedName("parametrizedInternalGenericExample")
     public GenericClass<T> mParametrizedInternalGenericExample;
 
-
     @SerializedName("mapExternalModel")
     public Map<String, ExternalModel1> mMapExternalModel;
 
-
     @SerializedName("mapExternalGenericModel")
     public Map<String, ExternalModelGeneric<String>> mMapExternalGenericModel;
 
     @SerializedName("mapExternalGenericGenericModel")
     public Map<String, ExternalModelGeneric<T>> mMapExternalGenericGenericModel;
-
-}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
index 81b70638..3e90895f 100644
--- a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
@@ -13,8 +13,8 @@ public class PrimitiveTypesExample {
     @GsonAdapterKey("simpleInt")
     public int simpleInt;
 
-    @GsonAdapterKey("simpleFlot")
-    public float simpleFlot;
+    @GsonAdapterKey("simpleFloat")
+    public float simpleFloat;
 
     @GsonAdapterKey("simpleShort")
     public short simpleShort;
@@ -24,4 +24,4 @@ public class PrimitiveTypesExample {
 
     @GsonAdapterKey("simpleDouble")
     public double simpleDouble;
-}
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 64404a69..f6ff7f20 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -23,7 +23,7 @@
 public class ExternalAdapterInfo {
 
     @NotNull
-    private static Set<String> sCheckedClasses = new HashSet<>();
+    private final static Set<String> sCheckedClasses = new HashSet<>();
     @NotNull
     final Element mExternalClassType;
     @NotNull
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 821e1110..59dc13b3 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -41,6 +41,7 @@
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.KnownTypeAdapterUtils;
+import com.vimeo.stag.processor.utils.Preconditions;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
@@ -178,6 +179,7 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                 }
             }
 
+            Preconditions.checkNotNull(typeArguments);
             mGenericClassInfo.put(knownGenericType.getType().toString(), new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
         }
     }
@@ -186,6 +188,46 @@ public static String getGeneratedFactoryClassAndPackage(String generatedPackageN
         return generatedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
     }
 
+    @NotNull
+    private static String removeSpecialCharacters(TypeMirror typeMirror) {
+        String typeString = typeMirror.toString();
+        /**
+         * This is done to avoid generating duplicate method names, where the inner class type
+         *has same name (in different packages). In that case we are using the complete package name
+         *of the class to avoid class. We'll come up with a better solution for this case.
+         */
+        if (TypeUtils.isSupportedNative(typeMirror.toString())) {
+            typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
+        }
+        typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
+        typeString = typeString.replace(",", "").replace(".", "");
+        return typeString;
+    }
+
+    @NotNull
+    private static String generateMethodName(@NotNull TypeMirror typeMirror) {
+        String result = "";
+        String outerClassType = TypeUtils.getSimpleOuterClassType(typeMirror);
+        if (TypeUtils.isConcreteType(typeMirror)) {
+            if (TypeUtils.isNativeArray(typeMirror)) {
+                result = removeSpecialCharacters(typeMirror);
+                return result + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR + "PrimitiveArray" + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR;
+            } else if (typeMirror instanceof DeclaredType) {
+                List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
+                if (typeArguments.isEmpty()) {
+                    result = removeSpecialCharacters(typeMirror) + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR;
+                } else {
+                    result += outerClassType + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR;
+                    for (TypeMirror innerType : typeArguments) {
+                        result += generateMethodName(innerType);
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
     boolean isKnownType(@NotNull TypeMirror mirror) {
         return mKnownTypes.contains(mirror);
     }
@@ -453,46 +495,6 @@ String addFieldForKnownType(@NotNull TypeMirror fieldType, @NotNull String adapt
         return "get" + methodName;
     }
 
-    @NotNull
-    private String generateMethodName(@NotNull TypeMirror typeMirror) {
-        String result = "";
-        String outerClassType = TypeUtils.getSimpleOuterClassType(typeMirror);
-        if (TypeUtils.isConcreteType(typeMirror)) {
-            if (TypeUtils.isNativeArray(typeMirror)) {
-                result = removeSpecialCharacters(typeMirror);
-                return result + "$$PrimitiveArray" + "$$";
-            } else if (typeMirror instanceof DeclaredType) {
-                List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
-                if (typeArguments == null || typeArguments.size() == 0) {
-                    result = removeSpecialCharacters(typeMirror) + "$$";
-                } else {
-                    result += outerClassType + "$$";
-                    for (TypeMirror innerType : typeArguments) {
-                        result += generateMethodName(innerType);
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @NotNull
-    private String removeSpecialCharacters(TypeMirror typeMirror) {
-        String typeString = typeMirror.toString();
-        /**
-         * This is done to avoid generating duplicate method names, where the inner class type
-         *has same name (in different packages). In that case we are using the complete package name
-         *of the class to avoid class. We'll come up with a better solution for this case.
-         */
-        if (TypeUtils.isSupportedNative(typeMirror.toString())) {
-            typeString = typeString.substring(typeString.lastIndexOf(".") + 1);
-        }
-        typeString = typeString.replace("<", "").replace(">", "").replace("[", "").replace("]", "");
-        typeString = typeString.replace(",", "").replace(".", "");
-        return typeString;
-    }
-
     ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
         return mExternalSupportedAdapters.get(fieldType.toString());
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
index 4a2fcd4d..56fca471 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
@@ -43,8 +43,8 @@
 
 public final class FileGenUtils {
 
-    public static final String UNESCAPED_SEPARATOR = "$";
-    private static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
+    private static final String UNESCAPED_SEPARATOR = "$";
+    public static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
 
     private FileGenUtils() {
         throw new UnsupportedOperationException("This class is not instantiable");
@@ -166,5 +166,4 @@ public static String escapeStringForCodeBlock(@NotNull String string) {
     public static String unescapeEscapedString(@NotNull String string) {
         return string.replace(CODE_BLOCK_ESCAPED_SEPARATOR, UNESCAPED_SEPARATOR);
     }
-
-}
+}
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 54c9e366..dfa0a355 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -208,7 +208,12 @@ public static boolean isConcreteType(@NotNull TypeMirror typeMirror) {
         return true;
     }
 
-
+    /**
+     * Determines where the the type mirros contains type var params or not
+     *
+     * @param typeMirror the element to check.
+     * @return true if it contains typevar
+     */
     public static boolean containsTypeVarParams(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
             return true;
@@ -227,7 +232,6 @@ public static boolean containsTypeVarParams(@NotNull TypeMirror typeMirror) {
         return false;
     }
 
-
     /**
      * Gets the inherited type from the element. If
      * the inherited type is Object, then this method
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index fa2f8e69..fc4181fe 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -446,7 +446,7 @@ public static char[] read(JsonReader reader) throws IOException {
     /**
      * Default Instantiater for List, by default it will create the Map of {@link ArrayList} type
      */
-    public static class ListInstantiater<V> implements ObjectConstructor<List<V>> {
+    public static final class ListInstantiater<V> implements ObjectConstructor<List<V>> {
         @Override
         public List<V> construct() {
             return new ArrayList<>();
@@ -456,7 +456,7 @@ public List<V> construct() {
     /**
      * Instantiater for {@link Collection}
      */
-    public static class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
+    public static final class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
         @Override
         public Collection<V> construct() {
             return new ArrayList<>();
@@ -466,7 +466,7 @@ public Collection<V> construct() {
     /**
      * Instantiater for {@link ArrayList}
      */
-    public static class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
+    public static final class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
         @Override
         public ArrayList<V> construct() {
             return new ArrayList<>();
@@ -476,7 +476,7 @@ public ArrayList<V> construct() {
     /**
      * Instantiater for {@link HashMap}
      */
-    public static class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
+    public static final class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
         @Override
         public HashMap<K, V> construct() {
             return new HashMap<>();
@@ -486,7 +486,7 @@ public HashMap<K, V> construct() {
     /**
      * Instantiater for {@link ConcurrentHashMap}
      */
-    public static class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
+    public static final class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
         @Override
         public ConcurrentHashMap<K, V> construct() {
             return new ConcurrentHashMap<>();
@@ -496,7 +496,7 @@ public ConcurrentHashMap<K, V> construct() {
     /**
      * Instantiater for {@link LinkedHashMap}
      */
-    public static class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
+    public static final class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
         @Override
         public LinkedHashMap<K, V> construct() {
             return new LinkedHashMap<>();
@@ -506,7 +506,7 @@ public LinkedHashMap<K, V> construct() {
     /**
      * Default Instantiater for Maps, by default it will create the Map of {@link LinkedHashMap} type
      */
-    public static class MapInstantiater<K, V> implements ObjectConstructor<Map<K, V>> {
+    public static final class MapInstantiater<K, V> implements ObjectConstructor<Map<K, V>> {
         @Override
         public Map<K, V> construct() {
             return new LinkedHashMap<K, V>();
@@ -516,7 +516,7 @@ public Map<K, V> construct() {
     /**
      * Type Adapter for {@link Collection}
      */
-    public static class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
+    public static final class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
 
         private TypeAdapter<V> valueTypeAdapter;
         private ObjectConstructor<T> objectConstructor;
@@ -563,7 +563,7 @@ public T read(JsonReader reader) throws IOException {
      * Type Adapter for {@link Map}. The constructor expects {@link ObjectConstructor} which is
      * used to instantiate maps of particular types eg, {@link HashMap} {@link LinkedHashMap} etc
      */
-    public static class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
+    public static final class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
         private ObjectConstructor<T> objectConstructor;
         private TypeAdapter<V> valueTypeAdapter;
         private TypeAdapter<K> keyTypeAdapter;
@@ -650,7 +650,7 @@ public T read(JsonReader in) throws IOException {
             return map;
         }
 
-        private String keyToString(JsonElement keyElement) {
+        private static String keyToString(JsonElement keyElement) {
             if (keyElement.isJsonPrimitive()) {
                 JsonPrimitive primitive = keyElement.getAsJsonPrimitive();
                 if (primitive.isNumber()) {

From 28ed92d737daba82bc7e6b0f55a1c4737ab081f0 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:50:39 +0530
Subject: [PATCH 113/159] added a public static field

---
 .../src/main/java/com/vimeo/sample/model/AccessModifiers.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index 65c5d6dd..9b474c57 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -43,6 +43,8 @@ public class AccessModifiers {
     @GsonAdapterKey("defaultModifier")
     String defaultModifier;
 
+    public static String STATIC_STRING = "static_string";
+
     //do not include fields of these types in TypeAdapter
     public static final String DEMO = "demo";
 

From a964ea6547cfa704f4993d8a9d421db80d99495a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 01:58:14 +0530
Subject: [PATCH 114/159] null check for paramType

---
 .../com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 2267064a..95f63e1a 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -121,7 +121,7 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
         TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(0) : null;
         TypeMirror paramType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(1) : null;
-        String postFix = keyType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
+        String postFix = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
 
         if (outerClassType.equals(Map.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiater" + postFix;

From 9e2b0c8723ab7afb9f09c747996b4a6c84d794b3 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 02:02:02 +0530
Subject: [PATCH 115/159] added NotNull/Nullable annotations

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index fc4181fe..4ba32f58 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -31,6 +31,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -232,14 +234,13 @@ public T[] read(JsonReader reader) throws IOException {
             T[] result = this.mObjectCreator.construct(object.size());
             return object.toArray(result);
         }
-
     }
 
     /**
      * Type Adapter for Integer[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveIntegerArrayAdapter {
-        public static void write(JsonWriter writer, int[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable int[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (int item : value) {
@@ -249,7 +250,8 @@ public static void write(JsonWriter writer, int[] value) throws IOException {
             }
         }
 
-        public static int[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static int[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Integer> arrayList = INTEGER_ARRAY_LIST_ADAPTER.read(reader);
             int[] result = null;
             if (null != arrayList) {
@@ -266,7 +268,7 @@ public static int[] read(JsonReader reader) throws IOException {
      * Type Adapter for long[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveLongArrayAdapter {
-        public static void write(JsonWriter writer, long[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable long[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (long item : value) {
@@ -276,7 +278,8 @@ public static void write(JsonWriter writer, long[] value) throws IOException {
             }
         }
 
-        public static long[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static long[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Long> arrayList = LONG_ARRAY_LIST_ADAPTER.read(reader);
             long[] result = null;
             if (null != arrayList) {
@@ -293,7 +296,7 @@ public static long[] read(JsonReader reader) throws IOException {
      * Type Adapter for double[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveDoubleArrayAdapter {
-        public static void write(JsonWriter writer, double[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable double[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (double item : value) {
@@ -303,7 +306,8 @@ public static void write(JsonWriter writer, double[] value) throws IOException {
             }
         }
 
-        public static double[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static double[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Double> arrayList = DOUBLE_ARRAY_LIST_ADAPTER.read(reader);
             double[] result = null;
             if (null != arrayList) {
@@ -320,7 +324,7 @@ public static double[] read(JsonReader reader) throws IOException {
      * Type Adapter for short[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveShortArrayAdapter {
-        public static void write(JsonWriter writer, short[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable short[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (short item : value) {
@@ -330,7 +334,8 @@ public static void write(JsonWriter writer, short[] value) throws IOException {
             }
         }
 
-        public static short[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static short[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Short> arrayList = SHORT_ARRAY_LIST_ADAPTER.read(reader);
             short[] result = null;
             if (null != arrayList) {
@@ -346,7 +351,7 @@ public static short[] read(JsonReader reader) throws IOException {
      * Type Adapter for float[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveFloatArrayAdapter {
-        public static void write(JsonWriter writer, float[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable float[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (float item : value) {
@@ -356,7 +361,8 @@ public static void write(JsonWriter writer, float[] value) throws IOException {
             }
         }
 
-        public static float[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static float[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Float> arrayList = FLOAT_ARRAY_LIST_ADAPTER.read(reader);
             float[] result = null;
             if (null != arrayList) {
@@ -373,7 +379,7 @@ public static float[] read(JsonReader reader) throws IOException {
      * Type Adapter for boolean[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveBooleanArrayAdapter {
-        public static void write(JsonWriter writer, boolean[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable boolean[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (boolean item : value) {
@@ -383,7 +389,8 @@ public static void write(JsonWriter writer, boolean[] value) throws IOException
             }
         }
 
-        public static boolean[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static boolean[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Boolean> arrayList = BOOLEAN_ARRAY_LIST_ADAPTER.read(reader);
             boolean[] result = null;
             if (null != arrayList) {
@@ -400,7 +407,7 @@ public static boolean[] read(JsonReader reader) throws IOException {
      * Type Adapter for byte[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveByteArrayAdapter {
-        public static void write(JsonWriter writer, byte[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable byte[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (byte item : value) {
@@ -410,7 +417,8 @@ public static void write(JsonWriter writer, byte[] value) throws IOException {
             }
         }
 
-        public static byte[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static byte[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Byte> byteArrayList = BYTE_ARRAY_LIST_ADAPTER.read(reader);
             byte[] result = null;
             if (null != byteArrayList) {
@@ -427,7 +435,7 @@ public static byte[] read(JsonReader reader) throws IOException {
      * Type Adapter for char[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveCharArrayAdapter {
-        public static void write(JsonWriter writer, char[] value) throws IOException {
+        public static void write(@NotNull JsonWriter writer, @Nullable char[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
                 for (char item : value) {
@@ -437,7 +445,8 @@ public static void write(JsonWriter writer, char[] value) throws IOException {
             }
         }
 
-        public static char[] read(JsonReader reader) throws IOException {
+        @Nullable
+        public static char[] read(@NotNull JsonReader reader) throws IOException {
             String string = com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe().read(reader);
             return null != string ? string.toCharArray() : null;
         }

From 6889d94a687d867f478c5fb964889f27e9e4a0c5 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 02:05:43 +0530
Subject: [PATCH 116/159] cached the String null safe adapter to avoid creation
 of new objects for each call

---
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 4ba32f58..cd30eae9 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -431,6 +431,8 @@ public static byte[] read(@NotNull JsonReader reader) throws IOException {
         }
     }
 
+    private static final TypeAdapter<String> STRING_NULL_SAFE_TYPE_ADAPTER = com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe();
+
     /**
      * Type Adapter for char[] type. This can be directly accessed to read and write
      */
@@ -447,7 +449,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable char[] value) thr
 
         @Nullable
         public static char[] read(@NotNull JsonReader reader) throws IOException {
-            String string = com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe().read(reader);
+            String string = STRING_NULL_SAFE_TYPE_ADAPTER.read(reader);
             return null != string ? string.toCharArray() : null;
         }
     }
@@ -750,6 +752,7 @@ public void write(JsonWriter out, Object value) throws IOException {
     }
 
     public static final TypeAdapter<JsonElement> JSON_ELEMENT_TYPE_ADAPTER = com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT.nullSafe();
+
     public static final TypeAdapter<JsonObject> JSON_OBJECT_TYPE_ADAPTER = new TypeAdapter<JsonObject>() {
         @Override
         public void write(JsonWriter out, JsonObject value) throws IOException {

From b2c05ab505e119f330e2b646e08ed0ca65534b4a Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 10:57:28 +0530
Subject: [PATCH 117/159] replaced with jetbrains annotations, and code
 formatting

---
 .../stag/processor/generators/model/SupportedTypesModel.java  | 1 +
 .../java/com/vimeo/stag/processor/utils/FileGenUtils.java     | 2 +-
 stag-library/build.gradle                                     | 1 +
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java       | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index e752f0fd..fb6799f8 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
@@ -47,6 +47,7 @@ public final class SupportedTypesModel {
     private final Set<TypeMirror> mSupportedTypesMirror = new HashSet<>();
     private final Set<ExternalAdapterInfo> mExternalSupportedAdapters = new HashSet<>();
     private String mGeneratedStagFactoryName;
+
     private SupportedTypesModel() {
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
index 56fca471..8aadc879 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/FileGenUtils.java
@@ -43,8 +43,8 @@
 
 public final class FileGenUtils {
 
-    private static final String UNESCAPED_SEPARATOR = "$";
     public static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
+    private static final String UNESCAPED_SEPARATOR = "$";
 
     private FileGenUtils() {
         throw new UnsupportedOperationException("This class is not instantiable");
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 8985cca7..9ab45e77 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -8,6 +8,7 @@ compileJava {
 
 dependencies {
     compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.intellij:annotations:12.0@jar'
     testCompile 'junit:junit:4.12'
 }
 
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index cd30eae9..11c63956 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -31,8 +31,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;

From 1590e609dc61344a83a8a922fa2353a34119854e Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 11:04:51 +0530
Subject: [PATCH 118/159] NPE for keytype, and paramtype

---
 .../utils/KnownTypeAdapterUtils.java          | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 95f63e1a..59f2c2ef 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -132,13 +132,23 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater" + postFix;
         } else {
-            return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">>() " +
-                    "{ " +
-                    "\n@Override " +
-                    "\npublic " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">" + " construct() {" +
-                    "\n\treturn new " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">();" +
-                    "\n}" +
-                    "}";
+            if (keyType != null && paramType != null) {
+                return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">>() " +
+                        "{ " +
+                        "\n@Override " +
+                        "\npublic " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">" + " construct() {" +
+                        "\n\treturn new " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">();" +
+                        "\n}" +
+                        "}";
+            } else {
+                return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "() " +
+                        "{ " +
+                        "\n@Override " +
+                        "\npublic " + outerClassType + " construct() {" +
+                        "\n\treturn new " + outerClassType + ">();" +
+                        "\n}" +
+                        "}";
+            }
         }
     }
 

From 4027442e9433505ea5860303e6ca0f035bfe3b3f Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 11:11:19 +0530
Subject: [PATCH 119/159] removed else block, simplified statement

---
 .../utils/KnownTypeAdapterUtils.java          | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 59f2c2ef..8b777dc7 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -132,23 +132,14 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater" + postFix;
         } else {
-            if (keyType != null && paramType != null) {
-                return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">>() " +
-                        "{ " +
-                        "\n@Override " +
-                        "\npublic " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">" + " construct() {" +
-                        "\n\treturn new " + outerClassType + "<" + keyType.toString() + ", " + paramType.toString() + ">();" +
-                        "\n}" +
-                        "}";
-            } else {
-                return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + "() " +
-                        "{ " +
-                        "\n@Override " +
-                        "\npublic " + outerClassType + " construct() {" +
-                        "\n\treturn new " + outerClassType + ">();" +
-                        "\n}" +
-                        "}";
-            }
+            String params = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">" : "";
+            return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + params + ">() " +
+                    "{ " +
+                    "\n@Override " +
+                    "\npublic " + outerClassType + params + " construct() {" +
+                    "\n\treturn new " + outerClassType + params + "();" +
+                    "\n}" +
+                    "}";
         }
     }
 

From f92421f87e56f1f4215dc1cb350e0c1d95a761e6 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 11:18:13 +0530
Subject: [PATCH 120/159] created private constructores

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index 11c63956..f01defe9 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -31,6 +31,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -240,6 +241,11 @@ public T[] read(JsonReader reader) throws IOException {
      * Type Adapter for Integer[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveIntegerArrayAdapter {
+
+        private PrimitiveIntegerArrayAdapter() {
+            throw new IllegalStateException("PrimitiveIntegerArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable int[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -268,6 +274,11 @@ public static int[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for long[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveLongArrayAdapter {
+
+        private PrimitiveLongArrayAdapter() {
+            throw new IllegalStateException("PrimitiveLongArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable long[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -296,6 +307,11 @@ public static long[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for double[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveDoubleArrayAdapter {
+
+        private PrimitiveDoubleArrayAdapter() {
+            throw new IllegalStateException("PrimitiveDoubleArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable double[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -324,6 +340,11 @@ public static double[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for short[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveShortArrayAdapter {
+
+        private PrimitiveShortArrayAdapter() {
+            throw new IllegalStateException("PrimitiveShortArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable short[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -351,6 +372,11 @@ public static short[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for float[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveFloatArrayAdapter {
+
+        private PrimitiveFloatArrayAdapter() {
+            throw new IllegalStateException("PrimitiveFloatArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable float[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -379,6 +405,11 @@ public static float[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for boolean[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveBooleanArrayAdapter {
+
+        private PrimitiveBooleanArrayAdapter() {
+            throw new IllegalStateException("PrimitiveBooleanArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable boolean[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -407,6 +438,11 @@ public static boolean[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for byte[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveByteArrayAdapter {
+
+        private PrimitiveByteArrayAdapter() {
+            throw new IllegalStateException("PrimitiveByteArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable byte[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();
@@ -437,6 +473,11 @@ public static byte[] read(@NotNull JsonReader reader) throws IOException {
      * Type Adapter for char[] type. This can be directly accessed to read and write
      */
     public static final class PrimitiveCharArrayAdapter {
+
+        private PrimitiveCharArrayAdapter() {
+            throw new IllegalStateException("PrimitiveCharArrayAdapter cannot be instantiated");
+        }
+
         public static void write(@NotNull JsonWriter writer, @Nullable char[] value) throws IOException {
             if (null != value) {
                 writer.beginArray();

From 2cfdebc5e63d7cac6131a9faf460cac448d20595 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 11:21:49 +0530
Subject: [PATCH 121/159] spell correction for Instantiator

---
 .../utils/KnownTypeAdapterUtils.java          | 14 ++++-----
 .../com/vimeo/stag/KnownTypeAdapters.java     | 30 +++++++++----------
 .../com/vimeo/stag/KnownTypeAdaptersTest.java |  4 +--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 8b777dc7..eb68069c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -75,9 +75,9 @@ public final class KnownTypeAdapterUtils {
         KNOWN_TYPE_ADAPTERS.put(JsonPrimitive.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_PRIMITIVE_TYPE_ADAPTER");
         KNOWN_TYPE_ADAPTERS.put(JsonNull.class.getName(), "com.vimeo.stag.KnownTypeAdapters.JSON_NULL_TYPE_ADAPTER");
 
-        SUPPORTED_COLLECTION_INFO.put(ArrayList.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiater");
-        SUPPORTED_COLLECTION_INFO.put(List.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ListInstantiater");
-        SUPPORTED_COLLECTION_INFO.put(Collection.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiater");
+        SUPPORTED_COLLECTION_INFO.put(ArrayList.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ArrayListInstantiator");
+        SUPPORTED_COLLECTION_INFO.put(List.class.getName(), "com.vimeo.stag.KnownTypeAdapters.ListInstantiator");
+        SUPPORTED_COLLECTION_INFO.put(Collection.class.getName(), "com.vimeo.stag.KnownTypeAdapters.CollectionInstantiator");
 
         SUPPORTED_PRIMITIVE_ARRAY.put(int[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveIntegerArrayAdapter");
         SUPPORTED_PRIMITIVE_ARRAY.put(long[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveLongArrayAdapter");
@@ -124,13 +124,13 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
         String postFix = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
 
         if (outerClassType.equals(Map.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiater" + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiator" + postFix;
         } else if (outerClassType.equals(HashMap.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.HashMapInstantiater" + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.HashMapInstantiator" + postFix;
         } else if (outerClassType.equals(LinkedHashMap.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.LinkedHashMapInstantiater" + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.LinkedHashMapInstantiator" + postFix;
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
-            return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiater" + postFix;
+            return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiator" + postFix;
         } else {
             String params = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">" : "";
             return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + params + ">() " +
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index f01defe9..f6b12bb3 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -176,13 +176,13 @@ public void write(JsonWriter out, Double value) throws IOException {
         }
     }.nullSafe();
 
-    public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(INTEGER, new ArrayListInstantiater<Integer>());
-    public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiater<Long>());
-    public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiater<Double>());
-    public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiater<Short>());
-    public static final TypeAdapter<ArrayList<Float>> FLOAT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(FLOAT, new ArrayListInstantiater<Float>());
-    public static final TypeAdapter<ArrayList<Boolean>> BOOLEAN_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(TypeAdapters.BOOLEAN, new ArrayListInstantiater<Boolean>());
-    public static final TypeAdapter<ArrayList<Byte>> BYTE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(BYTE, new ArrayListInstantiater<Byte>());
+    public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(INTEGER, new ArrayListInstantiator<Integer>());
+    public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiator<Long>());
+    public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiator<Double>());
+    public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiator<Short>());
+    public static final TypeAdapter<ArrayList<Float>> FLOAT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(FLOAT, new ArrayListInstantiator<Float>());
+    public static final TypeAdapter<ArrayList<Boolean>> BOOLEAN_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(TypeAdapters.BOOLEAN, new ArrayListInstantiator<Boolean>());
+    public static final TypeAdapter<ArrayList<Byte>> BYTE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(BYTE, new ArrayListInstantiator<Byte>());
 
     public interface PrimitiveArrayConstructor<T> {
         T[] construct(int size);
@@ -498,7 +498,7 @@ public static char[] read(@NotNull JsonReader reader) throws IOException {
     /**
      * Default Instantiater for List, by default it will create the Map of {@link ArrayList} type
      */
-    public static final class ListInstantiater<V> implements ObjectConstructor<List<V>> {
+    public static final class ListInstantiator<V> implements ObjectConstructor<List<V>> {
         @Override
         public List<V> construct() {
             return new ArrayList<>();
@@ -508,7 +508,7 @@ public List<V> construct() {
     /**
      * Instantiater for {@link Collection}
      */
-    public static final class CollectionInstantiater<V> implements ObjectConstructor<Collection<V>> {
+    public static final class CollectionInstantiator<V> implements ObjectConstructor<Collection<V>> {
         @Override
         public Collection<V> construct() {
             return new ArrayList<>();
@@ -518,7 +518,7 @@ public Collection<V> construct() {
     /**
      * Instantiater for {@link ArrayList}
      */
-    public static final class ArrayListInstantiater<V> implements ObjectConstructor<ArrayList<V>> {
+    public static final class ArrayListInstantiator<V> implements ObjectConstructor<ArrayList<V>> {
         @Override
         public ArrayList<V> construct() {
             return new ArrayList<>();
@@ -528,7 +528,7 @@ public ArrayList<V> construct() {
     /**
      * Instantiater for {@link HashMap}
      */
-    public static final class HashMapInstantiater<K, V> implements ObjectConstructor<HashMap<K, V>> {
+    public static final class HashMapInstantiator<K, V> implements ObjectConstructor<HashMap<K, V>> {
         @Override
         public HashMap<K, V> construct() {
             return new HashMap<>();
@@ -538,7 +538,7 @@ public HashMap<K, V> construct() {
     /**
      * Instantiater for {@link ConcurrentHashMap}
      */
-    public static final class ConcurrentHashMapInstantiater<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
+    public static final class ConcurrentHashMapInstantiator<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
         @Override
         public ConcurrentHashMap<K, V> construct() {
             return new ConcurrentHashMap<>();
@@ -548,7 +548,7 @@ public ConcurrentHashMap<K, V> construct() {
     /**
      * Instantiater for {@link LinkedHashMap}
      */
-    public static final class LinkedHashMapInstantiater<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
+    public static final class LinkedHashMapInstantiator<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
         @Override
         public LinkedHashMap<K, V> construct() {
             return new LinkedHashMap<>();
@@ -558,10 +558,10 @@ public LinkedHashMap<K, V> construct() {
     /**
      * Default Instantiater for Maps, by default it will create the Map of {@link LinkedHashMap} type
      */
-    public static final class MapInstantiater<K, V> implements ObjectConstructor<Map<K, V>> {
+    public static final class MapInstantiator<K, V> implements ObjectConstructor<Map<K, V>> {
         @Override
         public Map<K, V> construct() {
-            return new LinkedHashMap<K, V>();
+            return new LinkedHashMap<>();
         }
     }
 
diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
index 01170e07..cb5b9055 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -134,7 +134,7 @@ public void testForListTypeAdapter() throws Exception {
         ArrayList<String> dummyList = Utils.createStringDummyList();
 
         TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
-                new KnownTypeAdapters.ArrayListInstantiater<String>());
+                new KnownTypeAdapters.ArrayListInstantiator<String>());
 
         StringWriter stringWriter = new StringWriter();
         listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
@@ -151,7 +151,7 @@ public void testForListTypeAdapter() throws Exception {
         ArrayList<Integer> intDummyList = Utils.createIntegerDummyList();
 
         TypeAdapter<ArrayList<Integer>> listTypeAdapter1 = new KnownTypeAdapters.ListTypeAdapter<>(KnownTypeAdapters.INTEGER,
-                new KnownTypeAdapters.ArrayListInstantiater<Integer>());
+                new KnownTypeAdapters.ArrayListInstantiator<Integer>());
         stringWriter = new StringWriter();
         listTypeAdapter1.write(new JsonWriter(stringWriter), intDummyList);
         jsonString = stringWriter.toString();

From 07084ffaa01f87bba80530010c174e2cb6294a94 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 11:33:35 +0530
Subject: [PATCH 122/159] handle private static field scenarios

---
 .../com/vimeo/sample/model/AccessModifiers.java  |  2 +-
 .../generators/model/AnnotatedClass.java         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index 9b474c57..f608c76a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -43,7 +43,7 @@ public class AccessModifiers {
     @GsonAdapterKey("defaultModifier")
     String defaultModifier;
 
-    public static String STATIC_STRING = "static_string";
+    private static String STATIC_STRING = "static_string";
 
     //do not include fields of these types in TypeAdapter
     public static final String DEMO = "demo";
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 13025e4e..7650345d 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -74,18 +74,18 @@ public class AnnotatedClass {
     }
 
     private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
-        if (modifiers.contains(Modifier.FINAL)) {
-            if (!modifiers.contains(Modifier.STATIC)) {
+        if (!modifiers.contains(Modifier.STATIC)) {
+            if (modifiers.contains(Modifier.FINAL)) {
                 throw new RuntimeException("Unable to access field \"" +
                         variableElement.getSimpleName().toString() + "\" in class " +
                         variableElement.getEnclosingElement().asType() +
                         ", field must not be final.");
+            } else if (modifiers.contains(Modifier.PRIVATE)) {
+                throw new RuntimeException("Unable to access field \"" +
+                        variableElement.getSimpleName().toString() + "\" in class " +
+                        variableElement.getEnclosingElement().asType() +
+                        ", field must not be private.");
             }
-        } else if (modifiers.contains(Modifier.PRIVATE)) {
-            throw new RuntimeException("Unable to access field \"" +
-                    variableElement.getSimpleName().toString() + "\" in class " +
-                    variableElement.getEnclosingElement().asType() +
-                    ", field must not be private.");
         }
     }
 
@@ -93,7 +93,7 @@ private void addToSupportedTypes(@NotNull Element element) {
         if (element instanceof VariableElement) {
             final VariableElement variableElement = (VariableElement) element;
             Set<Modifier> modifiers = variableElement.getModifiers();
-            if ((!modifiers.contains(Modifier.FINAL) || !modifiers.contains(Modifier.STATIC)) && !modifiers.contains(Modifier.TRANSIENT)) {
+            if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) && !modifiers.contains(Modifier.TRANSIENT)) {
                 checkModifiers(variableElement, modifiers);
                 if (!TypeUtils.isAbstract(element)) {
                     SupportedTypesModel.getInstance().checkAndAddExternalAdapter(variableElement);

From 2eaeed43fc745a09b5ce86d026eb4e563d0e1596 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Sat, 7 Jan 2017 14:28:17 +0530
Subject: [PATCH 123/159] added sample model which does not use stag

---
 .../main/java/com/vimeo/sample/model1/Data.java   | 15 +++++++++++++++
 .../main/java/com/vimeo/sample/model1/Video.java  |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model1/Data.java

diff --git a/sample/src/main/java/com/vimeo/sample/model1/Data.java b/sample/src/main/java/com/vimeo/sample/model1/Data.java
new file mode 100644
index 00000000..a049797a
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model1/Data.java
@@ -0,0 +1,15 @@
+package com.vimeo.sample.model1;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * This model does not use stag
+ */
+public class Data {
+
+    @SerializedName("size")
+    public int size;
+
+    @SerializedName("name")
+    public String name;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Video.java b/sample/src/main/java/com/vimeo/sample/model1/Video.java
index f36d7cfa..4debb273 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Video.java
@@ -19,4 +19,7 @@ public class Video {
 
     @GsonAdapterKey("link")
     public String mLink;
+
+    @GsonAdapterKey("mData")
+    public Data mData;
 }
\ No newline at end of file

From 80908f56db3ef7f0f799a047cb71f289d7e1d7e0 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 11 Jan 2017 21:11:46 +0530
Subject: [PATCH 124/159] Adding unchecked warning code to new project

---
 sample-model/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sample-model/build.gradle b/sample-model/build.gradle
index 4a840fd9..dbc4a386 100644
--- a/sample-model/build.gradle
+++ b/sample-model/build.gradle
@@ -41,4 +41,10 @@ apt {
     arguments {
         stagGeneratedPackageName "com.vimeo.sample.sample_model.stag.generated"
     }
+}
+
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Werror"
+    }
 }
\ No newline at end of file

From 480f609cd0e2d53785274dbbe1b4ae31ade40ad0 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Wed, 11 Jan 2017 23:09:30 +0530
Subject: [PATCH 125/159] Fixing broken unit tests

---
 .../stag/processor/TypeUtilsUnitTest.java     | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
index a1a4b927..e12c5078 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
@@ -315,11 +315,11 @@ public void testIsSupportedPrimitive_supportsTypes() throws Exception {
         Assert.assertTrue(TypeUtils.isSupportedPrimitive(boolean.class.getName()));
         Assert.assertTrue(TypeUtils.isSupportedPrimitive(float.class.getName()));
         Assert.assertTrue(TypeUtils.isSupportedPrimitive(double.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(byte.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(char.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedPrimitive(short.class.getName()));
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(byte.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(char.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(short.class.getName()));
         Assert.assertFalse(TypeUtils.isSupportedPrimitive(void.class.getName()));
 
         // Check non-primitives
@@ -356,23 +356,25 @@ public void testIsSupportedList_supportsTypes() throws Exception {
         // Check supported types
         Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List.class)));
         Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList.class)));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
 
         // Check unsupported list types
         Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList.class)));
         Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector.class)));
         Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack.class)));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection.class)));
+
 
         Assert.assertFalse(TypeUtils.isSupportedCollection(null));
 
         Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Object.class)));
 
-        // Check unsupported array types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
-        Assert.assertFalse(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+        // Check supported array types
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String.class))));
+        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Object.class))));
+
     }
 
     @Test
@@ -384,11 +386,11 @@ public void testIsSupportedNative_supportsCorrectTypes() throws Exception {
         Assert.assertTrue(TypeUtils.isSupportedNative(float.class.getName()));
         Assert.assertTrue(TypeUtils.isSupportedNative(double.class.getName()));
         Assert.assertTrue(TypeUtils.isSupportedNative(String.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(byte.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(char.class.getName()));
+        Assert.assertTrue(TypeUtils.isSupportedNative(short.class.getName()));
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedNative(byte.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedNative(char.class.getName()));
-        Assert.assertFalse(TypeUtils.isSupportedNative(short.class.getName()));
         Assert.assertFalse(TypeUtils.isSupportedNative(void.class.getName()));
 
         // Check non-primitives

From 35c37e2b67120014222bf033d097c2b4562d15b8 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 00:02:58 +0530
Subject: [PATCH 126/159] Deprecated the GsonAdapterKey and added support for
 field options in UseStag annotation

---
 .../vimeo/sample/model/AbstractDataList.java  |  2 -
 .../vimeo/sample/model/AccessModifiers.java   |  4 --
 .../sample/model/ComplexGenericClass.java     | 10 +--
 .../sample/model/ExternalModelExample2.java   |  2 -
 .../sample/model/FieldOptionAllExample.java   | 21 ++++++
 .../sample/model/FieldOptionNoneExample.java  | 21 ++++++
 .../model/FieldOptionsSerializedName.java     | 26 ++++++++
 .../model/FieldOptionsSerializedName2.java    | 27 ++++++++
 .../model/FieldOptionsSerializedName3.java    | 26 ++++++++
 .../com/vimeo/sample/model/GenericClass.java  |  6 --
 .../sample/model/IdenticalFieldTypes.java     | 16 ++---
 .../com/vimeo/sample/model/NestedClass.java   |  8 +++
 .../com/vimeo/sample/model/NestedModel.java   |  6 +-
 .../java/com/vimeo/sample/model/Paging.java   |  2 -
 .../sample/model/PrimitiveTypesExample.java   |  6 --
 .../java/com/vimeo/sample/model/Stats.java    |  4 +-
 .../sample/model/SuperAbstractDataList.java   |  3 -
 .../java/com/vimeo/sample/model/User.java     |  6 +-
 .../java/com/vimeo/sample/model/Video.java    | 12 ++--
 .../generators/model/AnnotatedClass.java      | 64 +++++++++++++++----
 .../generators/model/SupportedTypesModel.java |  1 +
 .../java/com/vimeo/stag/GsonAdapterKey.java   |  4 ++
 .../src/main/java/com/vimeo/stag/UseStag.java | 24 +++++++
 23 files changed, 236 insertions(+), 65 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/NestedClass.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
index bcdefc8b..3fe05598 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AbstractDataList.java
@@ -23,7 +23,6 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
@@ -39,6 +38,5 @@
 @UseStag
 public abstract class AbstractDataList<T> extends SuperAbstractDataList<Paging, ArrayList<T>> {
 
-    @GsonAdapterKey("page")
     public int page;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index f608c76a..d8e04ee6 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -23,7 +23,6 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -34,13 +33,10 @@
 @UseStag
 public class AccessModifiers {
 
-    @GsonAdapterKey("publicModifier")
     public String publicModifier;
 
-    @GsonAdapterKey("protectedModifier")
     protected String protectedModifier;
 
-    @GsonAdapterKey("defaultModifier")
     String defaultModifier;
 
     private static String STATIC_STRING = "static_string";
diff --git a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
index 514a3384..6e466f84 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ComplexGenericClass.java
@@ -25,7 +25,7 @@
 
 import android.webkit.ValueCallback;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 import java.util.Map;
@@ -38,15 +38,15 @@
 @UseStag
 public class ComplexGenericClass<T> {
 
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     public T name;
 
-    @GsonAdapterKey("map")
+    @SerializedName("map")
     public Map<String, Map<String, T>> mapField;
 
-    @GsonAdapterKey("sparseArray")
+    @SerializedName("sparseArray")
     public ValueCallback<T> sparseArrayField;
 
-    @GsonAdapterKey("regularMap")
+    @SerializedName("regularMap")
     public Map<String, String> regularMapField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
index e92243c8..2ccd2c9e 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
@@ -5,8 +5,6 @@
 import com.vimeo.sample_model.ExternalModelGeneric;
 import com.vimeo.stag.UseStag;
 
-import java.util.Map;
-
 @UseStag
 public class ExternalModelExample2<T> {
 
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
new file mode 100644
index 00000000..3cfb7561
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
@@ -0,0 +1,21 @@
+package com.vimeo.sample.model;
+
+
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class which uses FIELD_OPTION_ALL explicitly
+ */
+@UseStag(UseStag.FIELD_OPTION_ALL)
+public class FieldOptionAllExample {
+
+    public int simpleInt;
+
+    public float simpleFloat;
+
+    public short simpleShort;
+
+    public long simpleLong;
+
+    public double simpleDouble;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
new file mode 100644
index 00000000..3ef1ab48
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
@@ -0,0 +1,21 @@
+package com.vimeo.sample.model;
+
+
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class to demonstrate the usage of FIELD_OPTION_NONE
+ */
+@UseStag(UseStag.FIELD_OPTION_NONE)
+public class FieldOptionNoneExample {
+
+    public int simpleInt;
+
+    public float simpleFloat;
+
+    public short simpleShort;
+
+    public long simpleLong;
+
+    public double simpleDouble;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
new file mode 100644
index 00000000..456c8db4
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
@@ -0,0 +1,26 @@
+package com.vimeo.sample.model;
+
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with SerializedName
+ */
+@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+public class FieldOptionsSerializedName {
+
+    public int simpleInt;
+
+    @SerializedName("simpleFloat")
+    public float simpleFloat;
+
+    @SerializedName("simpleShort")
+    public short simpleShort;
+
+    @SerializedName("simpleLong")
+    public long simpleLong;
+
+    @SerializedName("simpleDouble")
+    public double simpleDouble;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
new file mode 100644
index 00000000..2339ea6a
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
@@ -0,0 +1,27 @@
+package com.vimeo.sample.model;
+
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with SerializedName & GsonAdapterKey
+ */
+@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+public class FieldOptionsSerializedName2 {
+
+    public int simpleInt;
+
+    @SerializedName("simpleFloat")
+    public float simpleFloat;
+
+    @SerializedName("simpleShort")
+    public short simpleShort;
+
+    @GsonAdapterKey("simpleLong")
+    public long simpleLong;
+
+    @GsonAdapterKey("simpleDouble")
+    public double simpleDouble;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
new file mode 100644
index 00000000..b2718d62
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
@@ -0,0 +1,26 @@
+package com.vimeo.sample.model;
+
+
+import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
+
+/**
+ * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with GsonAdapterKey
+ */
+@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+public class FieldOptionsSerializedName3 {
+
+    public int simpleInt;
+
+    @GsonAdapterKey("simpleFloat")
+    public float simpleFloat;
+
+    @GsonAdapterKey("simpleShort")
+    public short simpleShort;
+
+    @GsonAdapterKey("simpleLong")
+    public long simpleLong;
+
+    @GsonAdapterKey("simpleDouble")
+    public double simpleDouble;
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
index 2dea0a4c..e7a52fb0 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
@@ -23,8 +23,6 @@
  */
 package com.vimeo.sample.model;
 
-import com.google.gson.annotations.SerializedName;
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
@@ -39,15 +37,11 @@
 @UseStag
 public class GenericClass<T> {
 
-    @GsonAdapterKey("name")
     public T name;
 
-    @GsonAdapterKey("map")
     public Map<String, Map<String, T>> mapField;
 
-    @GsonAdapterKey("mapInteger")
     public HashMap<Integer, T> mapIntegerField;
 
-    @GsonAdapterKey("arrayInteger")
     public ArrayList<T> arrayIntegerField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
index 59d83864..2e459e15 100644
--- a/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 import java.util.ArrayList;
@@ -41,24 +41,24 @@
 @UseStag
 public class IdenticalFieldTypes {
 
-    @GsonAdapterKey("mUser")
+    @SerializedName("mUser")
     User mUser;
 
-    @GsonAdapterKey("mSecondUser")
+    @SerializedName("mSecondUser")
     User mSecondUser;
 
-    @GsonAdapterKey("mUsersList")
+    @SerializedName("mUsersList")
     ArrayList<User> mUsersList;
 
-    @GsonAdapterKey("mSecondUsersList")
+    @SerializedName("mSecondUsersList")
     ArrayList<User> mSecondUsersList;
 
-    @GsonAdapterKey("mStatsArrayList")
+    @SerializedName("mStatsArrayList")
     ArrayList<Stats> mStatsArrayList;
 
-    @GsonAdapterKey("mListOfList")
+    @SerializedName("mListOfList")
     List<List<Stats>> mListOfList;
 
-    @GsonAdapterKey("mStats")
+    @SerializedName("mStats")
     Stats mStats;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedClass.java b/sample/src/main/java/com/vimeo/sample/model/NestedClass.java
new file mode 100644
index 00000000..7abcbf2d
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedClass.java
@@ -0,0 +1,8 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class NestedClass {
+    public static class Nested extends NestedClass {}
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
index b5a67367..b27cd81a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedModel.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -34,10 +34,10 @@
 @UseStag
 public class NestedModel {
 
-    @GsonAdapterKey("test1")
+    @SerializedName("test1")
     public String test1;
 
-    @GsonAdapterKey("nestedEnum")
+    @SerializedName("nestedEnum")
     public NestedEnum nestedEnum;
 
     @UseStag
diff --git a/sample/src/main/java/com/vimeo/sample/model/Paging.java b/sample/src/main/java/com/vimeo/sample/model/Paging.java
index 6bee9041..cb08ed1c 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Paging.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Paging.java
@@ -23,7 +23,6 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,6 +31,5 @@
 @UseStag
 public class Paging {
 
-    @GsonAdapterKey("first")
     public String first;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
index 3e90895f..7913af13 100644
--- a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
@@ -1,7 +1,6 @@
 package com.vimeo.sample.model;
 
 
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -10,18 +9,13 @@
 @UseStag
 public class PrimitiveTypesExample {
 
-    @GsonAdapterKey("simpleInt")
     public int simpleInt;
 
-    @GsonAdapterKey("simpleFloat")
     public float simpleFloat;
 
-    @GsonAdapterKey("simpleShort")
     public short simpleShort;
 
-    @GsonAdapterKey("simpleLong")
     public long simpleLong;
 
-    @GsonAdapterKey("simpleDouble")
     public double simpleDouble;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/Stats.java b/sample/src/main/java/com/vimeo/sample/model/Stats.java
index 266917e2..f4f36e63 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Stats.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Stats.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,7 +32,7 @@
 @UseStag
 public class Stats {
 
-    @GsonAdapterKey("plays")
+    @SerializedName("plays")
     public int mPlays;
 
     @Override
diff --git a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
index 936ac850..2a8fa46f 100644
--- a/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
+++ b/sample/src/main/java/com/vimeo/sample/model/SuperAbstractDataList.java
@@ -23,7 +23,6 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -39,9 +38,7 @@
 @UseStag
 public abstract class SuperAbstractDataList<T, K> {
 
-    @GsonAdapterKey("paging")
     public T paging;
 
-    @GsonAdapterKey("data")
     public K data;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/User.java b/sample/src/main/java/com/vimeo/sample/model/User.java
index 8832970a..6d0eab30 100644
--- a/sample/src/main/java/com/vimeo/sample/model/User.java
+++ b/sample/src/main/java/com/vimeo/sample/model/User.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -32,10 +32,10 @@
 @UseStag
 public class User {
 
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     public String mName;
 
-    @GsonAdapterKey("location")
+    @SerializedName("location")
     public String mLocation;
 
     @Override
diff --git a/sample/src/main/java/com/vimeo/sample/model/Video.java b/sample/src/main/java/com/vimeo/sample/model/Video.java
index f56ac8a1..fc7447ab 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Video.java
@@ -23,7 +23,7 @@
  */
 package com.vimeo.sample.model;
 
-import com.vimeo.stag.GsonAdapterKey;
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
 
 import java.util.Date;
@@ -34,21 +34,21 @@
 @UseStag
 public class Video {
 
-    @GsonAdapterKey("user")
+    @SerializedName("user")
     public User mUser;
 
-    @GsonAdapterKey("link")
+    @SerializedName("link")
     public String mLink;
 
     public com.vimeo.sample.model1.Video video;
 
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     public String mName;
 
-    @GsonAdapterKey("created_time")
+    @SerializedName("created_time")
     public Date mCreatedTime;
 
-    @GsonAdapterKey("stats")
+    @SerializedName("stats")
     public Stats mStats;
 
     @Override
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 7650345d..998832aa 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -23,13 +23,18 @@
  */
 package com.vimeo.stag.processor.generators.model;
 
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.GsonAdapterKey;
+import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.StagProcessor;
 import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -52,13 +57,19 @@ public class AnnotatedClass {
     @NotNull
     private final Map<Element, TypeMirror> mMemberVariables;
 
+    private List<Element> mNestedElements;
+
     AnnotatedClass(@NotNull Element element) {
         mType = element.asType();
         mElement = element;
         TypeMirror inheritedType = TypeUtils.getInheritedType(element);
+
+        UseStag useStag = element.getAnnotation(UseStag.class);
+        int fieldOptions = useStag == null ? UseStag.FIELD_OPTION_ALL : useStag.value();
+
         mMemberVariables = new HashMap<>();
         for (Element enclosedElement : element.getEnclosedElements()) {
-            addToSupportedTypes(enclosedElement);
+            addToSupportedTypes(enclosedElement, fieldOptions);
         }
 
         if (inheritedType != null) {
@@ -73,6 +84,15 @@ public class AnnotatedClass {
 
     }
 
+    //This is to avoid the infinite recursive loop where an inner class can be deriving for this class itself
+    void initNestedClasses(){
+        if(null != mNestedElements) {
+            for (Element element: mNestedElements) {
+                SupportedTypesModel.getInstance().getSupportedType(element.asType());
+            }
+        }
+    }
+
     private static void checkModifiers(VariableElement variableElement, Set<Modifier> modifiers) {
         if (!modifiers.contains(Modifier.STATIC)) {
             if (modifiers.contains(Modifier.FINAL)) {
@@ -89,22 +109,40 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         }
     }
 
-    private void addToSupportedTypes(@NotNull Element element) {
+    private void addToSupportedTypes(@NotNull Element element, int fieldOptions) {
         if (element instanceof VariableElement) {
-            final VariableElement variableElement = (VariableElement) element;
-            Set<Modifier> modifiers = variableElement.getModifiers();
-            if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) && !modifiers.contains(Modifier.TRANSIENT)) {
-                checkModifiers(variableElement, modifiers);
-                if (!TypeUtils.isAbstract(element)) {
-                    SupportedTypesModel.getInstance().checkAndAddExternalAdapter(variableElement);
-                }
-                if (StagProcessor.DEBUG) {
-                    DebugLog.log(TAG, "\t\tMember variables - " + variableElement.asType().toString());
+            if(shouldIncludeField(element, fieldOptions)) {
+                final VariableElement variableElement = (VariableElement) element;
+                Set<Modifier> modifiers = variableElement.getModifiers();
+                if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) && !modifiers.contains(Modifier.TRANSIENT)) {
+                    checkModifiers(variableElement, modifiers);
+                    if (!TypeUtils.isAbstract(element)) {
+                        SupportedTypesModel.getInstance().checkAndAddExternalAdapter(variableElement);
+                    }
+                    if (StagProcessor.DEBUG) {
+                        DebugLog.log(TAG, "\t\tMember variables - " + variableElement.asType().toString());
+                    }
+                    mMemberVariables.put(variableElement, variableElement.asType());
                 }
-                mMemberVariables.put(variableElement, variableElement.asType());
             }
         } else if (element instanceof TypeElement) {
-            SupportedTypesModel.getInstance().getSupportedType(element.asType());
+            if(null == mNestedElements) {
+                mNestedElements = new ArrayList<>();
+            }
+            mNestedElements.add(element);
+        }
+    }
+
+    private boolean shouldIncludeField(@NotNull Element element, int fieldOption) {
+        switch (fieldOption){
+            case UseStag.FIELD_OPTION_NONE:
+                return false;
+            case UseStag.FIELD_OPTION_SERIALIZED_NAME:
+                return element.getAnnotation(SerializedName.class) != null || element.getAnnotation(GsonAdapterKey.class) != null;
+            case UseStag.FIELD_OPTION_ALL:
+                return true;
+            default:
+                throw new RuntimeException("Unknown field option provided for class " + mElement.asType());
         }
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index fb6799f8..7a930d47 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
@@ -92,6 +92,7 @@ public AnnotatedClass getSupportedType(@NotNull TypeMirror type) {
         if (model == null) {
             model = new AnnotatedClass(TypeUtils.getUtils().asElement(type));
             addSupportedType(model);
+            model.initNestedClasses();
         }
         return model;
     }
diff --git a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
index d39ebfe2..2d6369c0 100644
--- a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
+++ b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
@@ -29,8 +29,12 @@
 /**
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
+ *
+ * We will be removing this with v2.1. Please use Class level annotation UserStag
+ * or SerializedName as required
  */
 @Target({ElementType.FIELD})
+@Deprecated
 public @interface GsonAdapterKey {
 
     /**
diff --git a/stag-library/src/main/java/com/vimeo/stag/UseStag.java b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
index 3ba13443..f4ab35c6 100644
--- a/stag-library/src/main/java/com/vimeo/stag/UseStag.java
+++ b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
@@ -35,4 +35,28 @@
  */
 @Target({ElementType.TYPE})
 public @interface UseStag {
+    /**
+     * Will serialize/de-serialize all member variables which are not static
+     * or transient
+     */
+    int FIELD_OPTION_ALL = 0;
+
+    /**
+     * Will skip serialization and deserialization for all member variables
+     */
+    int FIELD_OPTION_NONE = 1;
+
+
+    /**
+     * Will Serialize or Deserialize Fields only which are annotated with
+     * SerializedName or GsonAdapterKey(deprecated)
+     */
+    int FIELD_OPTION_SERIALIZED_NAME = 3;
+
+    /**
+     * field option chosen
+     *
+     * @return the .
+     */
+    int value() default FIELD_OPTION_ALL;
 }
\ No newline at end of file

From 536eee132e9e9fcf9377a964f33924b720ff6286 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 00:49:11 +0530
Subject: [PATCH 127/159] Removing the deprecated GsonAdapterKey from the
 example

---
 .../src/main/java/com/vimeo/sample/model/Parameter.java   | 8 ++++++++
 sample/src/main/java/com/vimeo/sample/model1/Video.java   | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/Parameter.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/Parameter.java b/sample/src/main/java/com/vimeo/sample/model/Parameter.java
new file mode 100644
index 00000000..92372bc2
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/Parameter.java
@@ -0,0 +1,8 @@
+package com.vimeo.sample.model;
+
+/**
+ * Created by mohammad.yasir on 12/01/17.
+ */
+
+public class Parameter {
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Video.java b/sample/src/main/java/com/vimeo/sample/model1/Video.java
index 4debb273..86dab451 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Video.java
@@ -1,5 +1,6 @@
 package com.vimeo.sample.model1;
 
+import com.google.gson.annotations.SerializedName;
 import com.vimeo.sample.model.User;
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
@@ -14,12 +15,12 @@
 @UseStag
 public class Video {
 
-    @GsonAdapterKey("user")
+    @SerializedName("user")
     public User mUser;
 
-    @GsonAdapterKey("link")
+    @SerializedName("link")
     public String mLink;
 
-    @GsonAdapterKey("mData")
+    @SerializedName("mData")
     public Data mData;
 }
\ No newline at end of file

From 99969f37ee3ceec71a696df930b28d91e32a7487 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 01:30:05 +0530
Subject: [PATCH 128/159] Removing unused file

---
 .../src/main/java/com/vimeo/sample/model/Parameter.java   | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 sample/src/main/java/com/vimeo/sample/model/Parameter.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/Parameter.java b/sample/src/main/java/com/vimeo/sample/model/Parameter.java
deleted file mode 100644
index 92372bc2..00000000
--- a/sample/src/main/java/com/vimeo/sample/model/Parameter.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vimeo.sample.model;
-
-/**
- * Created by mohammad.yasir on 12/01/17.
- */
-
-public class Parameter {
-}

From 01a534846e310f56a8a4f5124d7a80c5915572d9 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 01:40:26 +0530
Subject: [PATCH 129/159] Handling the case where a variable with the same name
 is overriden in the sub class and the type changes

---
 .../sample/model/ClassWithArrayTypes.java     | 17 ++++++++++++
 .../model/SubClassWithSameVariableName.java   | 11 ++++++++
 .../generators/model/AnnotatedClass.java      | 26 +++++++++++++++----
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/ClassWithArrayTypes.java
 create mode 100644 sample/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java

diff --git a/sample/src/main/java/com/vimeo/sample/model/ClassWithArrayTypes.java b/sample/src/main/java/com/vimeo/sample/model/ClassWithArrayTypes.java
new file mode 100644
index 00000000..4432802d
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/ClassWithArrayTypes.java
@@ -0,0 +1,17 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.UseStag;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@UseStag
+public class ClassWithArrayTypes {
+
+    public List<String> stringList;
+
+    public Collection<Integer> integerCollection;
+
+    public ArrayList<Long> longArrayList;
+}
diff --git a/sample/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java b/sample/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java
new file mode 100644
index 00000000..c16ff47e
--- /dev/null
+++ b/sample/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java
@@ -0,0 +1,11 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.UseStag;
+
+import java.util.ArrayList;
+
+@UseStag
+public class SubClassWithSameVariableName extends ClassWithArrayTypes {
+
+    public ArrayList<String> stringList;
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 998832aa..11cff516 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -34,6 +34,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -62,6 +63,7 @@ public class AnnotatedClass {
     AnnotatedClass(@NotNull Element element) {
         mType = element.asType();
         mElement = element;
+        Set<String> variableNames = new HashSet<>(element.getEnclosedElements().size());
         TypeMirror inheritedType = TypeUtils.getInheritedType(element);
 
         UseStag useStag = element.getAnnotation(UseStag.class);
@@ -69,17 +71,30 @@ public class AnnotatedClass {
 
         mMemberVariables = new HashMap<>();
         for (Element enclosedElement : element.getEnclosedElements()) {
-            addToSupportedTypes(enclosedElement, fieldOptions);
+            addToSupportedTypes(enclosedElement, fieldOptions, variableNames);
         }
 
         if (inheritedType != null) {
-            DebugLog.log(TAG, "\t\tInherited Type - " + inheritedType.toString());
+            if (StagProcessor.DEBUG) {
+                DebugLog.log(TAG, "\t\tInherited Type - " + inheritedType.toString());
+            }
+
 
             AnnotatedClass genericInheritedType =
                     SupportedTypesModel.getInstance().getSupportedType(inheritedType);
 
-            mMemberVariables.putAll(TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
-                    genericInheritedType.getMemberVariables()));
+            Map<Element, TypeMirror> inheritedMemberVariables = TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
+                    genericInheritedType.getMemberVariables());
+
+            for(Map.Entry<Element, TypeMirror> entry : inheritedMemberVariables.entrySet()) {
+                if(!variableNames.contains(entry.getKey().getSimpleName().toString())) {
+                    mMemberVariables.put(entry.getKey(), entry.getValue());
+                } else {
+                    if (StagProcessor.DEBUG) {
+                        DebugLog.log(TAG, "\t\tIgnoring inherited Member variables - " + entry.getKey().asType().toString());
+                    }
+                }
+            }
         }
 
     }
@@ -109,8 +124,9 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         }
     }
 
-    private void addToSupportedTypes(@NotNull Element element, int fieldOptions) {
+    private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @NotNull Set<String> variableNames) {
         if (element instanceof VariableElement) {
+            variableNames.add(element.getSimpleName().toString());
             if(shouldIncludeField(element, fieldOptions)) {
                 final VariableElement variableElement = (VariableElement) element;
                 Set<Modifier> modifiers = variableElement.getModifiers();

From 23dfc81e2ac2f2b13faca6bede69d2508232d42a Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 01:43:56 +0530
Subject: [PATCH 130/159] Better debug logs

---
 .../vimeo/stag/processor/generators/model/AnnotatedClass.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 11cff516..948b7443 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -91,7 +91,7 @@ public class AnnotatedClass {
                     mMemberVariables.put(entry.getKey(), entry.getValue());
                 } else {
                     if (StagProcessor.DEBUG) {
-                        DebugLog.log(TAG, "\t\tIgnoring inherited Member variables - " + entry.getKey().asType().toString());
+                        DebugLog.log(TAG, "\t\tIgnoring inherited Member variable with the same variable name - " + entry.getKey().asType().toString());
                     }
                 }
             }

From bdff3ecc0fcc9db0500a7d2ecf6b2a730d848a00 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 12 Jan 2017 11:46:34 +0530
Subject: [PATCH 131/159] #36 : created separate method to get alternate JSON
 names, can be nullable

---
 .../stag/processor/generators/AdapterGenerator.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index 099170d1..c9a7abbe 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -29,6 +29,7 @@
 import com.vimeo.stag.GsonAdapterKey;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.lang.model.element.Element;
 
@@ -56,6 +57,14 @@ static String getJsonName(@NotNull Element element) {
         return name;
     }
 
+    /**
+     * Returns the alternate name for the {@link Element}
+     */
+    @Nullable
+    static String[] getAlternateJsonNames(@NotNull Element element) {
+        return (null != element.getAnnotation(SerializedName.class)) ? element.getAnnotation(SerializedName.class).alternate() : null;
+    }
+
     @NotNull
     public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator);
 }
\ No newline at end of file

From a7dad40bd4c6d9e620436e67781df20c682e52c0 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 12 Jan 2017 11:47:00 +0530
Subject: [PATCH 132/159] #36 : handle the scenario where there are alternate
 names for a given element

---
 .../generators/EnumTypeAdapterGenerator.java         |  7 +++++++
 .../processor/generators/TypeAdapterGenerator.java   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
index 9d1b7058..707b8adc 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
@@ -125,6 +125,13 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                 String name = getJsonName(enclosingElement);
                 nameToConstant.put(name, enclosingElement);
                 constantToName.put(enclosingElement, name);
+
+                String[] alternateJsonNames = getAlternateJsonNames(enclosingElement);
+                if (alternateJsonNames != null && alternateJsonNames.length > 0) {
+                    for (String alternate : alternateJsonNames) {
+                        nameToConstant.put(alternate, enclosingElement);
+                    }
+                }
             }
         }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 8173ec65..710b0c51 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -225,8 +225,16 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull
             final String variableName = element.getKey().getSimpleName().toString();
             final TypeMirror elementValue = element.getValue();
 
-            builder.addCode("\t\t\tcase \"" + name + "\":\n" +
-                    "\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapterAccessor(elementValue) + ".read(reader);");
+            builder.addCode("\t\t\tcase \"" + name + "\":\n");
+
+            String[] alternateJsonNames = getAlternateJsonNames(element.getKey());
+            if (alternateJsonNames != null && alternateJsonNames.length > 0) {
+                for (String alternateJsonName : alternateJsonNames) {
+                    builder.addCode("\t\t\tcase \"" + alternateJsonName + "\":\n");
+                }
+            }
+
+            builder.addCode("\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapterAccessor(elementValue) + ".read(reader);");
 
             builder.addCode("\n\t\t\t\tbreak;\n");
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {

From f3911fa52d23fb898bbe518c8f388f6e72ddfd47 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Thu, 12 Jan 2017 11:47:29 +0530
Subject: [PATCH 133/159] sample model that uses the alternate name feature of
 @SerializedName annotation

---
 .../com/vimeo/sample_model/AlternateNameModel.java | 14 ++++++++++++++
 .../vimeo/sample_model/AlternateNameModel1.java    | 13 +++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel.java
 create mode 100644 sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel1.java

diff --git a/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel.java b/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel.java
new file mode 100644
index 00000000..bbcaca79
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample_model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public class AlternateNameModel {
+
+    @SerializedName(value = "Nougat", alternate = {"Kitkat", "Lollipop"})
+    String mAndroidVersions;
+
+    @SerializedName(value = "7.0", alternate = {"4.0", "5.0"})
+    String mAndroidNameVersions;
+}
\ No newline at end of file
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel1.java b/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel1.java
new file mode 100644
index 00000000..e53c9ff6
--- /dev/null
+++ b/sample-model/src/main/java/com/vimeo/sample_model/AlternateNameModel1.java
@@ -0,0 +1,13 @@
+package com.vimeo.sample_model;
+
+import com.google.gson.annotations.SerializedName;
+import com.vimeo.stag.UseStag;
+
+@UseStag
+public enum AlternateNameModel1 {
+    @SerializedName(value = "7.0", alternate = {"4.0", "5.0"})
+    ANDROID_VERSION,
+
+    @SerializedName(value = "Nougat", alternate = {"Kitkat", "Lollipop"})
+    ANDROID_VERSION_NAME
+}
\ No newline at end of file

From 4fc9d0f25035e62f660d39cd9b00b271436405e7 Mon Sep 17 00:00:00 2001
From: Mohammad Yasir <mohammad.yasir@flipkart.com>
Date: Thu, 12 Jan 2017 14:07:18 +0530
Subject: [PATCH 134/159] Making the sequence of deserialization of variable
 names more consistent. Earlier when you used to generate adapters it would
 serialize the member variables in a very random order (Try opening a simple
 generated adapter file and keep doing a rebuild). While JSON is unordered, it
 is still to do the serialization in a consisten fashion. With this
 implementation now it will serialize the base class members first and then
 the given class. Also for the given class it will serialize them in the order
 in which they are present in the class file.

---
 .../generators/model/AnnotatedClass.java      | 47 +++++++++++--------
 .../vimeo/stag/processor/utils/TypeUtils.java |  8 ++--
 .../stag/processor/TypeUtilsUnitTest.java     |  2 +-
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 948b7443..d08dac62 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -24,6 +24,7 @@
 package com.vimeo.stag.processor.generators.model;
 
 import com.google.gson.annotations.SerializedName;
+import com.sun.org.apache.bcel.internal.generic.Type;
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.StagProcessor;
@@ -35,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,23 +58,21 @@ public class AnnotatedClass {
     private final Element mElement;
 
     @NotNull
-    private final Map<Element, TypeMirror> mMemberVariables;
+    private final LinkedHashMap<Element, TypeMirror> mMemberVariables;
 
     private List<Element> mNestedElements;
 
     AnnotatedClass(@NotNull Element element) {
         mType = element.asType();
         mElement = element;
-        Set<String> variableNames = new HashSet<>(element.getEnclosedElements().size());
+        Map<String, Element> variableNames = new HashMap<>(element.getEnclosedElements().size());
         TypeMirror inheritedType = TypeUtils.getInheritedType(element);
 
         UseStag useStag = element.getAnnotation(UseStag.class);
         int fieldOptions = useStag == null ? UseStag.FIELD_OPTION_ALL : useStag.value();
 
-        mMemberVariables = new HashMap<>();
-        for (Element enclosedElement : element.getEnclosedElements()) {
-            addToSupportedTypes(enclosedElement, fieldOptions, variableNames);
-        }
+        mMemberVariables = new LinkedHashMap<>();
+
 
         if (inheritedType != null) {
             if (StagProcessor.DEBUG) {
@@ -83,20 +83,29 @@ public class AnnotatedClass {
             AnnotatedClass genericInheritedType =
                     SupportedTypesModel.getInstance().getSupportedType(inheritedType);
 
-            Map<Element, TypeMirror> inheritedMemberVariables = TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
+            LinkedHashMap<Element, TypeMirror> inheritedMemberVariables = TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
                     genericInheritedType.getMemberVariables());
 
             for(Map.Entry<Element, TypeMirror> entry : inheritedMemberVariables.entrySet()) {
-                if(!variableNames.contains(entry.getKey().getSimpleName().toString())) {
-                    mMemberVariables.put(entry.getKey(), entry.getValue());
-                } else {
-                    if (StagProcessor.DEBUG) {
-                        DebugLog.log(TAG, "\t\tIgnoring inherited Member variable with the same variable name - " + entry.getKey().asType().toString());
-                    }
-                }
+                addMemberVariable(entry.getKey(), entry.getValue(), variableNames);
             }
         }
 
+        for (Element enclosedElement : element.getEnclosedElements()) {
+            addToSupportedTypes(enclosedElement, fieldOptions, variableNames);
+        }
+
+    }
+
+    private void addMemberVariable(@NotNull Element element, @NotNull TypeMirror typeMirror, @NotNull Map<String, Element> variableNames) {
+        Element previousElement = variableNames.put(element.getSimpleName().toString(), element);
+        if(null != previousElement) {
+            mMemberVariables.remove(previousElement);
+            if (StagProcessor.DEBUG) {
+                DebugLog.log(TAG, "\t\tIgnoring inherited Member variable with the same variable name - " + previousElement.asType().toString());
+            }
+        }
+        mMemberVariables.put(element, typeMirror);
     }
 
     //This is to avoid the infinite recursive loop where an inner class can be deriving for this class itself
@@ -124,9 +133,8 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         }
     }
 
-    private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @NotNull Set<String> variableNames) {
+    private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @NotNull Map<String, Element> variableNames) {
         if (element instanceof VariableElement) {
-            variableNames.add(element.getSimpleName().toString());
             if(shouldIncludeField(element, fieldOptions)) {
                 final VariableElement variableElement = (VariableElement) element;
                 Set<Modifier> modifiers = variableElement.getModifiers();
@@ -138,7 +146,8 @@ private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @No
                     if (StagProcessor.DEBUG) {
                         DebugLog.log(TAG, "\t\tMember variables - " + variableElement.asType().toString());
                     }
-                    mMemberVariables.put(variableElement, variableElement.asType());
+
+                    addMemberVariable(variableElement, variableElement.asType(), variableNames);
                 }
             }
         } else if (element instanceof TypeElement) {
@@ -185,7 +194,7 @@ public Element getElement() {
      * types.
      */
     @NotNull
-    public Map<Element, TypeMirror> getMemberVariables() {
-        return new HashMap<>(mMemberVariables);
+    public LinkedHashMap<Element, TypeMirror> getMemberVariables() {
+        return new LinkedHashMap<>(mMemberVariables);
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index dfa0a355..9315c782 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -286,11 +286,11 @@ public static TypeMirror getInheritedType(@Nullable Element element) {
      * @param members           the member variable map of the field (Element) to their concrete
      *                          type (TypeMirror). This should be retrieved by calling getConcreteMembers
      *                          on the inherited class.
-     * @return returns a map of the member variables mapped to their concrete types for the concrete
-     * inherited class.
+     * @return returns a linked has map of the member variables mapped to their concrete types for the concrete
+     * inherited class. (to maintain the ordering)
      */
     @NotNull
-    public static Map<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror concreteInherited,
+    public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror concreteInherited,
                                                               @NotNull Element genericInherited,
                                                               @NotNull Map<Element, TypeMirror> members) {
 
@@ -299,7 +299,7 @@ public static Map<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror co
         List<? extends TypeMirror> concreteTypes = getParameterizedTypes(concreteInherited);
         List<? extends TypeMirror> inheritedTypes = getParameterizedTypes(genericInherited);
 
-        Map<Element, TypeMirror> map = new HashMap<>();
+        LinkedHashMap<Element, TypeMirror> map = new LinkedHashMap<>();
 
         for (Entry<Element, TypeMirror> member : members.entrySet()) {
 
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
index e12c5078..348a0b27 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.java
@@ -139,7 +139,7 @@ public void getConcreteMembers_isCorrect() throws Exception {
 
         assertNotNull(genericType);
 
-        Map<Element, TypeMirror> members =
+        LinkedHashMap<Element, TypeMirror> members =
                 TypeUtils.getConcreteMembers(concreteType, types.asElement(genericType), genericMembers);
 
 

From 3db3df068ad9929914878b47dd08e915cf4f84a4 Mon Sep 17 00:00:00 2001
From: Anirudh Ramanan <anirudh.r@flipkart.com>
Date: Thu, 12 Jan 2017 14:47:10 +0530
Subject: [PATCH 135/159] updated readme, listed out major features

---
 README.md | 77 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 6a8e060b..7b67b56d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Stag improves Gson performance by automatically generating reflection-less TypeA
 | dev    | [![Build Status](https://circleci.com/gh/vimeo/stag-java/tree/dev.svg?style=shield&circle-token=4d5dd11678a93587658d1677d0ef2b8c64b56574)](https://circleci.com/gh/vimeo/stag-java/tree/dev) |
 
 
-## Why Build Stag?
+## Why Build Stag ?
 
 Gson is the essential JSON parsing library. It greatly simplifies what can be the verbose and boilerplate-ridden process of parsing JSON into model objects. It does this by leveraging reflection. Unfortunately, using reflection can be slow (particularly on the Android OS).
 
@@ -70,7 +70,7 @@ buildscript {
 apply plugin: 'com.neenbedankt.android-apt'
 ```
 
-#### 3. Passing package name as an argument for the generated files (Optional)
+#### 3. Pass package name as an argument for the generated files (Optional)
 By default, the files will be in generated in `com.vimeo.sample.stag.generated` package. But, you can specify your own package for the generated files by passing it as an argument to the apt compiler.
 ```groovy
 apt {
@@ -80,61 +80,80 @@ apt {
 }
 ```
 
-## Stag Rules
+## Features
 
-1. Make sure the member variables of your model class are not private (i.e. public, protected, or package-local visibility)
-2. Make sure your model class is not private and has a zero argument non-private constructor
-3. Annotate each member variable you want populated
-    - `@GsonAdapterKey("json_key")`: populates the field using the JSON value with the specified key
-    - `@GsonAdapterKey`: populates the field using the JSON value with the key named the same as the member variable
-    - Use your favorite `@NonNull` annotation to tell Stag to throw an exception if the field is null while deserializing or while serializing the object.
-4. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
-5. You're done!
+#### 1. Class Level Annotation
+
+Stag supports class level annotation `@UseStag` which processes all the fields for a particular class, which makes it easy to use and integrate.
+
+`@UseStag` has three different variants -
+
+    * @UseStag(UseStag.FIELD_OPTION_ALL) : Will serialize/de-serialize all member variables which are not static or transient
+
+    * @UseStag(UseStag.FIELD_OPTION_NONE) : Will skip serialization and deserialization for all member variables
+
+    * @UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME) : Will Serialize or Deserialize Fields only which are annotated with SerializedName or GsonAdapterKey(deprecated)
+
+#### 2. @SerializedName("") Support
 
-## Supported Types
+Similar to GSON, you can use @SerializedName annotation to provide a different JSON name to a member field. It also supports alternate name feature of the @SerializedName
 
-- YES: All native types supported by Gson (boolean, double, int, long, float)
-- YES: String types
-- YES: ArrayList or any other List interfaces are supported
-- YES: HashMaps or any other Map interfaces are supported
-- YES: Complex data structures supported
-- YES: Enumerations (enums)
+    @SerializedName("name') or @SerializedName(value = "name", alternate = {"name1", "name2"})
+
+#### 3. Cross Module Support
+
+Stag has the ability to cross reference TypeAdapters accross modules.
+
+#### 4. In parity with GSON
+
+Last but not the least, Stag is almost in parity with GSON.
+
+## Stag Rules
+
+1. Make sure the member variables of your model class are not private (should be public, protected, or package-local visibility)
+2. Make sure your model class is not private and has a zero argument non-private constructor
+3. Annotate the classes with `@UseStag` annotation. This will process all the member variables of the class, which makes it easy to use.
+4. Use the @SerializedName("") annotation to give the variables a different JSON name. (similiar to GSON)
+5. Use your favorite `@NonNull` annotation to tell Stag to throw an exception if the field is null while deserializing or while serializing the object.
+6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
+7. You're done!
 
-Note : 
-- `@SerializedName("json_key")` annotations you might be using will be ignored.
+<b>NOTE</b> : @GsonAdapterKey has been deprecated and will be removed in future releases. It is advisable to migrate to @SerializedName and @UseStag annotations.   
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 
 ## Example
 
 ```java
+@UseStag
 public class Deer {
-    @GsonAdapterKey("name")
+    @SerializedName("name")
     String mName;    // mName = json value with key "name"
     
-    @GsonAdapterKey("species")
+    @SerializedName("species")
     String mSpecies; // mSpecies = json value with key "species"
     
-    @GsonAdapterKey("age")
+    @SerializedName("age")
     int mAge;        // mAge = json value with key "age"
     
-    @GsonAdapterKey("points")
+    @SerializedName("points")
     int mPoints;     // mPoints = json value with key "points"
     
-    @GsonAdapterKey("weight")
+    @SerializedName("weight")
     float mWeight;     // mWeight = json value with key "weight"
 }
 
+@UseStag
 public class Herd {
 
     @NonNull                    // add NonNull annotation to throw an exception if the field is null
-    @GsonAdapterKey
+    @SerializedName("data_list")
     ArrayList<Deer> data_list;  // data_list = json value with key "data_list"
     
-    @GsonAdapterKey
+    @SerializedName("data_list_copy")
     List<Deer> data_list_copy;  // data_list_copy = json value with key "data_list_copy"
     
-    @GsonAdapterKey
+    @SerializedName("data_map")
     Map<String, Deer> data_map;  // data_map = json value with key "data_map"
 }
 
@@ -159,8 +178,6 @@ MyParsingClass {
 ## Future Enhancements
 
 - Add an option to absorb parsing errors rather than crashing and halting parsing (default gson behavior)
-- Class level annotation so that you don't have to annotate each field
-- Support using `@SerializedName` annotation
 
 ## License
 `stag-java` is available under the MIT license. See the [LICENSE](LICENSE) file for more information.

From f56757890ea466c4d1fac67bb67cb1fa3cca9ef4 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 13 Jan 2017 22:52:58 +0530
Subject: [PATCH 136/159] unused import

---
 .../vimeo/stag/processor/generators/model/AnnotatedClass.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index d08dac62..93e0f657 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -24,7 +24,6 @@
 package com.vimeo.stag.processor.generators.model;
 
 import com.google.gson.annotations.SerializedName;
-import com.sun.org.apache.bcel.internal.generic.Type;
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 import com.vimeo.stag.processor.StagProcessor;

From 8a155fb617bab7fe26943b0c2f836c7d932ba203 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 13 Jan 2017 22:53:58 +0530
Subject: [PATCH 137/159] spell check

---
 .../src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 9315c782..05422b09 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -286,7 +286,7 @@ public static TypeMirror getInheritedType(@Nullable Element element) {
      * @param members           the member variable map of the field (Element) to their concrete
      *                          type (TypeMirror). This should be retrieved by calling getConcreteMembers
      *                          on the inherited class.
-     * @return returns a linked has map of the member variables mapped to their concrete types for the concrete
+     * @return returns a LinkedHashMap of the member variables mapped to their concrete types for the concrete
      * inherited class. (to maintain the ordering)
      */
     @NotNull

From 500569c5696ced7fe6deca85959c36bc3e91e856 Mon Sep 17 00:00:00 2001
From: "anirudh.r" <anirudh.r@flipkart.com>
Date: Fri, 13 Jan 2017 23:17:39 +0530
Subject: [PATCH 138/159] changed the parsing type. using typeadapter directly

---
 .../java/com/vimeo/sample/network/NetworkRequest.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java b/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
index e3f9f18a..2bbe7188 100644
--- a/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
+++ b/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
@@ -34,10 +34,14 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.JsonTreeReader;
+import com.google.gson.stream.JsonReader;
 import com.vimeo.sample.model.DateParser;
 import com.vimeo.sample.model.Video;
 import com.vimeo.sample.model.VideoList;
 import com.vimeo.sample.stag.generated.Stag;
+import com.vimeo.stag.KnownTypeAdapters;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -116,16 +120,17 @@ protected List<Video> doInBackground(Void... params) {
                     builder.append(line);
                 }
 
+                Stag.Factory factory = new Stag.Factory();
                 Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new DateParser())
-                        .registerTypeAdapterFactory(new Stag.Factory())
+                        .registerTypeAdapterFactory(factory)
                         .create();
 
                 JsonObject jsonObject = new JsonParser().parse(builder.toString()).getAsJsonObject();
 
+                TypeAdapter<VideoList> videoListTypeAdapter = factory.getVideoList$TypeAdapter(gson);
                 long time = System.currentTimeMillis();
 
-                videos.addAll(gson.fromJson(jsonObject, VideoList.class).data);
-
+                videos.addAll(videoListTypeAdapter.fromJsonTree(jsonObject).data);
                 Log.d(TAG, "Time elapsed while parsing: " + (System.currentTimeMillis() - time) + " ms");
 
             } catch (IOException e) {

From faf6b222071aefd9073c84b9260d38c082baff70 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:12:35 -0500
Subject: [PATCH 139/159] Cleaning up typos in the code

---
 README.md                                     | 27 +++++++++----------
 .../sample_model/ExternalModelGeneric1.java   |  2 +-
 .../sample/model/ExternalModelExample2.java   |  4 +--
 .../com/vimeo/sample/model/GenericClass.java  |  4 +--
 .../sample/model/TestExternalExample.java     |  3 +++
 stag-library-compiler/build.gradle            |  4 +--
 .../generators/TypeAdapterGenerator.java      | 20 +++++++-------
 .../utils/KnownTypeAdapterUtils.java          | 18 ++++++-------
 .../vimeo/stag/processor/utils/TypeUtils.java |  2 +-
 stag-library/build.gradle                     |  4 +--
 .../com/vimeo/stag/KnownTypeAdapters.java     | 14 +++++-----
 11 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 7b67b56d..1bb5c29c 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Stag improves Gson performance by automatically generating reflection-less TypeA
 | dev    | [![Build Status](https://circleci.com/gh/vimeo/stag-java/tree/dev.svg?style=shield&circle-token=4d5dd11678a93587658d1677d0ef2b8c64b56574)](https://circleci.com/gh/vimeo/stag-java/tree/dev) |
 
 
-## Why Build Stag ?
+## Why Build Stag?
 
 Gson is the essential JSON parsing library. It greatly simplifies what can be the verbose and boilerplate-ridden process of parsing JSON into model objects. It does this by leveraging reflection. Unfortunately, using reflection can be slow (particularly on the Android OS).
 
@@ -86,25 +86,22 @@ apt {
 
 Stag supports class level annotation `@UseStag` which processes all the fields for a particular class, which makes it easy to use and integrate.
 
-`@UseStag` has three different variants -
+`@UseStag` has three different variants:
 
-    * @UseStag(UseStag.FIELD_OPTION_ALL) : Will serialize/de-serialize all member variables which are not static or transient
+ - `@UseStag(UseStag.FIELD_OPTION_ALL)` : Will serialize/de-serialize all member variables which are not static or transient
+ - `@UseStag(UseStag.FIELD_OPTION_NONE)` : Will skip serialization and deserialization for all member variables
+ - `@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)` : Will Serialize or Deserialize Fields only which are annotated with SerializedName or GsonAdapterKey(deprecated)
 
-    * @UseStag(UseStag.FIELD_OPTION_NONE) : Will skip serialization and deserialization for all member variables
+#### 2. `@SerializedName("key")` Support
 
-    * @UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME) : Will Serialize or Deserialize Fields only which are annotated with SerializedName or GsonAdapterKey(deprecated)
-
-#### 2. @SerializedName("") Support
-
-Similar to GSON, you can use @SerializedName annotation to provide a different JSON name to a member field. It also supports alternate name feature of the @SerializedName
-
-    @SerializedName("name') or @SerializedName(value = "name", alternate = {"name1", "name2"})
+Similar to GSON, you can use the`@SerializedName` annotation to provide a different JSON name to a member field. It also supports alternate name feature of the `@SerializedName` annotation.
+ `@SerializedName("name')` or `@SerializedName(value = "name", alternate = {"name1", "name2"})`.
 
 #### 3. Cross Module Support
 
-Stag has the ability to cross reference TypeAdapters accross modules.
+Stag has the ability to reference TypeAdapters across modules.
 
-#### 4. In parity with GSON
+#### 4. Parity with GSON
 
 Last but not the least, Stag is almost in parity with GSON.
 
@@ -113,12 +110,12 @@ Last but not the least, Stag is almost in parity with GSON.
 1. Make sure the member variables of your model class are not private (should be public, protected, or package-local visibility)
 2. Make sure your model class is not private and has a zero argument non-private constructor
 3. Annotate the classes with `@UseStag` annotation. This will process all the member variables of the class, which makes it easy to use.
-4. Use the @SerializedName("") annotation to give the variables a different JSON name. (similiar to GSON)
+4. Use the `@SerializedName("key")` annotation to give the variables a different JSON name. (same as GSON)
 5. Use your favorite `@NonNull` annotation to tell Stag to throw an exception if the field is null while deserializing or while serializing the object.
 6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
 7. You're done!
 
-<b>NOTE</b> : @GsonAdapterKey has been deprecated and will be removed in future releases. It is advisable to migrate to @SerializedName and @UseStag annotations.   
+<b>NOTE</b> : ``@GsonAdapterKey` has been deprecated and will be removed in future releases. It is advisable to migrate to ``@SerializedName` and ``@UseStag` annotations.
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 
diff --git a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
index 1839cafa..2e3ef8df 100644
--- a/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
+++ b/sample-model/src/main/java/com/vimeo/sample_model/ExternalModelGeneric1.java
@@ -14,6 +14,6 @@ public class ExternalModelGeneric1<T> {
     @SerializedName("genericField")
     public T mGenericField;
 
-    @SerializedName("unkownType")
+    @SerializedName("unknownType")
     public ValueCallback<T> mUnknownType;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
index 2ccd2c9e..2c970461 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ExternalModelExample2.java
@@ -25,6 +25,6 @@ public class ExternalModelExample2<T> {
     public GenericClass<T> mParametrizedInternalGenericExample;
 
 
-    @SerializedName("parametrizedUnkownExternalGenericExample")
-    public ExternalModelExample2<T> mParametrizedUnkownExternalGenericExample;
+    @SerializedName("parametrizedUnknownExternalGenericExample")
+    public ExternalModelExample2<T> mParametrizedUnknownExternalGenericExample;
 }
diff --git a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
index e7a52fb0..c3e94c10 100644
--- a/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/GenericClass.java
@@ -30,9 +30,9 @@
 import java.util.Map;
 
 /**
- * Created by anirudh.r on 30/11/16.
- * <p>
  * A Generic class which has known types.
+ * <p>
+ * Created by anirudh.r on 30/11/16.
  */
 @UseStag
 public class GenericClass<T> {
diff --git a/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java b/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java
index f36612f3..fd94d398 100644
--- a/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/TestExternalExample.java
@@ -4,6 +4,9 @@
 import com.vimeo.stag.UseStag;
 
 /**
+ * Testing adapter creation for a model class
+ * that relies on an externally defined class.
+ * <p>
  * Created by mohammad.yasir on 28/12/16.
  */
 
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 6e136a93..c6980785 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -42,8 +42,8 @@ artifacts {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            // We dont have any complex artifacts, so let's just reference the fact that we
-            // rely on plugin java
+            // We don't have any complex artifacts, so let's just
+            // reference the fact that we rely on plugin java
             from components.java
             groupId project.group
             artifactId 'stag-library-compiler'
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 710b0c51..4dbbe4c1 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -139,14 +139,14 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
                     String keyAdapterAccessor = getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
                     String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiater(fieldType) + ")";
+                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiator(fieldType) + ")";
                 } else if (TypeUtils.isSupportedCollection(fieldType)) {
                     /**
                      * If the fieldType is of {@link java.util.Collection} type, generate the ListTypeAdapter with its valueTypeAdapter
                      */
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
                     String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiater(fieldType) + ")";
+                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiator(fieldType) + ")";
                 } else {
                     /**
                      * If the fieldType is of Known parameterized type, recursively call the function to generate the typeadapter code.
@@ -320,9 +320,9 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     ArrayType arrayType = (ArrayType) fieldType;
                     String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
                             typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String nativeArrayInstantiater = KnownTypeAdapterUtils.getNativeArrayInstantiater(arrayInnerType);
+                    String nativeArrayInstantiator = KnownTypeAdapterUtils.getNativeArrayInstantiator(arrayInnerType);
                     String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
-                            "(" + adapterAccessor + ", " + nativeArrayInstantiater + ")";
+                            "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
                     if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                         String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
@@ -343,9 +343,9 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                         typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
 
 
-                String listInstantiater = KnownTypeAdapterUtils.getListInstantiater(fieldType);
+                String listInstantiator = KnownTypeAdapterUtils.getListInstantiator(fieldType);
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
-                        "(" + paramAdapterAccessor + ", " + listInstantiater + ")";
+                        "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                     String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
@@ -359,7 +359,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                   */
                 sGsonVariableUsed = true;
                 sStagFactoryUsed = true;
-                String mapInstantiater = KnownTypeAdapterUtils.getMapInstantiater(fieldType);
+                String mapInstantiator = KnownTypeAdapterUtils.getMapInstantiator(fieldType);
                 List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                 String keyAdapterAccessor;
                 String valueAdapterAccessor;
@@ -379,7 +379,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 }
 
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter" + arguments +
-                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiater + ")";
+                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiator + ")";
                 if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
                     String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
@@ -517,10 +517,10 @@ private static AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.Generic
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
-        boolean hasUnkownGenericField = genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
+        boolean hasUnknownGenericField = genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor;
-            if (hasUnkownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
+            if (hasUnknownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
                 adapterAccessor = getAdapterForUnknownType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
             } else {
                 adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index eb68069c..56465111 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -95,13 +95,13 @@ public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror)
     }
 
     /**
-     * Get the instantiater for {@link List} types
+     * Get the instantiator for {@link List} types
      *
      * @param typeMirror TypeMirror typeMirror
-     * @return instantiater
+     * @return instantiator
      */
     @NotNull
-    public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
+    public static String getListInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
         TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null && !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments().get(0) : null;
@@ -110,13 +110,13 @@ public static String getListInstantiater(@NotNull TypeMirror typeMirror) {
     }
 
     /**
-     * Get the instantiater for {@link Map} types
+     * Get the instantiator for {@link Map} types
      *
      * @param typeMirror TypeMirror typeMirror
-     * @return instantiater
+     * @return instantiator
      */
     @NotNull
-    public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
+    public static String getMapInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
         TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(0) : null;
@@ -144,13 +144,13 @@ public static String getMapInstantiater(@NotNull TypeMirror typeMirror) {
     }
 
     /**
-     * Get the instantiater for native array types
+     * Get the instantiator for native array types
      *
      * @param typeMirror TypeMirror typeMirror
-     * @return instantiater
+     * @return instantiator
      */
     @Nullable
-    public static String getNativeArrayInstantiater(@NotNull TypeMirror typeMirror) {
+    public static String getNativeArrayInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType + "[size]; } }";
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 05422b09..fb8c5435 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -209,7 +209,7 @@ public static boolean isConcreteType(@NotNull TypeMirror typeMirror) {
     }
 
     /**
-     * Determines where the the type mirros contains type var params or not
+     * Determines where the the type mirrors contains type var params or not
      *
      * @param typeMirror the element to check.
      * @return true if it contains typevar
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 9ab45e77..3fa885db 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -31,8 +31,8 @@ artifacts {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            // We dont have any complex artifacts, so let's just reference the fact that we
-            // rely on plugin java
+            // We don't have any complex artifacts, so let's just
+            // reference the fact that we rely on the java plugin
             from components.java
             groupId project.group
             artifactId 'stag-library'
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index f6b12bb3..bd6094d0 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -496,7 +496,7 @@ public static char[] read(@NotNull JsonReader reader) throws IOException {
     }
 
     /**
-     * Default Instantiater for List, by default it will create the Map of {@link ArrayList} type
+     * Default Instantiator for List, by default it will create the Map of {@link ArrayList} type
      */
     public static final class ListInstantiator<V> implements ObjectConstructor<List<V>> {
         @Override
@@ -506,7 +506,7 @@ public List<V> construct() {
     }
 
     /**
-     * Instantiater for {@link Collection}
+     * Instantiator for {@link Collection}
      */
     public static final class CollectionInstantiator<V> implements ObjectConstructor<Collection<V>> {
         @Override
@@ -516,7 +516,7 @@ public Collection<V> construct() {
     }
 
     /**
-     * Instantiater for {@link ArrayList}
+     * Instantiator for {@link ArrayList}
      */
     public static final class ArrayListInstantiator<V> implements ObjectConstructor<ArrayList<V>> {
         @Override
@@ -526,7 +526,7 @@ public ArrayList<V> construct() {
     }
 
     /**
-     * Instantiater for {@link HashMap}
+     * Instantiator for {@link HashMap}
      */
     public static final class HashMapInstantiator<K, V> implements ObjectConstructor<HashMap<K, V>> {
         @Override
@@ -536,7 +536,7 @@ public HashMap<K, V> construct() {
     }
 
     /**
-     * Instantiater for {@link ConcurrentHashMap}
+     * Instantiator for {@link ConcurrentHashMap}
      */
     public static final class ConcurrentHashMapInstantiator<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
         @Override
@@ -546,7 +546,7 @@ public ConcurrentHashMap<K, V> construct() {
     }
 
     /**
-     * Instantiater for {@link LinkedHashMap}
+     * Instantiator for {@link LinkedHashMap}
      */
     public static final class LinkedHashMapInstantiator<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
         @Override
@@ -556,7 +556,7 @@ public LinkedHashMap<K, V> construct() {
     }
 
     /**
-     * Default Instantiater for Maps, by default it will create the Map of {@link LinkedHashMap} type
+     * Default Instantiator for Maps, by default it will create the Map of {@link LinkedHashMap} type
      */
     public static final class MapInstantiator<K, V> implements ObjectConstructor<Map<K, V>> {
         @Override

From 121d526ab5ebcc5898b28ec6a5a77f5969beabc4 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:17:39 -0500
Subject: [PATCH 140/159] Formatting

---
 .../vimeo/sample/model/ClassWithMapTypes.java |   1 +
 .../com/vimeo/sample/model/NestedClass.java   |   1 +
 .../vimeo/sample/model/RecursiveClass.java    |   1 +
 .../java/com/vimeo/sample/model/Video.java    |   4 +-
 .../vimeo/stag/processor/StagProcessor.java   |  23 +-
 .../generators/AdapterGenerator.java          |  15 +-
 .../generators/EnumTypeAdapterGenerator.java  |  21 +-
 .../generators/ExternalAdapterInfo.java       |  30 +-
 .../processor/generators/StagGenerator.java   |  88 ++++--
 .../generators/TypeAdapterGenerator.java      | 288 ++++++++++++------
 .../TypeTokenConstantsGenerator.java          |   5 +-
 .../generators/model/AnnotatedClass.java      |  49 +--
 .../generators/model/SupportedTypesModel.java |   3 +-
 .../utils/KnownTypeAdapterFactoriesUtils.java |   2 +-
 .../utils/KnownTypeAdapterUtils.java          |  35 ++-
 .../vimeo/stag/processor/utils/TypeUtils.java |  56 ++--
 .../java/com/vimeo/stag/GsonAdapterKey.java   |   2 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     |  80 +++--
 .../src/main/java/com/vimeo/stag/UseStag.java |   8 +-
 19 files changed, 454 insertions(+), 258 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
index 5662081a..3402f04b 100644
--- a/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
+++ b/sample/src/main/java/com/vimeo/sample/model/ClassWithMapTypes.java
@@ -37,6 +37,7 @@
  */
 @UseStag
 public class ClassWithMapTypes {
+
     public HashMap<String, Video> videoHashMap;
 
     public LinkedHashMap<String, Integer> stringIntegerMap;
diff --git a/sample/src/main/java/com/vimeo/sample/model/NestedClass.java b/sample/src/main/java/com/vimeo/sample/model/NestedClass.java
index 7abcbf2d..d8ad4e80 100644
--- a/sample/src/main/java/com/vimeo/sample/model/NestedClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/NestedClass.java
@@ -4,5 +4,6 @@
 
 @UseStag
 public class NestedClass {
+
     public static class Nested extends NestedClass {}
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
index 5d26fbd2..eea0d7c3 100644
--- a/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
+++ b/sample/src/main/java/com/vimeo/sample/model/RecursiveClass.java
@@ -37,6 +37,7 @@
  */
 @UseStag
 public class RecursiveClass {
+
     @SerializedName("checkSum")
     public String checkSum;
 
diff --git a/sample/src/main/java/com/vimeo/sample/model/Video.java b/sample/src/main/java/com/vimeo/sample/model/Video.java
index fc7447ab..d9779855 100644
--- a/sample/src/main/java/com/vimeo/sample/model/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model/Video.java
@@ -54,7 +54,7 @@ public class Video {
     @Override
     public String toString() {
         return "user: { " + (mUser != null ? mUser.toString() : null) + " }\nlink: " + mLink + "\nname: " +
-                mName + "\ncreated_time: " + mCreatedTime + "\nstats: { " +
-                (mStats != null ? mStats.toString() : null) + " }";
+               mName + "\ncreated_time: " + mCreatedTime + "\nstats: { " +
+               (mStats != null ? mStats.toString() : null) + " }";
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index 9d599039..b72acff4 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -111,19 +111,30 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         try {
             Set<TypeMirror> mSupportedTypes = SupportedTypesModel.getInstance().getSupportedTypesMirror();
             try {
-                mSupportedTypes.addAll(KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
+                mSupportedTypes.addAll(
+                        KnownTypeAdapterFactoriesUtils.loadKnownTypes(processingEnv, packageName));
             } catch (Exception ignored) {
             }
 
-            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes, SupportedTypesModel.getInstance().getExternalSupportedAdapters());
-            TypeTokenConstantsGenerator typeTokenConstantsGenerator = new TypeTokenConstantsGenerator(filer, packageName);
+            StagGenerator adapterGenerator = new StagGenerator(packageName, filer, mSupportedTypes,
+                                                               SupportedTypesModel.getInstance()
+                                                                       .getExternalSupportedAdapters());
+            TypeTokenConstantsGenerator typeTokenConstantsGenerator =
+                    new TypeTokenConstantsGenerator(filer, packageName);
 
             Set<Element> list = SupportedTypesModel.getInstance().getSupportedElements();
             for (Element element : list) {
-                if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) && !TypeUtils.isAbstract(element)) {
+                if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) &&
+                    !TypeUtils.isAbstract(element)) {
                     ClassInfo classInfo = new ClassInfo(element.asType());
-                    AdapterGenerator independentAdapter = element.getKind() == ElementKind.ENUM ? new EnumTypeAdapterGenerator(classInfo, element) : new TypeAdapterGenerator(classInfo);
-                    JavaFile javaFile = JavaFile.builder(classInfo.getPackageName(), independentAdapter.getTypeAdapterSpec(typeTokenConstantsGenerator, adapterGenerator)).build();
+                    AdapterGenerator independentAdapter =
+                            element.getKind() == ElementKind.ENUM ? new EnumTypeAdapterGenerator(classInfo,
+                                                                                                 element) : new TypeAdapterGenerator(
+                                    classInfo);
+                    JavaFile javaFile = JavaFile.builder(classInfo.getPackageName(),
+                                                         independentAdapter.getTypeAdapterSpec(
+                                                                 typeTokenConstantsGenerator,
+                                                                 adapterGenerator)).build();
                     FileGenUtils.writeToFile(javaFile, filer);
                 }
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
index c9a7abbe..4ed4f02e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/AdapterGenerator.java
@@ -42,13 +42,13 @@ public abstract class AdapterGenerator {
     @NotNull
     static String getJsonName(@NotNull Element element) {
 
-        String name = (null != element.getAnnotation(GsonAdapterKey.class)) ?
-                element.getAnnotation(GsonAdapterKey.class).value() : null;
+        String name = (null != element.getAnnotation(GsonAdapterKey.class)) ? element.getAnnotation(
+                GsonAdapterKey.class).value() : null;
 
 
         if (null == name || name.isEmpty()) {
-            name = (null != element.getAnnotation(SerializedName.class)) ?
-                    element.getAnnotation(SerializedName.class).value() : null;
+            name = (null != element.getAnnotation(SerializedName.class)) ? element.getAnnotation(
+                    SerializedName.class).value() : null;
         }
 
         if (null == name || name.isEmpty()) {
@@ -62,9 +62,12 @@ static String getJsonName(@NotNull Element element) {
      */
     @Nullable
     static String[] getAlternateJsonNames(@NotNull Element element) {
-        return (null != element.getAnnotation(SerializedName.class)) ? element.getAnnotation(SerializedName.class).alternate() : null;
+        return (null != element.getAnnotation(SerializedName.class)) ? element.getAnnotation(
+                SerializedName.class).alternate() : null;
     }
 
     @NotNull
-    public abstract TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator);
+    public abstract TypeSpec getTypeAdapterSpec(
+            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+            @NotNull StagGenerator stagGenerator);
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
index 707b8adc..10ca13fa 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/EnumTypeAdapterGenerator.java
@@ -138,22 +138,31 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName);
 
-        TypeName typeName = ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(String.class), TypeVariableName.get(typeMirror));
-        adapterBuilder.addField(typeName, "NAME_TO_CONSTANT", Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
+        TypeName typeName =
+                ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(String.class),
+                                          TypeVariableName.get(typeMirror));
+        adapterBuilder.addField(typeName, "NAME_TO_CONSTANT", Modifier.PRIVATE, Modifier.STATIC,
+                                Modifier.FINAL);
 
-        typeName = ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(typeMirror), TypeVariableName.get(String.class));
-        adapterBuilder.addField(typeName, "CONSTANT_TO_NAME", Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
+        typeName = ParameterizedTypeName.get(ClassName.get(HashMap.class), TypeVariableName.get(typeMirror),
+                                             TypeVariableName.get(String.class));
+        adapterBuilder.addField(typeName, "CONSTANT_TO_NAME", Modifier.PRIVATE, Modifier.STATIC,
+                                Modifier.FINAL);
 
         CodeBlock.Builder staticBlockBuilder = CodeBlock.builder();
         staticBlockBuilder.addStatement("NAME_TO_CONSTANT = new HashMap<>(" + nameToConstant.size() + ")");
         for (Map.Entry<String, Element> entry : nameToConstant.entrySet()) {
-            staticBlockBuilder.addStatement("NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + typeVariableName + "." + entry.getValue().getSimpleName().toString() + ")");
+            staticBlockBuilder.addStatement(
+                    "NAME_TO_CONSTANT.put(\"" + entry.getKey() + "\", " + typeVariableName + "." +
+                    entry.getValue().getSimpleName().toString() + ")");
         }
 
         staticBlockBuilder.add("\n");
         staticBlockBuilder.addStatement("CONSTANT_TO_NAME = new HashMap<>(" + constantToName.size() + ")");
         for (Map.Entry<Element, String> entry : constantToName.entrySet()) {
-            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + typeVariableName + "." + entry.getKey().getSimpleName().toString() + ", \"" + entry.getValue() + "\")");
+            staticBlockBuilder.addStatement("CONSTANT_TO_NAME.put(" + typeVariableName + "." +
+                                            entry.getKey().getSimpleName().toString() + ", \"" +
+                                            entry.getValue() + "\")");
         }
 
         adapterBuilder.addStaticBlock(staticBlockBuilder.build());
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index f6ff7f20..7c2ec0f4 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -31,7 +31,8 @@ public class ExternalAdapterInfo {
     @NotNull
     private final ExecutableElement mAdapterConstructor;
 
-    public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement adapterTypeElement, @NotNull ExecutableElement adapterConstructor) {
+    public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement adapterTypeElement,
+                               @NotNull ExecutableElement adapterConstructor) {
         this.mExternalClassType = typeElement;
         this.mAdapterType = adapterTypeElement;
         this.mAdapterConstructor = adapterConstructor;
@@ -45,7 +46,8 @@ public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement ad
      * @param externalAdapterInfos     externalAdapterInfos
      */
     public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
-                                           @NotNull TypeMirror typeMirror, @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
+                                           @NotNull TypeMirror typeMirror,
+                                           @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
         if (!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
             DeclaredType declaredType = (DeclaredType) typeMirror;
             Element typeElement = declaredType.asElement();
@@ -55,17 +57,25 @@ public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
              */
             if (null != useStag) {
                 ClassInfo classInfo = new ClassInfo(typeElement.asType());
-                String classAdapterName = FileGenUtils.unescapeEscapedString(classInfo.getTypeAdapterQualifiedClassName());
+                String classAdapterName =
+                        FileGenUtils.unescapeEscapedString(classInfo.getTypeAdapterQualifiedClassName());
                 if (!sCheckedClasses.contains(classAdapterName)) {
                     sCheckedClasses.add(classAdapterName);
-                    TypeElement adapterTypeElement = ElementUtils.getTypeElementFromQualifiedName(classAdapterName);
+                    TypeElement adapterTypeElement =
+                            ElementUtils.getTypeElementFromQualifiedName(classAdapterName);
                     if (null != adapterTypeElement) {
                         for (Element adapterEnclosedElement : adapterTypeElement.getEnclosedElements()) {
                             if (adapterEnclosedElement instanceof ExecutableElement) {
-                                ExecutableElement executableElement = ((ExecutableElement) adapterEnclosedElement);
+                                ExecutableElement executableElement =
+                                        ((ExecutableElement) adapterEnclosedElement);
                                 Name name = executableElement.getSimpleName();
-                                if (name.contentEquals("<init>") && executableElement.getParameters().size() >= 2 && !stagFactoryGeneratedName.equals(executableElement.getParameters().get(1).asType().toString())) {
-                                    ExternalAdapterInfo result = new ExternalAdapterInfo(typeElement, adapterTypeElement, executableElement);
+                                if (name.contentEquals("<init>") &&
+                                    executableElement.getParameters().size() >= 2 &&
+                                    !stagFactoryGeneratedName.equals(
+                                            executableElement.getParameters().get(1).asType().toString())) {
+                                    ExternalAdapterInfo result =
+                                            new ExternalAdapterInfo(typeElement, adapterTypeElement,
+                                                                    executableElement);
                                     sCheckedClasses.add(classAdapterName);
                                     externalAdapterInfos.add(result);
                                 }
@@ -87,9 +97,11 @@ public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
     String getInitializer(@NotNull String gsonVariableName, @NotNull String concatenatedTypeAdapters) {
         int paramsSize = mAdapterConstructor.getParameters().size();
         if (paramsSize == 2) {
-            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + ")";
+            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" +
+                   gsonVariableName + ", " + getFactoryInitializer() + ")";
         } else {
-            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" + gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
+            return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" +
+                   gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
         }
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 59dc13b3..001e78cf 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -109,7 +109,8 @@ public class StagGenerator {
     private final HashMap<String, String> mKnownFieldToMethodNameMap = new HashMap<>();
 
     public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
-                         @NotNull Set<TypeMirror> knownTypes, @NotNull Set<ExternalAdapterInfo> externalSupportedAdapters) {
+                         @NotNull Set<TypeMirror> knownTypes,
+                         @NotNull Set<ExternalAdapterInfo> externalSupportedAdapters) {
         mFiler = filer;
         mKnownTypes = knownTypes;
         mGeneratedPackageName = generatedPackageName;
@@ -169,7 +170,8 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
 
         for (ClassInfo knownGenericType : genericClasses) {
             List<? extends TypeMirror> typeArguments = knownGenericType.getTypeArguments();
-            AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
+            AnnotatedClass annotatedClass =
+                    SupportedTypesModel.getInstance().getSupportedType(knownGenericType.getType());
             Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
             boolean hasUnknownTypeFields = false;
             for (TypeMirror type : memberVariables.values()) {
@@ -180,7 +182,8 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
             }
 
             Preconditions.checkNotNull(typeArguments);
-            mGenericClassInfo.put(knownGenericType.getType().toString(), new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
+            mGenericClassInfo.put(knownGenericType.getType().toString(),
+                                  new GenericClassInfo(typeArguments.size(), hasUnknownTypeFields));
         }
     }
 
@@ -211,7 +214,8 @@ private static String generateMethodName(@NotNull TypeMirror typeMirror) {
         if (TypeUtils.isConcreteType(typeMirror)) {
             if (TypeUtils.isNativeArray(typeMirror)) {
                 result = removeSpecialCharacters(typeMirror);
-                return result + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR + "PrimitiveArray" + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR;
+                return result + FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR + "PrimitiveArray" +
+                       FileGenUtils.CODE_BLOCK_ESCAPED_SEPARATOR;
             } else if (typeMirror instanceof DeclaredType) {
                 List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
                 if (typeArguments.isEmpty()) {
@@ -245,9 +249,9 @@ private boolean checkKnownAdapters(@NotNull TypeMirror typeMirror) {
             DeclaredType declaredType = ((DeclaredType) typeMirror);
             Element outerClassType = declaredType.asElement();
             if (!mFieldNameMap.containsKey(outerClassType.asType().toString()) &&
-                    !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
-                    !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
-                    !mExternalSupportedAdapters.containsKey(typeMirror.toString())) {
+                !KNOWN_COLLECTION_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
+                !KNOWN_MAP_GENERIC_CLASSES.containsKey(outerClassType.toString()) &&
+                !mExternalSupportedAdapters.containsKey(typeMirror.toString())) {
                 return false;
             }
 
@@ -301,11 +305,14 @@ private TypeSpec getAdapterFactorySpec() {
         MethodSpec.Builder createMethodBuilder = MethodSpec.methodBuilder("create")
                 .addModifiers(Modifier.PUBLIC)
                 .addAnnotation(Override.class)
-                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build())
+                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
+                                       .addMember("value", "\"unchecked\"")
+                                       .build())
                 .addTypeVariable(genericTypeName)
                 .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericTypeName))
                 .addParameter(Gson.class, "gson")
-                .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName), "type")
+                .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName),
+                              "type")
                 .addStatement("Class<? super T> clazz = type.getRawType()");
 
         /*
@@ -320,13 +327,17 @@ private TypeSpec getAdapterFactorySpec() {
                  */
                 String variableName = mFieldNameMap.get(classInfo.getType().toString());
                 TypeName typeName = TypeVariableName.get(classInfo.getType());
-                TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+                TypeName parameterizedTypeName =
+                        ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
                 String fieldName = "m" + variableName;
-                FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
+                FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName,
+                                                                       FileGenUtils.unescapeEscapedString(
+                                                                               fieldName), Modifier.PRIVATE);
                 adapterFactoryBuilder.addField(fieldSpecBuilder.build());
                 String getAdapterFactoryMethodName = "get" + variableName;
                 //Build a getter method
-                MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
+                MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(
+                        FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
                         .addModifiers(Modifier.PUBLIC)
                         .addParameter(Gson.class, "gson")
                         .returns(parameterizedTypeName);
@@ -347,7 +358,8 @@ private TypeSpec getAdapterFactorySpec() {
             } else {
 
                 GenericClassInfo genericClassInfo = mGenericClassInfo.get(classInfo.getType().toString());
-                boolean hasUnknownTypes = null != genericClassInfo && genericClassInfo.mHasUnknownVarTypeFields;
+                boolean hasUnknownTypes =
+                        null != genericClassInfo && genericClassInfo.mHasUnknownVarTypeFields;
 
                 /*
                  *  This is used to generate the code if the class has type arguments, or it is parameterized.
@@ -365,7 +377,9 @@ private TypeSpec getAdapterFactorySpec() {
 
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
                     if (!hasUnknownTypes) {
-                        createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx + " = gson.getAdapter(TypeToken.get(parametersType[" + idx + "]))");
+                        createMethodBuilder.addStatement("TypeAdapter typeAdapter" + idx +
+                                                         " = gson.getAdapter(TypeToken.get(parametersType[" +
+                                                         idx + "]))");
                         statement += ", typeAdapter" + idx;
                     } else {
                         statement += ", parametersType[" + idx + "]";
@@ -379,7 +393,8 @@ private TypeSpec getAdapterFactorySpec() {
                 createMethodBuilder.addStatement("TypeToken objectToken = TypeToken.get(Object.class)");
                 statement = "return (TypeAdapter<T>) new " + qualifiedTypeAdapterName + "(gson, this";
                 if (!hasUnknownTypes) {
-                    createMethodBuilder.addStatement("TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
+                    createMethodBuilder.addStatement(
+                            "TypeAdapter typeAdapter = gson.getAdapter(objectToken)");
                 }
                 for (int idx = 0; idx < typeArguments.size(); idx++) {
                     if (!hasUnknownTypes) {
@@ -403,23 +418,30 @@ private TypeSpec getAdapterFactorySpec() {
         for (ClassInfo classInfo : mUnknownClasses) {
             String variableName = mUnknownAdapterFieldMap.get(classInfo.getType().toString());
             TypeName typeName = TypeVariableName.get(classInfo.getType());
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            TypeName parameterizedTypeName =
+                    ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
             String fieldName = "mAdapter" + variableName;
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName), Modifier.PRIVATE);
+            FieldSpec.Builder fieldSpecBuilder =
+                    FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(fieldName),
+                                      Modifier.PRIVATE);
             adapterFactoryBuilder.addField(fieldSpecBuilder.build());
             String getAdapterFactoryMethodName = "get" + variableName;
 
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
-                    .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "gson")
-                    .returns(parameterizedTypeName);
+            MethodSpec.Builder getAdapterMethodBuilder =
+                    MethodSpec.methodBuilder(FileGenUtils.unescapeEscapedString(getAdapterFactoryMethodName))
+                            .addModifiers(Modifier.PUBLIC)
+                            .addParameter(Gson.class, "gson")
+                            .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (null == " + fieldName + ")");
 
-            String knownTypeAdapterForType = KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType());
+            String knownTypeAdapterForType =
+                    KnownTypeAdapterUtils.getKnownTypeAdapterForType(classInfo.getType());
             if (null != knownTypeAdapterForType) {
                 fieldName += knownTypeAdapterForType;
             } else {
-                getAdapterMethodBuilder.addStatement(fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() + ">(){})");
+                getAdapterMethodBuilder.addStatement(
+                        fieldName + " = gson.getAdapter(new TypeToken<" + classInfo.getType().toString() +
+                        ">(){})");
             }
             getAdapterMethodBuilder.endControlFlow();
             getAdapterMethodBuilder.addStatement("return " + fieldName);
@@ -433,13 +455,17 @@ private TypeSpec getAdapterFactorySpec() {
         for (Map.Entry<String, String> entry : concreteAdapterFieldEntries) {
             String methodName = mKnownFieldToMethodNameMap.get(entry.getKey());
             TypeName typeName = TypeVariableName.get(entry.getKey());
-            TypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
+            TypeName parameterizedTypeName =
+                    ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeName);
             String variableName = "m" + methodName;
-            FieldSpec.Builder fieldSpecBuilder = FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(variableName), Modifier.PRIVATE);
-            MethodSpec.Builder getAdapterMethodBuilder = MethodSpec.methodBuilder("get" + FileGenUtils.unescapeEscapedString(methodName))
-                    .addModifiers(Modifier.PUBLIC)
-                    .addParameter(Gson.class, "gson")
-                    .returns(parameterizedTypeName);
+            FieldSpec.Builder fieldSpecBuilder =
+                    FieldSpec.builder(parameterizedTypeName, FileGenUtils.unescapeEscapedString(variableName),
+                                      Modifier.PRIVATE);
+            MethodSpec.Builder getAdapterMethodBuilder =
+                    MethodSpec.methodBuilder("get" + FileGenUtils.unescapeEscapedString(methodName))
+                            .addModifiers(Modifier.PUBLIC)
+                            .addParameter(Gson.class, "gson")
+                            .returns(parameterizedTypeName);
             getAdapterMethodBuilder.beginControlFlow("if (" + variableName + " == null)");
             getAdapterMethodBuilder.addStatement(variableName + " = " + entry.getValue());
             getAdapterMethodBuilder.endControlFlow();
@@ -462,7 +488,8 @@ private TypeSpec getAdapterFactorySpec() {
      */
     @NotNull
     TypeVariableName getGeneratedClassName() {
-        return TypeVariableName.get(mGeneratedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY);
+        return TypeVariableName.get(
+                mGeneratedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY);
     }
 
     /**
@@ -500,6 +527,7 @@ ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
     }
 
     static class GenericClassInfo {
+
         int mNumArguments;
         boolean mHasUnknownVarTypeFields;
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 4dbbe4c1..223c502e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -91,7 +91,8 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                  */
                 DeclaredType declaredFieldType = (DeclaredType) fieldType;
                 List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
-                result = "com.google.gson.reflect.TypeToken.getParameterized(" + declaredFieldType.asElement().toString() + ".class";
+                result = "com.google.gson.reflect.TypeToken.getParameterized(" +
+                         declaredFieldType.asElement().toString() + ".class";
                 /*
                  * Iterate through all the types from the typeArguments and generate type token code accordingly
                  */
@@ -101,7 +102,8 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                     } else if (parameterTypeMirror.getKind() == TypeKind.TYPEVAR) {
                         result += ", " + typeVarsMap.get(parameterTypeMirror);
                     } else {
-                        result += ",\n" + getTypeTokenCode(parameterTypeMirror, typeVarsMap, typeTokenConstantsGenerator) + ".getType()";
+                        result += ",\n" + getTypeTokenCode(parameterTypeMirror, typeVarsMap,
+                                                           typeTokenConstantsGenerator) + ".getType()";
                     }
                 }
                 result += ")";
@@ -117,10 +119,13 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
      * This is used to generate the type token code for the types that are known.
      */
     @Nullable
-    private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+    private static String getTypeAdapterCode(@NotNull TypeMirror fieldType,
+                                             @NotNull TypeSpec.Builder adapterBuilder,
                                              @NotNull MethodSpec.Builder constructorBuilder,
-                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
-                                             @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                             @NotNull Map<TypeVariable, String> typeVarsMap,
+                                             @NotNull StagGenerator stagGenerator,
+                                             @NotNull AdapterFieldInfo adapterFieldInfo) {
         String result = null;
         if (!TypeUtils.isConcreteType(fieldType)) {
             if (fieldType.getKind() == TypeKind.TYPEVAR) {
@@ -137,16 +142,31 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                      */
                     TypeMirror keyTypeMirror = typeMirrors.get(0);
                     TypeMirror valueTypeMirror = typeMirrors.get(1);
-                    String keyAdapterAccessor = getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" + keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getMapInstantiator(fieldType) + ")";
+                    String keyAdapterAccessor =
+                            getAdapterAccessor(keyTypeMirror, adapterBuilder, constructorBuilder,
+                                               typeTokenConstantsGenerator, typeVarsMap, stagGenerator,
+                                               adapterFieldInfo);
+                    String valueAdapterAccessor =
+                            getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder,
+                                               typeTokenConstantsGenerator, typeVarsMap, stagGenerator,
+                                               adapterFieldInfo);
+                    result = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter<" +
+                             keyTypeMirror.toString() + "," + valueTypeMirror.toString() + "," +
+                             fieldType.toString() + ">(" + keyAdapterAccessor + " ," + valueAdapterAccessor +
+                             ", " + KnownTypeAdapterUtils.getMapInstantiator(fieldType) + ")";
                 } else if (TypeUtils.isSupportedCollection(fieldType)) {
                     /**
                      * If the fieldType is of {@link java.util.Collection} type, generate the ListTypeAdapter with its valueTypeAdapter
                      */
                     TypeMirror valueTypeMirror = typeMirrors.get(0);
-                    String valueAdapterAccessor = getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + valueTypeMirror.toString() + "," + fieldType.toString() + ">(" + valueAdapterAccessor + ", " + KnownTypeAdapterUtils.getListInstantiator(fieldType) + ")";
+                    String valueAdapterAccessor =
+                            getAdapterAccessor(valueTypeMirror, adapterBuilder, constructorBuilder,
+                                               typeTokenConstantsGenerator, typeVarsMap, stagGenerator,
+                                               adapterFieldInfo);
+                    result = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" +
+                             valueTypeMirror.toString() + "," + fieldType.toString() + ">(" +
+                             valueAdapterAccessor + ", " +
+                             KnownTypeAdapterUtils.getListInstantiator(fieldType) + ")";
                 } else {
                     /**
                      * If the fieldType is of Known parameterized type, recursively call the function to generate the typeadapter code.
@@ -154,12 +174,15 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
                     sGsonVariableUsed = true;
                     List<? extends TypeMirror> typeArguments = declaredFieldType.getTypeArguments();
-                    ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
+                    ExternalAdapterInfo externalAdapterInfo =
+                            stagGenerator.getExternalSupportedAdapter(outerClass);
 
                     String typeAdapterCode = "";
                     for (TypeMirror typeMirror : typeArguments) {
-                        typeAdapterCode += ", " + getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
-                                , stagGenerator, adapterFieldInfo);
+                        typeAdapterCode += ", " +
+                                           getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder,
+                                                              typeTokenConstantsGenerator, typeVarsMap,
+                                                              stagGenerator, adapterFieldInfo);
                     }
 
                     String adapterCode;
@@ -170,7 +193,8 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType, @NotNull
                         ClassInfo classInfo = new ClassInfo(outerClass);
                         int idx1 = fieldType.toString().indexOf("<");
                         String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
-                        adapterCode = "new " + classInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, stagFactory" + typeAdapterCode + ")";
+                        adapterCode = "new " + classInfo.getTypeAdapterQualifiedClassName() + argument +
+                                      "(gson, stagFactory" + typeAdapterCode + ")";
                     }
                     return adapterCode;
                 }
@@ -189,7 +213,9 @@ private static TypeName getAdapterFieldTypeName(@NotNull TypeMirror type) {
     }
 
     @NotNull
-    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> elements, @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
+                                                @NotNull Map<Element, TypeMirror> elements,
+                                                @NotNull AdapterFieldInfo adapterFieldInfo) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
                 .addParameter(JsonReader.class, "reader")
                 .returns(typeName)
@@ -198,25 +224,25 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull
                 .addException(IOException.class);
 
         builder.addCode("\tif (reader.peek() == com.google.gson.stream.JsonToken.NULL) {\n" +
-                "\t\treader.nextNull();\n" +
-                "\t\treturn null;\n" +
-                "\t}\n" +
-                "\tif (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
-                "\t\treader.skipValue();\n" +
-                "\t\treturn null;\n" +
-                "\t}\n" +
-                "\treader.beginObject();\n" +
-                '\n' +
-                '\t' + typeName + " object = new " + typeName +
-                "();\n" +
-                "\twhile (reader.hasNext()) {\n" +
-                "\t\tString name = reader.nextName();\n" +
-                "\t\tcom.google.gson.stream.JsonToken jsonToken = reader.peek();\n" +
-                "\t\tif (jsonToken == com.google.gson.stream.JsonToken.NULL) {\n" +
-                "\t\t\treader.skipValue();\n" +
-                "\t\t\tcontinue;\n" +
-                "\t\t}\n" +
-                "\t\tswitch (name) {\n");
+                        "\t\treader.nextNull();\n" +
+                        "\t\treturn null;\n" +
+                        "\t}\n" +
+                        "\tif (reader.peek() != com.google.gson.stream.JsonToken.BEGIN_OBJECT) {\n" +
+                        "\t\treader.skipValue();\n" +
+                        "\t\treturn null;\n" +
+                        "\t}\n" +
+                        "\treader.beginObject();\n" +
+                        '\n' +
+                        '\t' + typeName + " object = new " + typeName +
+                        "();\n" +
+                        "\twhile (reader.hasNext()) {\n" +
+                        "\t\tString name = reader.nextName();\n" +
+                        "\t\tcom.google.gson.stream.JsonToken jsonToken = reader.peek();\n" +
+                        "\t\tif (jsonToken == com.google.gson.stream.JsonToken.NULL) {\n" +
+                        "\t\t\treader.skipValue();\n" +
+                        "\t\t\tcontinue;\n" +
+                        "\t\t}\n" +
+                        "\t\tswitch (name) {\n");
 
         final List<String> nonNullFields = new ArrayList<>();
 
@@ -234,7 +260,8 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName, @NotNull
                 }
             }
 
-            builder.addCode("\t\t\t\tobject." + variableName + " = " + adapterFieldInfo.getAdapterAccessor(elementValue) + ".read(reader);");
+            builder.addCode("\t\t\t\tobject." + variableName + " = " +
+                            adapterFieldInfo.getAdapterAccessor(elementValue) + ".read(reader);");
 
             builder.addCode("\n\t\t\t\tbreak;\n");
             runIfAnnotationSupported(element.getKey().getAnnotationMirrors(), new Runnable() {
@@ -248,12 +275,12 @@ public void run() {
         }
 
         builder.addCode("\t\t\tdefault:\n" +
-                "\t\t\t\treader.skipValue();\n" +
-                "\t\t\t\tbreak;\n" +
-                "\t\t}\n" +
-                "\t}\n" +
-                '\n' +
-                "\treader.endObject();\n");
+                        "\t\t\t\treader.skipValue();\n" +
+                        "\t\t\t\tbreak;\n" +
+                        "\t\t}\n" +
+                        "\t}\n" +
+                        '\n' +
+                        "\treader.endObject();\n");
 
         for (String nonNullField : nonNullFields) {
             builder.addCode("\n\tif (object." + nonNullField + " == null) {");
@@ -266,7 +293,8 @@ public void run() {
         return builder.build();
     }
 
-    private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationMirror> annotationMirrors, @NotNull Runnable runnable) {
+    private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationMirror> annotationMirrors,
+                                                 @NotNull Runnable runnable) {
         for (AnnotationMirror annotationMirror : annotationMirrors) {
             switch (annotationMirror.toString()) {
                 case "@javax.validation.constraints.NotNull":
@@ -285,10 +313,13 @@ private static void runIfAnnotationSupported(@NotNull List<? extends AnnotationM
     /**
      * Returns the adapter code for the known types.
      */
-    private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+    private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
+                                             @NotNull TypeSpec.Builder adapterBuilder,
                                              @NotNull MethodSpec.Builder constructorBuilder,
-                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull Map<TypeVariable, String> typeVarsMap,
-                                             @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                             @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                             @NotNull Map<TypeVariable, String> typeVarsMap,
+                                             @NotNull StagGenerator stagGenerator,
+                                             @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
 
@@ -318,13 +349,19 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     sStagFactoryUsed = true;
                     sGsonVariableUsed = true;
                     ArrayType arrayType = (ArrayType) fieldType;
-                    String adapterAccessor = getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
-                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    String nativeArrayInstantiator = KnownTypeAdapterUtils.getNativeArrayInstantiator(arrayInnerType);
-                    String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" + arrayInnerType.toString() + ">" +
-                            "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
-                    if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson"));
+                    String adapterAccessor =
+                            getAdapterAccessor(arrayInnerType, adapterBuilder, constructorBuilder,
+                                               typeTokenConstantsGenerator, typeVarsMap, stagGenerator,
+                                               adapterFieldInfo);
+                    String nativeArrayInstantiator =
+                            KnownTypeAdapterUtils.getNativeArrayInstantiator(arrayInnerType);
+                    String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ArrayTypeAdapter<" +
+                                         arrayInnerType.toString() + ">" +
+                                         "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
+                    if (arrayType.getComponentType().getKind() != TypeKind.TYPEVAR &&
+                        !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
+                        String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace(
+                                "mStagFactory", "this").replace("mGson", "gson"));
                         return "mStagFactory." + getterName + "(mGson)";
                     } else {
                         return adapterCode;
@@ -340,14 +377,19 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
                 TypeMirror param = typeArguments.get(0);
                 String paramAdapterAccessor = getAdapterAccessor(param, adapterBuilder, constructorBuilder,
-                        typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                                                                 typeTokenConstantsGenerator, typeVarsMap,
+                                                                 stagGenerator, adapterFieldInfo);
 
 
                 String listInstantiator = KnownTypeAdapterUtils.getListInstantiator(fieldType);
-                String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," + fieldType.toString() + ">" +
+                String adapterCode =
+                        "new com.vimeo.stag.KnownTypeAdapters.ListTypeAdapter<" + param.toString() + "," +
+                        fieldType.toString() + ">" +
                         "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
-                if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                if (declaredType.getKind() != TypeKind.TYPEVAR &&
+                    !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
+                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll(
+                            "mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -368,10 +410,13 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                     TypeMirror keyType = typeArguments.get(0);
                     TypeMirror valueType = typeArguments.get(1);
                     keyAdapterAccessor = getAdapterAccessor(keyType, adapterBuilder, constructorBuilder,
-                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
+                                                            typeTokenConstantsGenerator, typeVarsMap,
+                                                            stagGenerator, adapterFieldInfo);
                     valueAdapterAccessor = getAdapterAccessor(valueType, adapterBuilder, constructorBuilder,
-                            typeTokenConstantsGenerator, typeVarsMap, stagGenerator, adapterFieldInfo);
-                    arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " + fieldType.toString() + ">";
+                                                              typeTokenConstantsGenerator, typeVarsMap,
+                                                              stagGenerator, adapterFieldInfo);
+                    arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " +
+                                fieldType.toString() + ">";
                 } else {
                     //If the map does not have any type arguments, use Object as typeparams in this case
                     keyAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
@@ -379,9 +424,12 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 }
 
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.MapTypeAdapter" + arguments +
-                        "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " + mapInstantiator + ")";
-                if (declaredType.getKind() != TypeKind.TYPEVAR && !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                                     "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " +
+                                     mapInstantiator + ")";
+                if (declaredType.getKind() != TypeKind.TYPEVAR &&
+                    !adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
+                    String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll(
+                            "mStagFactory.", "").replaceAll("mGson", "gson"));
                     return "mStagFactory." + getterName + "(mGson)";
                 } else {
                     return adapterCode;
@@ -392,26 +440,31 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                  */
                 sGsonVariableUsed = true;
                 String adapterCode = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
-                String getterName = stagGenerator.addFieldForKnownType(fieldType, adapterCode.replaceAll("mStagFactory.", "").replaceAll("mGson", "gson"));
+                String getterName = stagGenerator.addFieldForKnownType(fieldType,
+                                                                       adapterCode.replaceAll("mStagFactory.",
+                                                                                              "")
+                                                                               .replaceAll("mGson", "gson"));
                 return "mStagFactory." + getterName + "(mGson)";
             } else if (fieldType instanceof DeclaredType) {
                 /*
                  * If the field type is generic and does not belong to above cases.
                  */
                 DeclaredType declaredType = (DeclaredType) fieldType;
-                int size = declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
+                int size =
+                        declaredType.getTypeArguments() == null ? 0 : declaredType.getTypeArguments().size();
                 TypeMirror outerClass = declaredType.asElement().asType();
-                if (size != 0 &&
-                        (stagGenerator.isKnownType(outerClass) ||
-                                (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
+                if (size != 0 && (stagGenerator.isKnownType(outerClass) ||
+                                  (null != stagGenerator.getExternalSupportedAdapter(outerClass)))) {
                     sGsonVariableUsed = true;
                     sStagFactoryUsed = true;
                     ClassInfo outerClassInfo = new ClassInfo(outerClass);
                     int idx1 = fieldType.toString().indexOf("<");
                     String argument = idx1 > 0 ? fieldType.toString().substring(idx1) : "";
                     List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
-                    ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(outerClass);
-                    String adapterCode = "new " + outerClassInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, ";
+                    ExternalAdapterInfo externalAdapterInfo =
+                            stagGenerator.getExternalSupportedAdapter(outerClass);
+                    String adapterCode =
+                            "new " + outerClassInfo.getTypeAdapterQualifiedClassName() + argument + "(gson, ";
 
                     if (null != externalAdapterInfo) {
                         adapterCode += externalAdapterInfo.getFactoryInitializer();
@@ -421,21 +474,30 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
 
                     adapterCode += ", ";
                     for (TypeMirror typeMirror : typeArguments) {
-                        adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
-                                , stagGenerator, adapterFieldInfo);
+                        adapterCode += getAdapterAccessor(typeMirror, adapterBuilder, constructorBuilder,
+                                                          typeTokenConstantsGenerator, typeVarsMap,
+                                                          stagGenerator, adapterFieldInfo);
                     }
                     adapterCode += ")";
                     if (!adapterCode.contains(TYPE_ADAPTER_FIELD_PREFIX)) {
-                        return "mStagFactory." + stagGenerator.addFieldForKnownType(fieldType, adapterCode.replace("mStagFactory", "this").replace("mGson", "gson")) + "(mGson)";
+                        return "mStagFactory." + stagGenerator.addFieldForKnownType(fieldType,
+                                                                                    adapterCode.replace(
+                                                                                            "mStagFactory",
+                                                                                            "this")
+                                                                                            .replace("mGson",
+                                                                                                     "gson")) +
+                               "(mGson)";
                     } else {
                         return adapterCode;
                     }
 
                 } else {
-                    return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator, adapterFieldInfo);
+                    return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder,
+                                                  stagGenerator, adapterFieldInfo);
                 }
             } else {
-                return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator, adapterFieldInfo);
+                return addFieldForUnknownType(fieldType, adapterBuilder, constructorBuilder, stagGenerator,
+                                              adapterFieldInfo);
             }
         } else {
 
@@ -449,11 +511,13 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType, @NotNull
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                String typeAdapterCode = getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap
-                        , stagGenerator, adapterFieldInfo);
+                String typeAdapterCode = getTypeAdapterCode(fieldType, adapterBuilder, constructorBuilder,
+                                                            typeTokenConstantsGenerator, typeVarsMap,
+                                                            stagGenerator, adapterFieldInfo);
 
                 if (null != typeAdapterCode) {
-                    constructorBuilder.addStatement(fieldName + " = " + getCleanedFieldInitializer(typeAdapterCode));
+                    constructorBuilder.addStatement(
+                            fieldName + " = " + getCleanedFieldInitializer(typeAdapterCode));
                 }
             }
             return fieldName;
@@ -464,9 +528,11 @@ private static String getCleanedFieldInitializer(String code) {
         return code.replace("mStagFactory", "stagFactory").replace("mGson", "gson");
     }
 
-    private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
+    private static String addFieldForUnknownType(@NotNull TypeMirror fieldType,
+                                                 @NotNull TypeSpec.Builder adapterBuilder,
                                                  @NotNull MethodSpec.Builder constructorBuilder,
-                                                 @NotNull StagGenerator stagGenerator, @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                                 @NotNull StagGenerator stagGenerator,
+                                                 @NotNull AdapterFieldInfo adapterFieldInfo) {
         ExternalAdapterInfo externalAdapterInfo = stagGenerator.getExternalSupportedAdapter(fieldType);
         if (null != externalAdapterInfo) {
             //Generate the Type Adapter as a member variable
@@ -477,7 +543,8 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
                 String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
                 TypeName typeName = getAdapterFieldTypeName(fieldType);
                 adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-                String statement = fieldName + " = " + getCleanedFieldInitializer(externalAdapterInfo.getInitializer("gson", ""));
+                String statement = fieldName + " = " +
+                                   getCleanedFieldInitializer(externalAdapterInfo.getInitializer("gson", ""));
                 constructorBuilder.addStatement(statement);
             }
 
@@ -493,9 +560,12 @@ private static String addFieldForUnknownType(@NotNull TypeMirror fieldType, @Not
     /**
      * Returns the adapter code for the unknown types.
      */
-    private static String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @NotNull TypeSpec.Builder adapterBuilder,
-                                                   @NotNull MethodSpec.Builder constructorBuilder, @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                                   @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static String getAdapterForUnknownType(@NotNull TypeMirror fieldType,
+                                                   @NotNull TypeSpec.Builder adapterBuilder,
+                                                   @NotNull MethodSpec.Builder constructorBuilder, @NotNull
+                                                           TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                                   @NotNull Map<TypeVariable, String> typeVarsMap,
+                                                   @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
         if (null == fieldName) {
@@ -504,26 +574,34 @@ private static String getAdapterForUnknownType(@NotNull TypeMirror fieldType, @N
             String originalFieldName = FileGenUtils.unescapeEscapedString(fieldName);
             TypeName typeName = getAdapterFieldTypeName(fieldType);
             adapterBuilder.addField(typeName, originalFieldName, Modifier.PRIVATE, Modifier.FINAL);
-            constructorBuilder.addStatement(fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" + getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
+            constructorBuilder.addStatement(
+                    fieldName + " = (TypeAdapter<" + fieldType + ">) gson.getAdapter(" +
+                    getTypeTokenCode(fieldType, typeVarsMap, typeTokenConstantsGenerator) + ")");
         }
         return fieldName;
     }
 
     @NotNull
-    private static AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.GenericClassInfo genericClassInfo, @NotNull TypeSpec.Builder adapterBuilder,
-                                                     @NotNull MethodSpec.Builder constructorBuilder, @NotNull Map<Element, TypeMirror> memberVariables,
-                                                     @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
-                                                     @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
+    private static AdapterFieldInfo addAdapterFields(
+            @Nullable StagGenerator.GenericClassInfo genericClassInfo,
+            @NotNull TypeSpec.Builder adapterBuilder, @NotNull MethodSpec.Builder constructorBuilder,
+            @NotNull Map<Element, TypeMirror> memberVariables,
+            @NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+            @NotNull Map<TypeVariable, String> typeVarsMap, @NotNull StagGenerator stagGenerator) {
 
         HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
         AdapterFieldInfo result = new AdapterFieldInfo(typeSet.size());
-        boolean hasUnknownGenericField = genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
+        boolean hasUnknownGenericField =
+                genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields;
         for (TypeMirror fieldType : typeSet) {
             String adapterAccessor;
             if (hasUnknownGenericField && TypeUtils.containsTypeVarParams(fieldType)) {
-                adapterAccessor = getAdapterForUnknownType(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, result);
+                adapterAccessor = getAdapterForUnknownType(fieldType, adapterBuilder, constructorBuilder,
+                                                           typeTokenConstantsGenerator, typeVarsMap, result);
             } else {
-                adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder, typeTokenConstantsGenerator, typeVarsMap, stagGenerator, result);
+                adapterAccessor = getAdapterAccessor(fieldType, adapterBuilder, constructorBuilder,
+                                                     typeTokenConstantsGenerator, typeVarsMap, stagGenerator,
+                                                     result);
 
                 if (null != adapterAccessor && adapterAccessor.startsWith("new ")) {
                     //Add this to a member variable
@@ -546,7 +624,9 @@ private static AdapterFieldInfo addAdapterFields(@Nullable StagGenerator.Generic
     }
 
     @NotNull
-    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<Element, TypeMirror> memberVariables, @NotNull AdapterFieldInfo adapterFieldInfo) {
+    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
+                                                 @NotNull Map<Element, TypeMirror> memberVariables,
+                                                 @NotNull AdapterFieldInfo adapterFieldInfo) {
         final MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
                 .addParameter(JsonWriter.class, "writer")
                 .addParameter(typeName, "object")
@@ -575,7 +655,9 @@ private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNul
 
             builder.addStatement("writer.name(\"" + name + "\")");
             if (!isPrimitive) {
-                builder.addStatement(adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." + variableName + ")");
+                builder.addStatement(
+                        adapterFieldInfo.getAdapterAccessor(element.getValue()) + ".write(writer, object." +
+                        variableName + ")");
                 /*
                 * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
                 */
@@ -585,7 +667,7 @@ public void run() {
                         builder.endControlFlow();
                         builder.beginControlFlow("else if (object." + variableName + " == null)");
                         builder.addStatement("throw new java.io.IOException(\"" + variableName +
-                                " cannot be null\")");
+                                             " cannot be null\")");
                     }
                 });
 
@@ -609,7 +691,8 @@ public void run() {
      */
     @Override
     @NotNull
-    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator, @NotNull StagGenerator stagGenerator) {
+    public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeTokenConstantsGenerator,
+                                       @NotNull StagGenerator stagGenerator) {
         sGsonVariableUsed = false;
         sStagFactoryUsed = false;
         TypeMirror typeMirror = mInfo.getType();
@@ -619,7 +702,9 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
 
         TypeVariableName stagFactoryTypeName = stagGenerator.getGeneratedClassName();
         MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder()
-                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build())
+                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
+                                       .addMember("value", "\"unchecked\"")
+                                       .build())
                 .addModifiers(Modifier.PUBLIC)
                 .addParameter(Gson.class, "gson")
                 .addParameter(stagFactoryTypeName, "stagFactory");
@@ -639,13 +724,16 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
                 if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
                     TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
                     String simpleName = typeVariable.asElement().getSimpleName().toString();
-                    adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(typeVariable.getUpperBound())));
+                    adapterBuilder.addTypeVariable(TypeVariableName.get(simpleName, TypeVariableName.get(
+                            typeVariable.getUpperBound())));
                     String paramName;
                     if (genericClassInfo != null && genericClassInfo.mHasUnknownVarTypeFields) {
                         //If the classInfo has unknown types, pass type... as param in constructor.
                         paramName = "type[" + String.valueOf(idx) + "]";
                     } else {
-                        ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), TypeVariableName.get(innerTypeMirror.toString()));
+                        ParameterizedTypeName parameterizedTypeName =
+                                ParameterizedTypeName.get(ClassName.get(TypeAdapter.class),
+                                                          TypeVariableName.get(innerTypeMirror.toString()));
                         paramName = "typeAdapter" + idx;
                         constructorBuilder.addParameter(parameterizedTypeName, paramName);
                     }
@@ -664,7 +752,9 @@ public TypeSpec getTypeAdapterSpec(@NotNull TypeTokenConstantsGenerator typeToke
         AnnotatedClass annotatedClass = SupportedTypesModel.getInstance().getSupportedType(typeMirror);
         Map<Element, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
 
-        AdapterFieldInfo adapterFieldInfo = addAdapterFields(genericClassInfo, adapterBuilder, constructorBuilder, memberVariables, typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
+        AdapterFieldInfo adapterFieldInfo =
+                addAdapterFields(genericClassInfo, adapterBuilder, constructorBuilder, memberVariables,
+                                 typeTokenConstantsGenerator, typeVarsMap, stagGenerator);
 
         MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
         MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
index 26e836d9..81ae1726 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
@@ -99,7 +99,7 @@ String addTypeToken(@NotNull TypeMirror type) {
         }
 
         return mGeneratedPackageName + "." + CLASS_STAG_TYPE_TOKEN_CONSTANTS + "." +
-                typeTokenInfo.mMethodName;
+               typeTokenInfo.mMethodName;
     }
 
     /**
@@ -122,7 +122,7 @@ public void generateTypeTokenConstants() throws IOException {
                         ParameterizedTypeName.get(ClassName.get(TypeToken.class), typeName);
                 FieldSpec.Builder fieldSpecBuilder =
                         FieldSpec.builder(parameterizedTypeName, typeTokenInfo.mFieldName, Modifier.PUBLIC,
-                                Modifier.STATIC);
+                                          Modifier.STATIC);
                 adaptersBuilder.addField(fieldSpecBuilder.build());
                 adaptersBuilder.addMethod(generateTypeTokenGetters(typeTokenInfo.mFieldName, typeName));
             }
@@ -133,6 +133,7 @@ public void generateTypeTokenConstants() throws IOException {
     }
 
     private static class TypeTokenInfo {
+
         TypeMirror mTypeMirror;
         String mFieldName;
         String mMethodName;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 93e0f657..3f3da795 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -34,7 +34,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,10 +81,11 @@ public class AnnotatedClass {
             AnnotatedClass genericInheritedType =
                     SupportedTypesModel.getInstance().getSupportedType(inheritedType);
 
-            LinkedHashMap<Element, TypeMirror> inheritedMemberVariables = TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
-                    genericInheritedType.getMemberVariables());
+            LinkedHashMap<Element, TypeMirror> inheritedMemberVariables =
+                    TypeUtils.getConcreteMembers(inheritedType, genericInheritedType.getElement(),
+                                                 genericInheritedType.getMemberVariables());
 
-            for(Map.Entry<Element, TypeMirror> entry : inheritedMemberVariables.entrySet()) {
+            for (Map.Entry<Element, TypeMirror> entry : inheritedMemberVariables.entrySet()) {
                 addMemberVariable(entry.getKey(), entry.getValue(), variableNames);
             }
         }
@@ -96,21 +96,23 @@ public class AnnotatedClass {
 
     }
 
-    private void addMemberVariable(@NotNull Element element, @NotNull TypeMirror typeMirror, @NotNull Map<String, Element> variableNames) {
+    private void addMemberVariable(@NotNull Element element, @NotNull TypeMirror typeMirror,
+                                   @NotNull Map<String, Element> variableNames) {
         Element previousElement = variableNames.put(element.getSimpleName().toString(), element);
-        if(null != previousElement) {
+        if (null != previousElement) {
             mMemberVariables.remove(previousElement);
             if (StagProcessor.DEBUG) {
-                DebugLog.log(TAG, "\t\tIgnoring inherited Member variable with the same variable name - " + previousElement.asType().toString());
+                DebugLog.log(TAG, "\t\tIgnoring inherited Member variable with the same variable name - " +
+                                  previousElement.asType().toString());
             }
         }
         mMemberVariables.put(element, typeMirror);
     }
 
     //This is to avoid the infinite recursive loop where an inner class can be deriving for this class itself
-    void initNestedClasses(){
-        if(null != mNestedElements) {
-            for (Element element: mNestedElements) {
+    void initNestedClasses() {
+        if (null != mNestedElements) {
+            for (Element element : mNestedElements) {
                 SupportedTypesModel.getInstance().getSupportedType(element.asType());
             }
         }
@@ -120,24 +122,26 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         if (!modifiers.contains(Modifier.STATIC)) {
             if (modifiers.contains(Modifier.FINAL)) {
                 throw new RuntimeException("Unable to access field \"" +
-                        variableElement.getSimpleName().toString() + "\" in class " +
-                        variableElement.getEnclosingElement().asType() +
-                        ", field must not be final.");
+                                           variableElement.getSimpleName().toString() + "\" in class " +
+                                           variableElement.getEnclosingElement().asType() +
+                                           ", field must not be final.");
             } else if (modifiers.contains(Modifier.PRIVATE)) {
                 throw new RuntimeException("Unable to access field \"" +
-                        variableElement.getSimpleName().toString() + "\" in class " +
-                        variableElement.getEnclosingElement().asType() +
-                        ", field must not be private.");
+                                           variableElement.getSimpleName().toString() + "\" in class " +
+                                           variableElement.getEnclosingElement().asType() +
+                                           ", field must not be private.");
             }
         }
     }
 
-    private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @NotNull Map<String, Element> variableNames) {
+    private void addToSupportedTypes(@NotNull Element element, int fieldOptions,
+                                     @NotNull Map<String, Element> variableNames) {
         if (element instanceof VariableElement) {
-            if(shouldIncludeField(element, fieldOptions)) {
+            if (shouldIncludeField(element, fieldOptions)) {
                 final VariableElement variableElement = (VariableElement) element;
                 Set<Modifier> modifiers = variableElement.getModifiers();
-                if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) && !modifiers.contains(Modifier.TRANSIENT)) {
+                if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) &&
+                    !modifiers.contains(Modifier.TRANSIENT)) {
                     checkModifiers(variableElement, modifiers);
                     if (!TypeUtils.isAbstract(element)) {
                         SupportedTypesModel.getInstance().checkAndAddExternalAdapter(variableElement);
@@ -150,7 +154,7 @@ private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @No
                 }
             }
         } else if (element instanceof TypeElement) {
-            if(null == mNestedElements) {
+            if (null == mNestedElements) {
                 mNestedElements = new ArrayList<>();
             }
             mNestedElements.add(element);
@@ -158,11 +162,12 @@ private void addToSupportedTypes(@NotNull Element element, int fieldOptions, @No
     }
 
     private boolean shouldIncludeField(@NotNull Element element, int fieldOption) {
-        switch (fieldOption){
+        switch (fieldOption) {
             case UseStag.FIELD_OPTION_NONE:
                 return false;
             case UseStag.FIELD_OPTION_SERIALIZED_NAME:
-                return element.getAnnotation(SerializedName.class) != null || element.getAnnotation(GsonAdapterKey.class) != null;
+                return element.getAnnotation(SerializedName.class) != null ||
+                       element.getAnnotation(GsonAdapterKey.class) != null;
             case UseStag.FIELD_OPTION_ALL:
                 return true;
             default:
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index 7a930d47..56e12b1c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
@@ -116,7 +116,8 @@ public Set<TypeMirror> getSupportedTypesMirror() {
 
     public void checkAndAddExternalAdapter(VariableElement variableElement) {
         //If this is of a type which is not part of this module, but generated by Stag, we should use it.
-        ExternalAdapterInfo.addExternalAdapters(mGeneratedStagFactoryName, variableElement.asType(), mExternalSupportedAdapters);
+        ExternalAdapterInfo.addExternalAdapters(mGeneratedStagFactoryName, variableElement.asType(),
+                                                mExternalSupportedAdapters);
     }
 
     public Set<ExternalAdapterInfo> getExternalSupportedAdapters() {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
index d1cc1428..e7cf6f49 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterFactoriesUtils.java
@@ -78,7 +78,7 @@ public static void writeKnownTypes(@NotNull ProcessingEnvironment processingEnv,
             knownTypesBuilder.append(knownType).append("\n");
         }
         FileGenUtils.writeToResource(filer, generatedPackageName, KNOWN_FACTORIES_RESOURCE,
-                knownTypesBuilder.toString());
+                                     knownTypesBuilder.toString());
     }
 
     private static void loadKnownTypesFromFiler(@NotNull Elements elementUtils, @NotNull Filer filer,
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index 56465111..ae2bedef 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -32,6 +32,7 @@
  * This maintains a list of type vs the known type adapters.
  */
 public final class KnownTypeAdapterUtils {
+
     @NotNull
     private static final HashMap<String, String> KNOWN_TYPE_ADAPTERS = new HashMap<>();
 
@@ -104,7 +105,9 @@ public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror)
     public static String getListInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
-        TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null && !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments().get(0) : null;
+        TypeMirror valueType = declaredType != null && declaredType.getTypeArguments() != null &&
+                               !declaredType.getTypeArguments().isEmpty() ? declaredType.getTypeArguments()
+                .get(0) : null;
         String postFix = valueType != null ? "<" + valueType.toString() + ">()" : "()";
         return "new " + SUPPORTED_COLLECTION_INFO.get(outerClassType) + postFix;
     }
@@ -119,9 +122,14 @@ public static String getListInstantiator(@NotNull TypeMirror typeMirror) {
     public static String getMapInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
         DeclaredType declaredType = typeMirror instanceof DeclaredType ? (DeclaredType) typeMirror : null;
-        TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(0) : null;
-        TypeMirror paramType = declaredType != null && declaredType.getTypeArguments() != null && declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments().get(1) : null;
-        String postFix = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
+        TypeMirror keyType = declaredType != null && declaredType.getTypeArguments() != null &&
+                             declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments()
+                .get(0) : null;
+        TypeMirror paramType = declaredType != null && declaredType.getTypeArguments() != null &&
+                               declaredType.getTypeArguments().size() == 2 ? declaredType.getTypeArguments()
+                .get(1) : null;
+        String postFix = keyType != null && paramType != null ?
+                "<" + keyType.toString() + ", " + paramType.toString() + ">()" : "()";
 
         if (outerClassType.equals(Map.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.MapInstantiator" + postFix;
@@ -132,14 +140,15 @@ public static String getMapInstantiator(@NotNull TypeMirror typeMirror) {
         } else if (outerClassType.equals(ConcurrentHashMap.class.getName())) {
             return "new com.vimeo.stag.KnownTypeAdapters.ConcurrentHashMapInstantiator" + postFix;
         } else {
-            String params = keyType != null && paramType != null ? "<" + keyType.toString() + ", " + paramType.toString() + ">" : "";
+            String params = keyType != null && paramType != null ?
+                    "<" + keyType.toString() + ", " + paramType.toString() + ">" : "";
             return "new com.google.gson.internal.ObjectConstructor<" + outerClassType + params + ">() " +
-                    "{ " +
-                    "\n@Override " +
-                    "\npublic " + outerClassType + params + " construct() {" +
-                    "\n\treturn new " + outerClassType + params + "();" +
-                    "\n}" +
-                    "}";
+                   "{ " +
+                   "\n@Override " +
+                   "\npublic " + outerClassType + params + " construct() {" +
+                   "\n\treturn new " + outerClassType + params + "();" +
+                   "\n}" +
+                   "}";
         }
     }
 
@@ -152,7 +161,9 @@ public static String getMapInstantiator(@NotNull TypeMirror typeMirror) {
     @Nullable
     public static String getNativeArrayInstantiator(@NotNull TypeMirror typeMirror) {
         String outerClassType = TypeUtils.getOuterClassType(typeMirror);
-        return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType + ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " + outerClassType + "[size]; } }";
+        return "new com.vimeo.stag.KnownTypeAdapters.PrimitiveArrayConstructor<" + outerClassType +
+               ">(){ @Override public " + outerClassType + "[] construct(int size){ return new " +
+               outerClassType + "[size]; } }";
     }
 
     /**
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index fb8c5435..1fade9d6 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -291,8 +291,9 @@ public static TypeMirror getInheritedType(@Nullable Element element) {
      */
     @NotNull
     public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull TypeMirror concreteInherited,
-                                                              @NotNull Element genericInherited,
-                                                              @NotNull Map<Element, TypeMirror> members) {
+                                                                        @NotNull Element genericInherited,
+                                                                        @NotNull
+                                                                                Map<Element, TypeMirror> members) {
 
         DebugLog.log(TAG, "Inherited concrete type: " + concreteInherited.toString());
         DebugLog.log(TAG, "Inherited generic type: " + genericInherited.asType().toString());
@@ -339,7 +340,7 @@ public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull Typ
                     map.put(member.getKey(), declaredType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                            " resolved to - " + declaredType.toString());
+                                      " resolved to - " + declaredType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -347,7 +348,7 @@ public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull Typ
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                            " resolved to - " + concreteType.toString());
+                                      " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -402,14 +403,10 @@ private static List<? extends TypeMirror> getParameterizedTypes(@NotNull TypeMir
      * @return boolean
      */
     public static boolean isSupportedPrimitive(@NotNull String type) {
-        return type.equals(long.class.getName())
-                || type.equals(double.class.getName())
-                || type.equals(boolean.class.getName())
-                || type.equals(float.class.getName())
-                || type.equals(int.class.getName())
-                || type.equals(char.class.getName())
-                || type.equals(short.class.getName())
-                || type.equals(byte.class.getName());
+        return type.equals(long.class.getName()) || type.equals(double.class.getName()) ||
+               type.equals(boolean.class.getName()) || type.equals(float.class.getName()) ||
+               type.equals(int.class.getName()) || type.equals(char.class.getName()) ||
+               type.equals(short.class.getName()) || type.equals(byte.class.getName());
     }
 
     /**
@@ -450,8 +447,8 @@ public static boolean isSupportedList(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(ArrayList.class.getName()) ||
-                outerClassType.equals(List.class.getName()) ||
-                outerClassType.equals(Collection.class.getName());
+               outerClassType.equals(List.class.getName()) ||
+               outerClassType.equals(Collection.class.getName());
     }
 
     /**
@@ -479,9 +476,9 @@ public static boolean isJsonElement(@Nullable TypeMirror type) {
             return false;
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(JsonElement.class.getName())
-                || outerClassType.equals(JsonObject.class.getName())
-                || outerClassType.equals(JsonArray.class.getName());
+        return outerClassType.equals(JsonElement.class.getName()) ||
+               outerClassType.equals(JsonObject.class.getName()) ||
+               outerClassType.equals(JsonArray.class.getName());
     }
 
     /**
@@ -496,11 +493,11 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(Map.class.getName()) ||
-                outerClassType.equals(HashMap.class.getName()) ||
-                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
-                outerClassType.equals("android.util.ArrayMap") ||
-                outerClassType.equals("android.support.v4.util.ArrayMap") ||
-                outerClassType.equals(LinkedHashMap.class.getName());
+               outerClassType.equals(HashMap.class.getName()) ||
+               outerClassType.equals(ConcurrentHashMap.class.getName()) ||
+               outerClassType.equals("android.util.ArrayMap") ||
+               outerClassType.equals("android.support.v4.util.ArrayMap") ||
+               outerClassType.equals(LinkedHashMap.class.getName());
     }
 
     /**
@@ -510,14 +507,10 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
      * @return boolean
      */
     public static boolean isSupportedNative(@NotNull String type) {
-        return isSupportedPrimitive(type)
-                || type.equals(String.class.getName())
-                || type.equals(Long.class.getName())
-                || type.equals(Integer.class.getName())
-                || type.equals(Boolean.class.getName())
-                || type.equals(Double.class.getName())
-                || type.equals(Float.class.getName())
-                || type.equals(Number.class.getName());
+        return isSupportedPrimitive(type) || type.equals(String.class.getName()) ||
+               type.equals(Long.class.getName()) || type.equals(Integer.class.getName()) ||
+               type.equals(Boolean.class.getName()) || type.equals(Double.class.getName()) ||
+               type.equals(Float.class.getName()) || type.equals(Number.class.getName());
     }
 
     /**
@@ -525,6 +518,7 @@ public static boolean isSupportedNative(@NotNull String type) {
      */
     @NotNull
     public static TypeMirror getArrayInnerType(@NotNull TypeMirror type) {
-        return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments().get(0);
+        return (type instanceof ArrayType) ? ((ArrayType) type).getComponentType() : ((DeclaredType) type).getTypeArguments()
+                .get(0);
     }
 }
\ No newline at end of file
diff --git a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
index 2d6369c0..258f8fe0 100644
--- a/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
+++ b/stag-library/src/main/java/com/vimeo/stag/GsonAdapterKey.java
@@ -29,7 +29,7 @@
 /**
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
- *
+ * <p>
  * We will be removing this with v2.1. Please use Class level annotation UserStag
  * or SerializedName as required
  */
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index bd6094d0..e465d7f6 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -176,15 +176,23 @@ public void write(JsonWriter out, Double value) throws IOException {
         }
     }.nullSafe();
 
-    public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(INTEGER, new ArrayListInstantiator<Integer>());
-    public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(LONG, new ArrayListInstantiator<Long>());
-    public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiator<Double>());
-    public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(SHORT, new ArrayListInstantiator<Short>());
-    public static final TypeAdapter<ArrayList<Float>> FLOAT_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(FLOAT, new ArrayListInstantiator<Float>());
-    public static final TypeAdapter<ArrayList<Boolean>> BOOLEAN_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(TypeAdapters.BOOLEAN, new ArrayListInstantiator<Boolean>());
-    public static final TypeAdapter<ArrayList<Byte>> BYTE_ARRAY_LIST_ADAPTER = new ListTypeAdapter<>(BYTE, new ArrayListInstantiator<Byte>());
+    public static final TypeAdapter<ArrayList<Integer>> INTEGER_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(INTEGER, new ArrayListInstantiator<Integer>());
+    public static final TypeAdapter<ArrayList<Long>> LONG_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(LONG, new ArrayListInstantiator<Long>());
+    public static final TypeAdapter<ArrayList<Double>> DOUBLE_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(DOUBLE, new ArrayListInstantiator<Double>());
+    public static final TypeAdapter<ArrayList<Short>> SHORT_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(SHORT, new ArrayListInstantiator<Short>());
+    public static final TypeAdapter<ArrayList<Float>> FLOAT_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(FLOAT, new ArrayListInstantiator<Float>());
+    public static final TypeAdapter<ArrayList<Boolean>> BOOLEAN_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(TypeAdapters.BOOLEAN, new ArrayListInstantiator<Boolean>());
+    public static final TypeAdapter<ArrayList<Byte>> BYTE_ARRAY_LIST_ADAPTER =
+            new ListTypeAdapter<>(BYTE, new ArrayListInstantiator<Byte>());
 
     public interface PrimitiveArrayConstructor<T> {
+
         T[] construct(int size);
     }
 
@@ -194,10 +202,12 @@ public interface PrimitiveArrayConstructor<T> {
      * given below
      */
     public static final class ArrayTypeAdapter<T> extends TypeAdapter<T[]> {
+
         TypeAdapter<T> mValueTypeAdapter;
         PrimitiveArrayConstructor<T> mObjectCreator;
 
-        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayConstructor<T> instanceCreator) {
+        public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter,
+                                PrimitiveArrayConstructor<T> instanceCreator) {
             this.mValueTypeAdapter = valueTypeAdapter;
             this.mObjectCreator = instanceCreator;
         }
@@ -205,7 +215,7 @@ public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter, PrimitiveArrayConstruct
         @Override
         public void write(JsonWriter writer, T[] value) throws IOException {
             writer.beginArray();
-            if(null != value) {
+            if (null != value) {
                 for (T item : value) {
                     mValueTypeAdapter.write(writer, item);
                 }
@@ -368,6 +378,7 @@ public static short[] read(@NotNull JsonReader reader) throws IOException {
             return result;
         }
     }
+
     /**
      * Type Adapter for float[] type. This can be directly accessed to read and write
      */
@@ -467,7 +478,8 @@ public static byte[] read(@NotNull JsonReader reader) throws IOException {
         }
     }
 
-    private static final TypeAdapter<String> STRING_NULL_SAFE_TYPE_ADAPTER = com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe();
+    private static final TypeAdapter<String> STRING_NULL_SAFE_TYPE_ADAPTER =
+            com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe();
 
     /**
      * Type Adapter for char[] type. This can be directly accessed to read and write
@@ -499,6 +511,7 @@ public static char[] read(@NotNull JsonReader reader) throws IOException {
      * Default Instantiator for List, by default it will create the Map of {@link ArrayList} type
      */
     public static final class ListInstantiator<V> implements ObjectConstructor<List<V>> {
+
         @Override
         public List<V> construct() {
             return new ArrayList<>();
@@ -509,6 +522,7 @@ public List<V> construct() {
      * Instantiator for {@link Collection}
      */
     public static final class CollectionInstantiator<V> implements ObjectConstructor<Collection<V>> {
+
         @Override
         public Collection<V> construct() {
             return new ArrayList<>();
@@ -519,6 +533,7 @@ public Collection<V> construct() {
      * Instantiator for {@link ArrayList}
      */
     public static final class ArrayListInstantiator<V> implements ObjectConstructor<ArrayList<V>> {
+
         @Override
         public ArrayList<V> construct() {
             return new ArrayList<>();
@@ -529,6 +544,7 @@ public ArrayList<V> construct() {
      * Instantiator for {@link HashMap}
      */
     public static final class HashMapInstantiator<K, V> implements ObjectConstructor<HashMap<K, V>> {
+
         @Override
         public HashMap<K, V> construct() {
             return new HashMap<>();
@@ -538,7 +554,9 @@ public HashMap<K, V> construct() {
     /**
      * Instantiator for {@link ConcurrentHashMap}
      */
-    public static final class ConcurrentHashMapInstantiator<K, V> implements ObjectConstructor<ConcurrentHashMap<K, V>> {
+    public static final class ConcurrentHashMapInstantiator<K, V>
+            implements ObjectConstructor<ConcurrentHashMap<K, V>> {
+
         @Override
         public ConcurrentHashMap<K, V> construct() {
             return new ConcurrentHashMap<>();
@@ -548,7 +566,9 @@ public ConcurrentHashMap<K, V> construct() {
     /**
      * Instantiator for {@link LinkedHashMap}
      */
-    public static final class LinkedHashMapInstantiator<K, V> implements ObjectConstructor<LinkedHashMap<K, V>> {
+    public static final class LinkedHashMapInstantiator<K, V>
+            implements ObjectConstructor<LinkedHashMap<K, V>> {
+
         @Override
         public LinkedHashMap<K, V> construct() {
             return new LinkedHashMap<>();
@@ -559,6 +579,7 @@ public LinkedHashMap<K, V> construct() {
      * Default Instantiator for Maps, by default it will create the Map of {@link LinkedHashMap} type
      */
     public static final class MapInstantiator<K, V> implements ObjectConstructor<Map<K, V>> {
+
         @Override
         public Map<K, V> construct() {
             return new LinkedHashMap<>();
@@ -581,7 +602,7 @@ public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> obj
         @Override
         public void write(JsonWriter writer, T value) throws IOException {
             writer.beginArray();
-            if(null != value) {
+            if (null != value) {
                 for (V item : value) {
                     valueTypeAdapter.write(writer, item);
                 }
@@ -616,11 +637,13 @@ public T read(JsonReader reader) throws IOException {
      * used to instantiate maps of particular types eg, {@link HashMap} {@link LinkedHashMap} etc
      */
     public static final class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
+
         private ObjectConstructor<T> objectConstructor;
         private TypeAdapter<V> valueTypeAdapter;
         private TypeAdapter<K> keyTypeAdapter;
 
-        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> objectConstructor) {
+        public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter,
+                              ObjectConstructor<T> objectConstructor) {
             this.keyTypeAdapter = keyTypeAdapter;
             this.valueTypeAdapter = valueTypeAdapter;
             this.objectConstructor = objectConstructor;
@@ -628,7 +651,7 @@ public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAda
 
         @Override
         public void write(JsonWriter writer, T value) throws IOException {
-            if(null == value) {
+            if (null == value) {
                 writer.nullValue();
                 return;
             }
@@ -792,7 +815,8 @@ public void write(JsonWriter out, Object value) throws IOException {
         }
     }
 
-    public static final TypeAdapter<JsonElement> JSON_ELEMENT_TYPE_ADAPTER = com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT.nullSafe();
+    public static final TypeAdapter<JsonElement> JSON_ELEMENT_TYPE_ADAPTER =
+            com.google.gson.internal.bind.TypeAdapters.JSON_ELEMENT.nullSafe();
 
     public static final TypeAdapter<JsonObject> JSON_OBJECT_TYPE_ADAPTER = new TypeAdapter<JsonObject>() {
         @Override
@@ -820,19 +844,21 @@ public JsonArray read(JsonReader in) throws IOException {
         }
     }.nullSafe();
 
-    public static final TypeAdapter<JsonPrimitive> JSON_PRIMITIVE_TYPE_ADAPTER = new TypeAdapter<JsonPrimitive>() {
+    public static final TypeAdapter<JsonPrimitive> JSON_PRIMITIVE_TYPE_ADAPTER =
+            new TypeAdapter<JsonPrimitive>() {
 
-        @Override
-        public void write(JsonWriter out, JsonPrimitive value) throws IOException {
-            JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
-        }
+                @Override
+                public void write(JsonWriter out, JsonPrimitive value) throws IOException {
+                    JSON_ELEMENT_TYPE_ADAPTER.write(out, value);
+                }
 
-        @Override
-        public JsonPrimitive read(JsonReader in) throws IOException {
-            JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
-            return jsonElement != null && jsonElement.isJsonPrimitive() ? jsonElement.getAsJsonPrimitive() : null;
-        }
-    }.nullSafe();
+                @Override
+                public JsonPrimitive read(JsonReader in) throws IOException {
+                    JsonElement jsonElement = JSON_ELEMENT_TYPE_ADAPTER.read(in);
+                    return jsonElement != null &&
+                           jsonElement.isJsonPrimitive() ? jsonElement.getAsJsonPrimitive() : null;
+                }
+            }.nullSafe();
 
     public static final TypeAdapter<JsonNull> JSON_NULL_TYPE_ADAPTER = new TypeAdapter<JsonNull>() {
 
diff --git a/stag-library/src/main/java/com/vimeo/stag/UseStag.java b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
index f4ab35c6..a57de669 100644
--- a/stag-library/src/main/java/com/vimeo/stag/UseStag.java
+++ b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
@@ -27,14 +27,16 @@
 import java.lang.annotation.Target;
 
 /**
- * Use this annotation to tell Stag that all the member variables of the class should be processed.
+ * Use this annotation to tell Stag that all the member variables
+ * of the class should be processed.
  * <p/>
- * If the class is annotated, Stag will generate a TypeAdapter for that class.
- * Stag does not generate TypeAdapters for abstract classes.
+ * If the class is annotated, Stag will generate a TypeAdapter for
+ * that class. Stag does not generate TypeAdapters for abstract classes.
  * <p/>
  */
 @Target({ElementType.TYPE})
 public @interface UseStag {
+
     /**
      * Will serialize/de-serialize all member variables which are not static
      * or transient

From c27c225f5d8c48ebe8c31215550b4580dc2b75d7 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:36:07 -0500
Subject: [PATCH 141/159] Renaming the field options enum, adding in the gson
 adapter key class name to the stag processor

Gson adapter key was added back to the stag processor for temporary
backwards compatibility
---
 README.md                                     | 10 ++--
 .../sample/model/FieldOptionAllExample.java   |  3 +-
 .../sample/model/FieldOptionNoneExample.java  |  3 +-
 .../model/FieldOptionsSerializedName.java     |  3 +-
 .../model/FieldOptionsSerializedName2.java    |  3 +-
 .../model/FieldOptionsSerializedName3.java    |  3 +-
 .../vimeo/stag/processor/StagProcessor.java   |  2 +-
 .../generators/model/AnnotatedClass.java      | 17 +++----
 .../src/main/java/com/vimeo/stag/UseStag.java | 46 +++++++++++--------
 9 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 1bb5c29c..10289d41 100644
--- a/README.md
+++ b/README.md
@@ -88,14 +88,14 @@ Stag supports class level annotation `@UseStag` which processes all the fields f
 
 `@UseStag` has three different variants:
 
- - `@UseStag(UseStag.FIELD_OPTION_ALL)` : Will serialize/de-serialize all member variables which are not static or transient
- - `@UseStag(UseStag.FIELD_OPTION_NONE)` : Will skip serialization and deserialization for all member variables
- - `@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)` : Will Serialize or Deserialize Fields only which are annotated with SerializedName or GsonAdapterKey(deprecated)
+ - `@UseStag(FieldOption.ALL)` : Will serialize/de-serialize all member variables which are not static or transient
+ - `@UseStag(FieldOption.NONE)` : Will skip serialization and deserialization for all member variables. Only member variables inherited from annotated classes will be included.
+ - `@UseStag(FieldOption.SERIALIZED_NAME)` : Will Serialize or Deserialize Fields only which are annotated with `SerializedName` or `GsonAdapterKey` (deprecated).
 
 #### 2. `@SerializedName("key")` Support
 
 Similar to GSON, you can use the`@SerializedName` annotation to provide a different JSON name to a member field. It also supports alternate name feature of the `@SerializedName` annotation.
- `@SerializedName("name')` or `@SerializedName(value = "name", alternate = {"name1", "name2"})`.
+ `@SerializedName("name")` or `@SerializedName(value = "name", alternate = {"name1", "name2"})`.
 
 #### 3. Cross Module Support
 
@@ -115,7 +115,7 @@ Last but not the least, Stag is almost in parity with GSON.
 6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
 7. You're done!
 
-<b>NOTE</b> : ``@GsonAdapterKey` has been deprecated and will be removed in future releases. It is advisable to migrate to ``@SerializedName` and ``@UseStag` annotations.
+<b>NOTE</b> : `@GsonAdapterKey` has been deprecated and will be removed in future releases. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
index 3cfb7561..6f15ff89 100644
--- a/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionAllExample.java
@@ -2,11 +2,12 @@
 
 
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 
 /**
  * Model class which uses FIELD_OPTION_ALL explicitly
  */
-@UseStag(UseStag.FIELD_OPTION_ALL)
+@UseStag(FieldOption.ALL)
 public class FieldOptionAllExample {
 
     public int simpleInt;
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
index 3ef1ab48..ab09fc80 100644
--- a/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionNoneExample.java
@@ -2,11 +2,12 @@
 
 
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 
 /**
  * Model class to demonstrate the usage of FIELD_OPTION_NONE
  */
-@UseStag(UseStag.FIELD_OPTION_NONE)
+@UseStag(FieldOption.NONE)
 public class FieldOptionNoneExample {
 
     public int simpleInt;
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
index 456c8db4..dff4715e 100644
--- a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName.java
@@ -3,11 +3,12 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 
 /**
  * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with SerializedName
  */
-@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+@UseStag(FieldOption.SERIALIZED_NAME)
 public class FieldOptionsSerializedName {
 
     public int simpleInt;
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
index 2339ea6a..1f21ed62 100644
--- a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName2.java
@@ -4,11 +4,12 @@
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 
 /**
  * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with SerializedName & GsonAdapterKey
  */
-@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+@UseStag(FieldOption.SERIALIZED_NAME)
 public class FieldOptionsSerializedName2 {
 
     public int simpleInt;
diff --git a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
index b2718d62..acdab1ea 100644
--- a/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
+++ b/sample/src/main/java/com/vimeo/sample/model/FieldOptionsSerializedName3.java
@@ -3,11 +3,12 @@
 
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 
 /**
  * Model class to demonstrate the usage of FIELD_OPTION_SERIALIZED_NAME with GsonAdapterKey
  */
-@UseStag(UseStag.FIELD_OPTION_SERIALIZED_NAME)
+@UseStag(FieldOption.SERIALIZED_NAME)
 public class FieldOptionsSerializedName3 {
 
     public int simpleInt;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
index b72acff4..f4226f19 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/StagProcessor.java
@@ -58,7 +58,7 @@
 
 
 @AutoService(Processor.class)
-@SupportedAnnotationTypes("com.vimeo.stag.UseStag")
+@SupportedAnnotationTypes(value = {"com.vimeo.stag.UseStag", "com.vimeo.stag.GsonAdapterKey"})
 @SupportedOptions(value = {"stagGeneratedPackageName"})
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
 public final class StagProcessor extends AbstractProcessor {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
index 3f3da795..c13d980e 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/AnnotatedClass.java
@@ -26,6 +26,7 @@
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
+import com.vimeo.stag.UseStag.FieldOption;
 import com.vimeo.stag.processor.StagProcessor;
 import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.TypeUtils;
@@ -67,7 +68,7 @@ public class AnnotatedClass {
         TypeMirror inheritedType = TypeUtils.getInheritedType(element);
 
         UseStag useStag = element.getAnnotation(UseStag.class);
-        int fieldOptions = useStag == null ? UseStag.FIELD_OPTION_ALL : useStag.value();
+        FieldOption fieldOption = useStag == null ? FieldOption.ALL : useStag.value();
 
         mMemberVariables = new LinkedHashMap<>();
 
@@ -91,7 +92,7 @@ public class AnnotatedClass {
         }
 
         for (Element enclosedElement : element.getEnclosedElements()) {
-            addToSupportedTypes(enclosedElement, fieldOptions, variableNames);
+            addToSupportedTypes(enclosedElement, fieldOption, variableNames);
         }
 
     }
@@ -134,10 +135,10 @@ private static void checkModifiers(VariableElement variableElement, Set<Modifier
         }
     }
 
-    private void addToSupportedTypes(@NotNull Element element, int fieldOptions,
+    private void addToSupportedTypes(@NotNull Element element, FieldOption fieldOption,
                                      @NotNull Map<String, Element> variableNames) {
         if (element instanceof VariableElement) {
-            if (shouldIncludeField(element, fieldOptions)) {
+            if (shouldIncludeField(element, fieldOption)) {
                 final VariableElement variableElement = (VariableElement) element;
                 Set<Modifier> modifiers = variableElement.getModifiers();
                 if (!modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.STATIC) &&
@@ -161,14 +162,14 @@ private void addToSupportedTypes(@NotNull Element element, int fieldOptions,
         }
     }
 
-    private boolean shouldIncludeField(@NotNull Element element, int fieldOption) {
+    private boolean shouldIncludeField(@NotNull Element element, FieldOption fieldOption) {
         switch (fieldOption) {
-            case UseStag.FIELD_OPTION_NONE:
+            case NONE:
                 return false;
-            case UseStag.FIELD_OPTION_SERIALIZED_NAME:
+            case SERIALIZED_NAME:
                 return element.getAnnotation(SerializedName.class) != null ||
                        element.getAnnotation(GsonAdapterKey.class) != null;
-            case UseStag.FIELD_OPTION_ALL:
+            case ALL:
                 return true;
             default:
                 throw new RuntimeException("Unknown field option provided for class " + mElement.asType());
diff --git a/stag-library/src/main/java/com/vimeo/stag/UseStag.java b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
index a57de669..f978f4fe 100644
--- a/stag-library/src/main/java/com/vimeo/stag/UseStag.java
+++ b/stag-library/src/main/java/com/vimeo/stag/UseStag.java
@@ -23,6 +23,10 @@
  */
 package com.vimeo.stag;
 
+import com.google.gson.annotations.SerializedName;
+
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
@@ -37,28 +41,32 @@
 @Target({ElementType.TYPE})
 public @interface UseStag {
 
-    /**
-     * Will serialize/de-serialize all member variables which are not static
-     * or transient
-     */
-    int FIELD_OPTION_ALL = 0;
-
-    /**
-     * Will skip serialization and deserialization for all member variables
-     */
-    int FIELD_OPTION_NONE = 1;
-
+    enum FieldOption {
+        /**
+         * Will serialize/de-serialize all member variables
+         * which are not static or transient.
+         */
+        ALL,
+        /**
+         * Will skip serialization and deserialization
+         * for all member variables. Only inherited members
+         * will be included.
+         */
+        NONE,
+        /**
+         * Will Serialize or Deserialize Fields only which are
+         * annotated with {@link SerializedName} or
+         * {@link GsonAdapterKey} (deprecated).
+         */
+        SERIALIZED_NAME
+    }
 
-    /**
-     * Will Serialize or Deserialize Fields only which are annotated with
-     * SerializedName or GsonAdapterKey(deprecated)
-     */
-    int FIELD_OPTION_SERIALIZED_NAME = 3;
 
     /**
-     * field option chosen
+     * The chosen field option.
      *
-     * @return the .
+     * @return the field option specified, or the default
+     * if none is specified.
      */
-    int value() default FIELD_OPTION_ALL;
+    @NotNull FieldOption value() default FieldOption.ALL;
 }
\ No newline at end of file

From f75a5ba6abe8eadd44c75c2d7be78a366df2d91d Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:38:25 -0500
Subject: [PATCH 142/159] Make deprecation message a little bigger

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 10289d41..e58fd1ef 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Last but not the least, Stag is almost in parity with GSON.
 6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
 7. You're done!
 
-<b>NOTE</b> : `@GsonAdapterKey` has been deprecated and will be removed in future releases. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
+##### NOTE: `@GsonAdapterKey` has been deprecated and will be removed in a future release. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 

From ebc35b8a854e736661644cff6850ee98896fbeed Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:39:31 -0500
Subject: [PATCH 143/159] typography fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e58fd1ef..fc8534dc 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Last but not the least, Stag is almost in parity with GSON.
 6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
 7. You're done!
 
-##### NOTE: `@GsonAdapterKey` has been deprecated and will be removed in a future release. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
+##### <b>NOTE</b>: `@GsonAdapterKey` has been deprecated and will be removed in a future release. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 

From 5b5c7ca6cefd85018dd7ad792a8a43ddd3700925 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:47:31 -0500
Subject: [PATCH 144/159] Lint cleanup

---
 README.md                                     |  2 +-
 .../generators/ExternalAdapterInfo.java       | 21 +++++++++----------
 .../processor/generators/StagGenerator.java   | 16 +++++++-------
 .../generators/TypeAdapterGenerator.java      |  6 +++---
 .../TypeTokenConstantsGenerator.java          |  3 +++
 .../utils/KnownTypeAdapterUtils.java          |  3 +++
 .../vimeo/stag/processor/utils/TypeUtils.java | 10 ++-------
 .../stag/processor/dummy/DummyMapClass.java   |  2 +-
 8 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index fc8534dc..b0d9b207 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Last but not the least, Stag is almost in parity with GSON.
 6. Register the `Stag.Factory` with Gson when you create your Gson instance: `Gson gson = new GsonBuilder().registerTypeAdapterFactory(new Stag.Factory()).create();`
 7. You're done!
 
-##### <b>NOTE</b>: `@GsonAdapterKey` has been deprecated and will be removed in a future release. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
+<b>NOTE</b>: `@GsonAdapterKey` has been deprecated and will be removed in a future release. It is advisable to migrate to `@SerializedName` and `@UseStag` annotations.
 
 See the [example below](#example) or the [sample app](sample) to get more info on how to use Stag.
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index 7c2ec0f4..a0b5ad07 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -31,23 +31,22 @@ public class ExternalAdapterInfo {
     @NotNull
     private final ExecutableElement mAdapterConstructor;
 
-    public ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement adapterTypeElement,
-                               @NotNull ExecutableElement adapterConstructor) {
-        this.mExternalClassType = typeElement;
-        this.mAdapterType = adapterTypeElement;
-        this.mAdapterConstructor = adapterConstructor;
+    private ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement adapterTypeElement,
+                                @NotNull ExecutableElement adapterConstructor) {
+        mExternalClassType = typeElement;
+        mAdapterType = adapterTypeElement;
+        mAdapterConstructor = adapterConstructor;
     }
 
     /**
      * Add adapters for the external models.
-     *
-     * @param stagFactoryGeneratedName stagFactoryGeneratedName
+     *  @param stagFactoryGeneratedName stagFactoryGeneratedName
      * @param typeMirror               typeMirror
-     * @param externalAdapterInfos     externalAdapterInfos
+     * @param externalAdapterInfoSet     externalAdapterInfos
      */
     public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
                                            @NotNull TypeMirror typeMirror,
-                                           @NotNull Set<ExternalAdapterInfo> externalAdapterInfos) {
+                                           @NotNull Set<ExternalAdapterInfo> externalAdapterInfoSet) {
         if (!TypeUtils.isSupportedPrimitive(typeMirror.toString()) && typeMirror instanceof DeclaredType) {
             DeclaredType declaredType = (DeclaredType) typeMirror;
             Element typeElement = declaredType.asElement();
@@ -77,7 +76,7 @@ public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
                                             new ExternalAdapterInfo(typeElement, adapterTypeElement,
                                                                     executableElement);
                                     sCheckedClasses.add(classAdapterName);
-                                    externalAdapterInfos.add(result);
+                                    externalAdapterInfoSet.add(result);
                                 }
                             }
                         }
@@ -87,7 +86,7 @@ public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
             List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
             if (null != typeArguments) {
                 for (TypeMirror typeArgument : typeArguments) {
-                    addExternalAdapters(stagFactoryGeneratedName, typeArgument, externalAdapterInfos);
+                    addExternalAdapters(stagFactoryGeneratedName, typeArgument, externalAdapterInfoSet);
                 }
             }
         }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
index 001e78cf..93266e59 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -129,13 +129,13 @@ public StagGenerator(@NotNull String generatedPackageName, @NotNull Filer filer,
                     adapterFactoryMethodName = classInfo.getTypeAdapterClassName();
                     ClassInfo clashingClass = knownFieldNames.get(adapterFactoryMethodName);
                     if (null != clashingClass) {
-                        List<ClassInfo> classInfos = clashingClassNames.get(adapterFactoryMethodName);
-                        if (null == classInfos) {
-                            classInfos = new ArrayList<>();
-                            classInfos.add(clashingClass);
-                            clashingClassNames.put(adapterFactoryMethodName, classInfos);
+                        List<ClassInfo> classInfoList = clashingClassNames.get(adapterFactoryMethodName);
+                        if (null == classInfoList) {
+                            classInfoList = new ArrayList<>();
+                            classInfoList.add(clashingClass);
+                            clashingClassNames.put(adapterFactoryMethodName, classInfoList);
                         }
-                        classInfos.add(classInfo);
+                        classInfoList.add(classInfo);
                     } else {
                         knownFieldNames.put(adapterFactoryMethodName, classInfo);
                     }
@@ -528,8 +528,8 @@ ExternalAdapterInfo getExternalSupportedAdapter(@NotNull TypeMirror fieldType) {
 
     static class GenericClassInfo {
 
-        int mNumArguments;
-        boolean mHasUnknownVarTypeFields;
+        final int mNumArguments;
+        final boolean mHasUnknownVarTypeFields;
 
         GenericClassInfo(int numArguments, boolean hasUnknownVarTypeFields) {
             mNumArguments = numArguments;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
index 223c502e..e6174c71 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java
@@ -169,7 +169,7 @@ private static String getTypeAdapterCode(@NotNull TypeMirror fieldType,
                              KnownTypeAdapterUtils.getListInstantiator(fieldType) + ")";
                 } else {
                     /**
-                     * If the fieldType is of Known parameterized type, recursively call the function to generate the typeadapter code.
+                     * If the fieldType is of Known parameterized type, recursively call the function to generate the type adapter code.
                      */
                     TypeMirror outerClass = declaredFieldType.asElement().asType();
                     sGsonVariableUsed = true;
@@ -418,7 +418,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
                     arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " +
                                 fieldType.toString() + ">";
                 } else {
-                    //If the map does not have any type arguments, use Object as typeparams in this case
+                    //If the map does not have any type arguments, use Object as type params in this case
                     keyAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                     valueAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 }
@@ -502,7 +502,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
         } else {
 
             /*
-             * If the fieldType is parameterized, generate the typeadapter in the constructor itself.
+             * If the fieldType is parameterized, generate the type adapter in the constructor itself.
              */
             String fieldName = adapterFieldInfo.getFieldName(fieldType);
             if (null == fieldName) {
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
index 81ae1726..cc196a5c 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeTokenConstantsGenerator.java
@@ -137,5 +137,8 @@ private static class TypeTokenInfo {
         TypeMirror mTypeMirror;
         String mFieldName;
         String mMethodName;
+
+        TypeTokenInfo() {
+        }
     }
 }
\ No newline at end of file
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
index ae2bedef..d990a8a6 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtils.java
@@ -90,6 +90,9 @@ public final class KnownTypeAdapterUtils {
         SUPPORTED_PRIMITIVE_ARRAY.put(byte[].class.getSimpleName(), "com.vimeo.stag.KnownTypeAdapters.PrimitiveByteArrayAdapter");
     }
 
+    private KnownTypeAdapterUtils() {
+    }
+
     @Nullable
     public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror) {
         return KNOWN_TYPE_ADAPTERS.get(typeMirror.toString());
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index 1fade9d6..fb896f5a 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -212,7 +212,7 @@ public static boolean isConcreteType(@NotNull TypeMirror typeMirror) {
      * Determines where the the type mirrors contains type var params or not
      *
      * @param typeMirror the element to check.
-     * @return true if it contains typevar
+     * @return true if it contains type variables
      */
     public static boolean containsTypeVarParams(@NotNull TypeMirror typeMirror) {
         if (typeMirror.getKind() == TypeKind.TYPEVAR) {
@@ -426,13 +426,7 @@ public static boolean isNativeArray(@NotNull TypeMirror type) {
      * @return boolean
      */
     public static boolean isSupportedCollection(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        if (isNativeArray(type)) {
-            return true;
-        }
-        return isSupportedList(type);
+        return type != null && (isNativeArray(type) || isSupportedList(type));
     }
 
     /**
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.java
index e7d77277..5ec84615 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.java
@@ -67,7 +67,7 @@ public Object remove(Object o) {
     }
 
     @Override
-    public void putAll(Map map) {
+    public void putAll(@NotNull Map map) {
 
     }
 

From fd866c17527c392cd694abe58e07a0d66ee48503 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 13 Jan 2017 17:56:56 -0500
Subject: [PATCH 145/159] Adding in example for non null fields

---
 README.md                                              | 10 ++++------
 .../java/com/vimeo/sample/model/AccessModifiers.java   |  5 +++--
 sample/src/main/java/com/vimeo/sample/model1/Data.java |  5 +++++
 .../src/main/java/com/vimeo/sample/model1/Video.java   |  6 +++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b0d9b207..85d47732 100644
--- a/README.md
+++ b/README.md
@@ -137,20 +137,18 @@ public class Deer {
     int mPoints;     // mPoints = json value with key "points"
     
     @SerializedName("weight")
-    float mWeight;     // mWeight = json value with key "weight"
+    float mWeight;   // mWeight = json value with key "weight"
 }
 
 @UseStag
 public class Herd {
 
-    @NonNull                    // add NonNull annotation to throw an exception if the field is null
+    @NonNull                     // add NonNull annotation to throw an exception if the field is null
     @SerializedName("data_list")
-    ArrayList<Deer> data_list;  // data_list = json value with key "data_list"
+    ArrayList<Deer> data;        // data_list = json value with key "data_list"
     
-    @SerializedName("data_list_copy")
-    List<Deer> data_list_copy;  // data_list_copy = json value with key "data_list_copy"
+    List<Deer> data_list_copy;   // data_list_copy = json value with key "data_list_copy"
     
-    @SerializedName("data_map")
     Map<String, Deer> data_map;  // data_map = json value with key "data_map"
 }
 
diff --git a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
index d8e04ee6..398b57ca 100644
--- a/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
+++ b/sample/src/main/java/com/vimeo/sample/model/AccessModifiers.java
@@ -39,11 +39,12 @@ public class AccessModifiers {
 
     String defaultModifier;
 
+    // Do not include static non-final fields in the TypeAdapter
     private static String STATIC_STRING = "static_string";
 
-    //do not include fields of these types in TypeAdapter
+    // Do not include static final fields in the TypeAdapter
     public static final String DEMO = "demo";
 
-    //do not serialize/deserialize transient fields
+    // Do not serialize/deserialize transient fields
     transient String transientField;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Data.java b/sample/src/main/java/com/vimeo/sample/model1/Data.java
index a049797a..06c4ff3f 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Data.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Data.java
@@ -1,5 +1,8 @@
 package com.vimeo.sample.model1;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 /**
@@ -7,9 +10,11 @@
  */
 public class Data {
 
+    @NonNull
     @SerializedName("size")
     public int size;
 
+    @Nullable
     @SerializedName("name")
     public String name;
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Video.java b/sample/src/main/java/com/vimeo/sample/model1/Video.java
index 86dab451..5f028e17 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Video.java
@@ -1,8 +1,9 @@
 package com.vimeo.sample.model1;
 
+import android.support.annotation.NonNull;
+
 import com.google.gson.annotations.SerializedName;
 import com.vimeo.sample.model.User;
-import com.vimeo.stag.GsonAdapterKey;
 import com.vimeo.stag.UseStag;
 
 /**
@@ -15,12 +16,15 @@
 @UseStag
 public class Video {
 
+    @NonNull
     @SerializedName("user")
     public User mUser;
 
+    @NonNull
     @SerializedName("link")
     public String mLink;
 
+    @NonNull
     @SerializedName("mData")
     public Data mData;
 }
\ No newline at end of file

From c017599c34b629452a3e39b9c70e8a522767c3ed Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Tue, 17 Jan 2017 11:15:00 -0500
Subject: [PATCH 146/159] Update sample app name so it's easily discernible in
 the app drawer

---
 sample/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 1ad8c299..9e2a6bbc 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Sample</string>
+    <string name="app_name">Stag Sample</string>
 </resources>

From 3ad307dde2d01fa1194594d6863df1a404ecd23e Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 18 Jan 2017 09:36:56 -0500
Subject: [PATCH 147/159] Cleaning up known type adapters code

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index e465d7f6..a84938fd 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -63,6 +63,7 @@
  * is used to read and write the values, and the ObjectConstructor tells the type of List to be instantiated. This will also support the scenario
  * where we have a nested list. In that case the valueTypeAdapter will be again a {@link ListTypeAdapter} with its value TypeAdapter
  */
+@SuppressWarnings({"unused", "WeakerAccess"})
 public final class KnownTypeAdapters {
 
     private KnownTypeAdapters() {
@@ -478,7 +479,7 @@ public static byte[] read(@NotNull JsonReader reader) throws IOException {
         }
     }
 
-    private static final TypeAdapter<String> STRING_NULL_SAFE_TYPE_ADAPTER =
+    static final TypeAdapter<String> STRING_NULL_SAFE_TYPE_ADAPTER =
             com.google.gson.internal.bind.TypeAdapters.STRING.nullSafe();
 
     /**
@@ -591,8 +592,8 @@ public Map<K, V> construct() {
      */
     public static final class ListTypeAdapter<V, T extends Collection<V>> extends TypeAdapter<T> {
 
-        private TypeAdapter<V> valueTypeAdapter;
-        private ObjectConstructor<T> objectConstructor;
+        private final TypeAdapter<V> valueTypeAdapter;
+        private final ObjectConstructor<T> objectConstructor;
 
         public ListTypeAdapter(TypeAdapter<V> valueTypeAdapter, ObjectConstructor<T> objectConstructor) {
             this.valueTypeAdapter = valueTypeAdapter;
@@ -638,9 +639,9 @@ public T read(JsonReader reader) throws IOException {
      */
     public static final class MapTypeAdapter<K, V, T extends Map<K, V>> extends TypeAdapter<T> {
 
-        private ObjectConstructor<T> objectConstructor;
-        private TypeAdapter<V> valueTypeAdapter;
-        private TypeAdapter<K> keyTypeAdapter;
+        private final ObjectConstructor<T> objectConstructor;
+        private final TypeAdapter<V> valueTypeAdapter;
+        private final TypeAdapter<K> keyTypeAdapter;
 
         public MapTypeAdapter(TypeAdapter<K> keyTypeAdapter, TypeAdapter<V> valueTypeAdapter,
                               ObjectConstructor<T> objectConstructor) {
@@ -761,36 +762,34 @@ public Object read(JsonReader in) throws IOException {
             JsonToken token = in.peek();
             switch (token) {
                 case BEGIN_ARRAY:
-                    List<Object> list = new ArrayList<Object>();
+                    List<Object> list = new ArrayList<>();
                     in.beginArray();
                     while (in.hasNext()) {
                         list.add(read(in));
                     }
                     in.endArray();
                     return list;
-
                 case BEGIN_OBJECT:
-                    Map<String, Object> map = new LinkedTreeMap<String, Object>();
+                    Map<String, Object> map = new LinkedTreeMap<>();
                     in.beginObject();
                     while (in.hasNext()) {
                         map.put(in.nextName(), read(in));
                     }
                     in.endObject();
                     return map;
-
                 case STRING:
                     return in.nextString();
-
                 case NUMBER:
                     return in.nextDouble();
-
                 case BOOLEAN:
                     return in.nextBoolean();
-
                 case NULL:
                     in.nextNull();
                     return null;
-
+                case NAME:
+                case END_OBJECT:
+                case END_ARRAY:
+                case END_DOCUMENT:
                 default:
                     throw new IllegalStateException();
             }

From 5b89139fa30f2313d19216111e4afb3f0d081cee Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Sat, 21 Jan 2017 09:45:30 -0500
Subject: [PATCH 148/159] Update sample to target sdk 25

---
 sample-model/build.gradle | 8 ++++----
 sample/build.gradle       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sample-model/build.gradle b/sample-model/build.gradle
index dbc4a386..add62c8e 100644
--- a/sample-model/build.gradle
+++ b/sample-model/build.gradle
@@ -12,12 +12,12 @@ buildscript {
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -31,7 +31,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     compile project(':stag-library')
     apt project(':stag-library-compiler')
     compile 'com.google.code.gson:gson:2.8.0'
diff --git a/sample/build.gradle b/sample/build.gradle
index 5157f765..3cf03ddc 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -13,13 +13,13 @@ buildscript {
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.vimeo.sample"
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -33,7 +33,7 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
 
     compile project(':stag-library')
     compile project(':sample-model')

From 1d5a38a990fa36e64526ce3c5496c6839c475fd4 Mon Sep 17 00:00:00 2001
From: wilrnh <wilrnh@msn.com>
Date: Tue, 24 Jan 2017 17:20:42 -0500
Subject: [PATCH 149/159] unit testing and danger and travis

---
 .travis.yml               | 33 +++++++++++++++++++
 Dangerfile                |  5 +++
 Gemfile                   |  2 ++
 Gemfile.lock              | 68 ++++++++++++++++++++++++++++++++++++++-
 README.md                 | 18 +++++++++--
 circle.yml                | 10 ------
 fastlane/Fastfile         | 32 +++++++++++++++---
 sample-model/build.gradle |  1 +
 sample/build.gradle       |  1 +
 9 files changed, 153 insertions(+), 17 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 Dangerfile
 delete mode 100644 circle.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..a295cc2c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: android
+jdk:
+- oraclejdk8
+android:
+  components:
+  - android-23
+  - platform-tools
+  - platform-tools-preview
+  - tools
+  - build-tools-23.0.3
+  - extra-android-m2repository
+  - extra-google-google_play_services
+  - extra-google-m2repository
+before_cache:
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
+  - "$HOME/.android/build-cache"
+script:
+- rvm install 2.2
+- rvm use 2.2
+- bundle install
+- FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane test
+
+# https://vimeo.slack.com/services/B3TG0UCR3
+# travis encrypt "<acct>:<token>#<channel>" --add notifications.slack.rooms
+notifications:
+  slack:
+    rooms:
+      secure: psEjUOvylqjlGlH2p6SQUkAZdFR//+JB/Z98Uqg7N5qb/ZwYepFwMtzXuZpDcv1wFI8Znh0m5n3zAmBpYgG27gmS8BZZg/U9GmSN8HmaR3IGa9Qp7VKbrBet6GhMjVRzCi+kXYgq8rSw4/yhx/LpfgCeZRqcECbf3HJJlnSPBivIjSMM/+BjUEQb5smHDRYPHHXxl2lHMJcK9h2T/9ie/xoUbKZLokITHXXyvNtUNbA27NE3aWh0cUXj2DxhYWrlmQWgQq4wjUqn27WW/MthfBn6+nGAiQYQ3SdUIh5LJIQY6XE+5LfWJvZHa7Rt6DmiiGDJjYOa4LUYTds8FDCCfjLOIqmUvwHaGMzDZrhsdN2/eJ6CZWWwn1aPE/V+YN1bk8UTgHIu9RCBOv9SepG9CZmtecNXU8MTYUqvPvjM3F2OrDM04COLJiqSch78+LVC/BsZyaQfzP6dLZCffjMP49rDsqrqgZZsaNqSlApNkiX0y9OiujpDedVJ1gp49jnkoxbU9GWYWOyHQpJ/++84D61tNhnrCoNArl3KraWKtQdyKXnMUfAkTQ/9mohsJMGhc2RqWSGcAHmK+Z/3SIIV2VBFqX45NO2StVFSql4aDQPQDoo5T1nPVCHdnMUcoitZDjFgflGvxqCu7qIq364p7YBOa5pH+BzaGywkkRRpYcM=
diff --git a/Dangerfile b/Dangerfile
new file mode 100644
index 00000000..0eff3211
--- /dev/null
+++ b/Dangerfile
@@ -0,0 +1,5 @@
+# Print reports for each test result
+Dir.glob('stag-library/build/test-results/*.xml') do |result|
+    junit.parse result
+    junit.report
+end
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 65a6e01f..36185670 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 gem 'fastlane', '2.1.1'
+gem 'danger-junit', '0.7.2'
+gem 'travis', '1.8.5'
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval(File.read(plugins_path), binding) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c6688e4..56e00645 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,20 +11,46 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     babosa (1.0.2)
+    backports (3.6.8)
     claide (1.0.1)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     colored (1.2)
     colorize (0.8.1)
     commander (4.4.1)
       highline (~> 1.7.2)
+    connection_pool (2.2.1)
+    cork (0.2.0)
+      colored (~> 1.2)
+    danger (4.0.5)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored (~> 1.2)
+      cork (~> 0.1)
+      faraday (~> 0.9)
+      faraday-http-cache (~> 1.0)
+      git (~> 1)
+      kramdown (~> 1.5)
+      octokit (~> 4.2)
+      terminal-table (~> 1)
+    danger-junit (0.7.2)
+      danger (> 2.0)
+      ox (~> 2.0)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.1.1)
+    ethon (0.10.1)
+      ffi (>= 1.3.0)
     excon (0.54.0)
     faraday (0.10.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
+    faraday-http-cache (1.3.1)
+      faraday (~> 0.8)
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.0.1)
@@ -64,7 +90,16 @@ GEM
       colorize
       nokogiri
       terminal-table
+    ffi (1.9.17)
+    gh (0.14.0)
+      addressable
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
     gh_inspector (1.0.2)
+    git (1.3.0)
     google-api-client (0.9.20)
       addressable (~> 2.3)
       googleauth (~> 0.5)
@@ -90,6 +125,9 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     jwt (1.5.6)
+    kramdown (1.13.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     little-plugger (1.1.4)
     logging (2.1.0)
       little-plugger (~> 1.1)
@@ -105,16 +143,30 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
+    nap (1.1.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
+    net-http-pipeline (1.0.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    open4 (1.3.4)
     os (0.9.6)
+    ox (2.4.8)
     plist (3.2.0)
     public_suffix (2.0.4)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
     representable (2.3.0)
       uber (~> 0.0.7)
     retriable (2.1.0)
     rouge (1.11.1)
     rubyzip (1.2.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
     security (0.1.3)
     signet (0.7.3)
       addressable (~> 2.3)
@@ -126,6 +178,17 @@ GEM
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
     thread_safe (0.3.5)
+    travis (1.8.5)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.15)
@@ -133,6 +196,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unicode-display_width (1.1.2)
+    websocket (1.2.3)
     word_wrap (1.0.0)
     xcodeproj (1.4.2)
       CFPropertyList (~> 2.3.3)
@@ -149,8 +213,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  danger-junit (= 0.7.2)
   fastlane (= 2.1.1)
   fastlane-plugin-pretty_junit
+  travis (= 1.8.5)
 
 BUNDLED WITH
-   1.13.6
+   1.13.7
diff --git a/README.md b/README.md
index 7b67b56d..a19972d0 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ Stag improves Gson performance by automatically generating reflection-less TypeA
 
 | Branch | Build Status |
 |--------|--------------|
-| master | [![Build Status](https://circleci.com/gh/vimeo/stag-java/tree/master.svg?style=shield&circle-token=4d5dd11678a93587658d1677d0ef2b8c64b56574)](https://circleci.com/gh/vimeo/stag-java/tree/master) |
-| dev    | [![Build Status](https://circleci.com/gh/vimeo/stag-java/tree/dev.svg?style=shield&circle-token=4d5dd11678a93587658d1677d0ef2b8c64b56574)](https://circleci.com/gh/vimeo/stag-java/tree/dev) |
+| master | [![Build Status](https://travis-ci.org/vimeo/stag-java.svg?branch=master)](https://travis-ci.org/vimeo/stag-java) |
+| dev    | [![Build Status](https://travis-ci.org/vimeo/stag-java.svg?branch=dev)](https://travis-ci.org/vimeo/stag-java) |
 
 
 ## Why Build Stag ?
@@ -179,6 +179,20 @@ MyParsingClass {
 
 - Add an option to absorb parsing errors rather than crashing and halting parsing (default gson behavior)
 
+## Development
+```sh
+git clone git@github.com:vimeo/stag-java.git
+cd stag-java
+bundle install
+# dev like a boss
+bundle exec fastlane test
+# commit and push like a boss
+```
+
+#### Manage build dependencies
+Aside from specifying Java dependencies in the `.gradle` files, you can use the `.travis.yml` file to specify external build depencies such as the Android SDK to compile against (see the `android.components` section).
+
+
 ## License
 `stag-java` is available under the MIT license. See the [LICENSE](LICENSE) file for more information.
 
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 209e6f30..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencies:
-    override:
-        - bundle install
-    cache_directories:
-        - "vendor/bundle"
-        - "~/.gradle"
-
-test:
-  override:
-    - bundle exec fastlane test
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2f78bfd3..a8735f40 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -31,13 +31,37 @@ platform :android do
   desc "test"
   lane :test do
     
-    # gotta do some setup before running gradle
-    sh 'touch ../local.properties'
+  # gotta do some setup before running gradle
+  sh 'touch ../local.properties'
 
+  # run the tests, but dont puke everywhere until the report is printed.
+  junit_report_path = "stag-library*/build/test-results/*.xml"
+  begin
     gradle(
-        task: "stag-library:build stag-library-compiler:build sample:build"
+      task: "stag-library:test stag-library-compiler:test sample:build"
     )
-    pretty_junit(file_pattern: "stag-library-compiler/build/test-results/TEST-*")
+  rescue => error
+  begin
+    pretty_junit(file_pattern: junit_report_path)
+  rescue => error
+  end
+
+  if is_ci
+    danger(use_bundle_exec: false)
+  end
+
+  raise error
+  end
+
+  begin
+    pretty_junit(file_pattern: junit_report_path)
+  rescue => error
+  end
+
+  if is_ci
+    danger(use_bundle_exec: false)
+  end
+
 
   end
 
diff --git a/sample-model/build.gradle b/sample-model/build.gradle
index dbc4a386..a835f1c0 100644
--- a/sample-model/build.gradle
+++ b/sample-model/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
+    // Please update the ".travis.yml" file "android.components" section
     compileSdkVersion 23
     buildToolsVersion "23.0.3"
 
diff --git a/sample/build.gradle b/sample/build.gradle
index 5157f765..0f4960a8 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -13,6 +13,7 @@ buildscript {
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
+    // Please update the ".travis.yml" file "android.components" section
     compileSdkVersion 23
     buildToolsVersion "23.0.3"
 

From d3fbc78a40781470345dea3f7133565fd313e0b9 Mon Sep 17 00:00:00 2001
From: wilrnh <wilrnh@msn.com>
Date: Tue, 24 Jan 2017 17:35:45 -0500
Subject: [PATCH 150/159] updated junit report path for danger

---
 Dangerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dangerfile b/Dangerfile
index 0eff3211..cf15d4f0 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1,5 +1,5 @@
 # Print reports for each test result
-Dir.glob('stag-library/build/test-results/*.xml') do |result|
+Dir.glob('stag-library*build/test-results/*.xml') do |result|
     junit.parse result
     junit.report
 end
\ No newline at end of file

From 97061bef5bd788010ef7c33f899413c9db368257 Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Tue, 24 Jan 2017 21:11:45 -0500
Subject: [PATCH 151/159] Accept sdk licenses

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c17f535..2a4cce58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,11 @@ android:
   components:
   - android-25
   - platform-tools
-  - platform-tools-preview
   - tools
   - build-tools-25.0.2
   - extra-android-m2repository
-#  - extra-google-google_play_services
-#  - extra-google-m2repository
+licenses:
+    - 'android-sdk-license-.+'
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

From 9d199e366b999aaab9fd7b2bd1448befc5b596f7 Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Tue, 24 Jan 2017 21:24:32 -0500
Subject: [PATCH 152/159] Fixing license problem with build

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a4cce58..911dc283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ jdk:
 - oraclejdk8
 android:
   components:
-  - android-25
-  - platform-tools
-  - tools
-  - build-tools-25.0.2
-  - extra-android-m2repository
-licenses:
-    - 'android-sdk-license-.+'
+    - tools
+    - build-tools-25.0.2
+    - android-25
+    - extra-android-support
+    - extra-android-m2repository
+  licenses:
+      - 'android-sdk-license-.+'
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

From 03b5875c692db38ccefbd02ca071daddebe9526f Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Tue, 24 Jan 2017 21:35:59 -0500
Subject: [PATCH 153/159] Don't abort sample build on lint errors

---
 sample/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sample/build.gradle b/sample/build.gradle
index 7cec5383..5c9f1c75 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -30,6 +30,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

From f90e60d3c696ea58fa01f2a45f812f9a9cda729c Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Tue, 24 Jan 2017 22:07:54 -0500
Subject: [PATCH 154/159] Add non-null check to field to ensure that it's
 ignored for primitives

---
 .../java/com/vimeo/sample/model/PrimitiveTypesExample.java  | 6 ++++++
 sample/src/main/java/com/vimeo/sample/model1/Data.java      | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
index 7913af13..f2cea69a 100644
--- a/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
+++ b/sample/src/main/java/com/vimeo/sample/model/PrimitiveTypesExample.java
@@ -1,6 +1,8 @@
 package com.vimeo.sample.model;
 
 
+import android.support.annotation.NonNull;
+
 import com.vimeo.stag.UseStag;
 
 /**
@@ -9,6 +11,10 @@
 @UseStag
 public class PrimitiveTypesExample {
 
+    /**
+     * Test that non null check ignores primitive types
+     */
+    @NonNull
     public int simpleInt;
 
     public float simpleFloat;
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Data.java b/sample/src/main/java/com/vimeo/sample/model1/Data.java
index 06c4ff3f..f4225cd4 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Data.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Data.java
@@ -1,6 +1,5 @@
 package com.vimeo.sample.model1;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.google.gson.annotations.SerializedName;
@@ -10,7 +9,6 @@
  */
 public class Data {
 
-    @NonNull
     @SerializedName("size")
     public int size;
 

From edd5a671a6d66c0b09473de8521e9730ac3771d9 Mon Sep 17 00:00:00 2001
From: William Hutson <wilrnh@msn.com>
Date: Wed, 25 Jan 2017 14:43:23 -0500
Subject: [PATCH 155/159] nuking license whitelist

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 911dc283..d7b0fa5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ android:
     - android-25
     - extra-android-support
     - extra-android-m2repository
-  licenses:
-      - 'android-sdk-license-.+'
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

From 46530339f1284039d6218dd31c515d75bc56200c Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Wed, 25 Jan 2017 21:30:26 -0500
Subject: [PATCH 156/159] Cleaning up lint warnings

---
 sample/src/main/AndroidManifest.xml           |  6 ++-
 .../java/com/vimeo/sample/MainActivity.java   |  4 +-
 .../java/com/vimeo/sample/model1/Video.java   |  7 +--
 .../vimeo/sample/network/NetworkRequest.java  |  5 +-
 sample/src/main/res/layout/activity_main.xml  |  9 ++--
 sample/src/main/res/values/strings.xml        |  1 +
 .../generators/ExternalAdapterInfo.java       | 17 +++----
 .../vimeo/stag/processor/utils/TypeUtils.java | 46 ++++++-------------
 .../vimeo/stag/processor/BaseUnitTest.java    |  2 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     |  4 +-
 10 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 391bef35..c50e6a99 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.vimeo.sample"
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    package="com.vimeo.sample"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,7 +10,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/sample/src/main/java/com/vimeo/sample/MainActivity.java b/sample/src/main/java/com/vimeo/sample/MainActivity.java
index ccf5118e..89329772 100644
--- a/sample/src/main/java/com/vimeo/sample/MainActivity.java
+++ b/sample/src/main/java/com/vimeo/sample/MainActivity.java
@@ -40,8 +40,8 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    final List<Video> mVideoList = new ArrayList<>();
-    ArrayAdapter mAdapter;
+    private final List<Video> mVideoList = new ArrayList<>();
+    private ArrayAdapter mAdapter;
     private NetworkRequest mRequest;
 
     @Override
diff --git a/sample/src/main/java/com/vimeo/sample/model1/Video.java b/sample/src/main/java/com/vimeo/sample/model1/Video.java
index 5f028e17..652bd2a2 100644
--- a/sample/src/main/java/com/vimeo/sample/model1/Video.java
+++ b/sample/src/main/java/com/vimeo/sample/model1/Video.java
@@ -7,9 +7,10 @@
 import com.vimeo.stag.UseStag;
 
 /**
- * This class has been added to repro the scenario where two classes with same names exists in different packages.
- * This will make sure that the getter type adapter method for these classes are generated with the correct name (appending package name)
- * so that two getters with same name is not created.
+ * This class has been added to reproduce the scenario where two classes with same
+ * names exists in different packages. This will make sure that the getter type
+ * adapter method for these classes are generated with the correct name (appending
+ * package name) so that two getters with same name is not created.
  * <p>
  * This class has been referenced as a member variable in {@link com.vimeo.sample.model.Video} class
  */
diff --git a/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java b/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
index 2bbe7188..9d17ac4a 100644
--- a/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
+++ b/sample/src/main/java/com/vimeo/sample/network/NetworkRequest.java
@@ -35,13 +35,10 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.JsonTreeReader;
-import com.google.gson.stream.JsonReader;
 import com.vimeo.sample.model.DateParser;
 import com.vimeo.sample.model.Video;
 import com.vimeo.sample.model.VideoList;
 import com.vimeo.sample.stag.generated.Stag;
-import com.vimeo.stag.KnownTypeAdapters;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -55,7 +52,7 @@
 
 public final class NetworkRequest {
 
-    static final String TAG = NetworkRequest.class.getSimpleName();
+    private static final String TAG = "NetworkRequest";
 
     public interface Callback {
 
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index f745a1bd..017b9a29 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -23,12 +22,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true"
-        android:visibility="visible"/>
+        android:visibility="visible" />
 
     <TextView
         android:id="@+id/error_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="Unable to load list"/>
+        android:text="@string/error_loading_message" />
 </FrameLayout>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 9e2a6bbc..1ec97b8f 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Stag Sample</string>
+    <string name="error_loading_message">Unable to load list</string>
 </resources>
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
index a0b5ad07..0ae37071 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/ExternalAdapterInfo.java
@@ -40,9 +40,10 @@ private ExternalAdapterInfo(@NotNull Element typeElement, @NotNull TypeElement a
 
     /**
      * Add adapters for the external models.
-     *  @param stagFactoryGeneratedName stagFactoryGeneratedName
+     *
+     * @param stagFactoryGeneratedName stagFactoryGeneratedName
      * @param typeMirror               typeMirror
-     * @param externalAdapterInfoSet     externalAdapterInfos
+     * @param externalAdapterInfoSet   externalAdapterInfoSet
      */
     public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
                                            @NotNull TypeMirror typeMirror,
@@ -69,12 +70,12 @@ public static void addExternalAdapters(@NotNull String stagFactoryGeneratedName,
                                         ((ExecutableElement) adapterEnclosedElement);
                                 Name name = executableElement.getSimpleName();
                                 if (name.contentEquals("<init>") &&
-                                    executableElement.getParameters().size() >= 2 &&
-                                    !stagFactoryGeneratedName.equals(
-                                            executableElement.getParameters().get(1).asType().toString())) {
+                                        executableElement.getParameters().size() >= 2 &&
+                                        !stagFactoryGeneratedName.equals(
+                                                executableElement.getParameters().get(1).asType().toString())) {
                                     ExternalAdapterInfo result =
                                             new ExternalAdapterInfo(typeElement, adapterTypeElement,
-                                                                    executableElement);
+                                                    executableElement);
                                     sCheckedClasses.add(classAdapterName);
                                     externalAdapterInfoSet.add(result);
                                 }
@@ -97,10 +98,10 @@ String getInitializer(@NotNull String gsonVariableName, @NotNull String concaten
         int paramsSize = mAdapterConstructor.getParameters().size();
         if (paramsSize == 2) {
             return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" +
-                   gsonVariableName + ", " + getFactoryInitializer() + ")";
+                    gsonVariableName + ", " + getFactoryInitializer() + ")";
         } else {
             return "new " + FileGenUtils.escapeStringForCodeBlock(mAdapterType.toString()) + "(" +
-                   gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
+                    gsonVariableName + ", " + getFactoryInitializer() + concatenatedTypeAdapters + ")";
         }
     }
 
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
index fb896f5a..26a2e9fe 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/TypeUtils.java
@@ -340,7 +340,7 @@ public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull Typ
                     map.put(member.getKey(), declaredType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                                      " resolved to - " + declaredType.toString());
+                            " resolved to - " + declaredType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -348,7 +348,7 @@ public static LinkedHashMap<Element, TypeMirror> getConcreteMembers(@NotNull Typ
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                                      " resolved to - " + concreteType.toString());
+                            " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -404,9 +404,9 @@ private static List<? extends TypeMirror> getParameterizedTypes(@NotNull TypeMir
      */
     public static boolean isSupportedPrimitive(@NotNull String type) {
         return type.equals(long.class.getName()) || type.equals(double.class.getName()) ||
-               type.equals(boolean.class.getName()) || type.equals(float.class.getName()) ||
-               type.equals(int.class.getName()) || type.equals(char.class.getName()) ||
-               type.equals(short.class.getName()) || type.equals(byte.class.getName());
+                type.equals(boolean.class.getName()) || type.equals(float.class.getName()) ||
+                type.equals(int.class.getName()) || type.equals(char.class.getName()) ||
+                type.equals(short.class.getName()) || type.equals(byte.class.getName());
     }
 
     /**
@@ -441,8 +441,8 @@ public static boolean isSupportedList(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(ArrayList.class.getName()) ||
-               outerClassType.equals(List.class.getName()) ||
-               outerClassType.equals(Collection.class.getName());
+                outerClassType.equals(List.class.getName()) ||
+                outerClassType.equals(Collection.class.getName());
     }
 
     /**
@@ -459,22 +459,6 @@ public static boolean isNativeObject(@Nullable TypeMirror type) {
         return outerClassType.equals(Object.class.getName());
     }
 
-    /**
-     * Method to check if the {@link TypeMirror} is of {@link JsonElement} type
-     *
-     * @param type :TypeMirror type
-     * @return boolean
-     */
-    public static boolean isJsonElement(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(JsonElement.class.getName()) ||
-               outerClassType.equals(JsonObject.class.getName()) ||
-               outerClassType.equals(JsonArray.class.getName());
-    }
-
     /**
      * Method to check if the {@link TypeMirror} is of {@link Map} type
      *
@@ -487,11 +471,11 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(Map.class.getName()) ||
-               outerClassType.equals(HashMap.class.getName()) ||
-               outerClassType.equals(ConcurrentHashMap.class.getName()) ||
-               outerClassType.equals("android.util.ArrayMap") ||
-               outerClassType.equals("android.support.v4.util.ArrayMap") ||
-               outerClassType.equals(LinkedHashMap.class.getName());
+                outerClassType.equals(HashMap.class.getName()) ||
+                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
+                outerClassType.equals("android.util.ArrayMap") ||
+                outerClassType.equals("android.support.v4.util.ArrayMap") ||
+                outerClassType.equals(LinkedHashMap.class.getName());
     }
 
     /**
@@ -502,9 +486,9 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
      */
     public static boolean isSupportedNative(@NotNull String type) {
         return isSupportedPrimitive(type) || type.equals(String.class.getName()) ||
-               type.equals(Long.class.getName()) || type.equals(Integer.class.getName()) ||
-               type.equals(Boolean.class.getName()) || type.equals(Double.class.getName()) ||
-               type.equals(Float.class.getName()) || type.equals(Number.class.getName());
+                type.equals(Long.class.getName()) || type.equals(Integer.class.getName()) ||
+                type.equals(Boolean.class.getName()) || type.equals(Double.class.getName()) ||
+                type.equals(Float.class.getName()) || type.equals(Number.class.getName());
     }
 
     /**
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/BaseUnitTest.java b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/BaseUnitTest.java
index 85cc2e02..03322def 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/BaseUnitTest.java
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/BaseUnitTest.java
@@ -37,7 +37,7 @@
 public class BaseUnitTest {
 
     @Rule
-    public CompilationRule rule = new CompilationRule();
+    public final CompilationRule rule = new CompilationRule();
     protected Elements elements;
     protected Types types;
 
diff --git a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
index a84938fd..63dbbecd 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -204,8 +204,8 @@ public interface PrimitiveArrayConstructor<T> {
      */
     public static final class ArrayTypeAdapter<T> extends TypeAdapter<T[]> {
 
-        TypeAdapter<T> mValueTypeAdapter;
-        PrimitiveArrayConstructor<T> mObjectCreator;
+        final TypeAdapter<T> mValueTypeAdapter;
+        final PrimitiveArrayConstructor<T> mObjectCreator;
 
         public ArrayTypeAdapter(TypeAdapter<T> valueTypeAdapter,
                                 PrimitiveArrayConstructor<T> instanceCreator) {

From 275812df45c0a2daf085adc828c0df96f536fb38 Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Wed, 25 Jan 2017 21:39:35 -0500
Subject: [PATCH 157/159] Updating javapoet dependency

---
 stag-library-compiler/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index c6980785..01b1f20e 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     compile project(':stag-library')
 
     compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.squareup:javapoet:1.7.0'
+    compile 'com.squareup:javapoet:1.8.0'
     compile 'com.intellij:annotations:12.0@jar'
     compile 'com.google.auto.service:auto-service:1.0-rc2'
 }

From b57348f39f184841005d13aaa93d1766e650746d Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Wed, 25 Jan 2017 21:39:49 -0500
Subject: [PATCH 158/159] Updating stag version to 2.0.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4c1f3490..30f306ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,5 +27,5 @@ allprojects {
 
 subprojects {
     group = 'com.vimeo.stag'
-    version = '1.2.1'
+    version = '2.0.0'
 }

From dfd2280f05ce4141a0b034392cf4b957063964da Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Wed, 25 Jan 2017 21:46:52 -0500
Subject: [PATCH 159/159] Updating version in ready

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 52b0961c..082aa350 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ The Stag library solves this problem. It leverages annotations to automatically
 from jCenter
 ```groovy
 dependencies {
-    compile 'com.vimeo.stag:stag-library:1.2.1'
-    apt 'com.vimeo.stag:stag-library-compiler:1.2.1'
+    compile 'com.vimeo.stag:stag-library:2.0.0'
+    apt 'com.vimeo.stag:stag-library-compiler:2.0.0'
 }
 ```