From 8fbb37d23d03bbc99567f93f6657b5b8fc348fff Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:16:12 -0500
Subject: [PATCH 01/84] Cleaning up formatting

---
 .../src/main/AndroidManifest.xml              |  4 +-
 .../src/main/AndroidManifest.xml              |  4 +-
 .../com/vimeo/sample/model/NestedClass.java   |  3 +-
 .../com/vimeo/sample/model/ObjectExample.java |  1 -
 .../model/OuterClassWithInnerModel.java       |  8 +--
 .../model/json_adapter/TestDeserializer.java  |  1 +
 .../sample/model1/ParameterizedData.java      |  3 +-
 .../vimeo/sample/model/ObjectExampleTest.java |  3 +-
 .../json_adapter/JsonAdapterExampleTest.java  |  3 +-
 .../sample_java_model/NativeJavaModel.java    |  5 ++
 .../WrapperTypeAdapterModelTest.java          |  3 +-
 .../dummy/sample_kotlin/KotlinSamplesTest.kt  |  5 +-
 .../com/vimeo/dummy/sample_kotlin/Utils.kt    |  3 +-
 sample/build.gradle                           |  4 +-
 sample/src/main/AndroidManifest.xml           | 11 +++--
 sample/src/main/res/layout/activity_main.xml  |  3 +-
 sample/src/main/res/layout/row_layout.xml     |  4 +-
 sample/src/main/res/values/styles.xml         |  2 +-
 .../generators/AdapterGenerator.java          |  3 +-
 .../generators/StagFactoryGenerator.java      |  1 +
 .../processor/generators/StagGenerator.java   | 45 ++++++++---------
 .../generators/TypeAdapterGenerator.java      | 49 ++++++++++---------
 .../stag/processor/utils/ElementUtils.java    |  2 +-
 .../vimeo/stag/processor/utils/TypeUtils.java | 30 ++++++------
 .../stag/processor/ElementUtilsUnitTest.kt    |  2 +-
 .../processor/StagProcessorIntegrationTest.kt |  3 +-
 .../stag/processor/dummy/DummyGenericClass.kt |  4 +-
 stag-library/build.gradle                     |  8 +--
 .../com/vimeo/stag/KnownTypeAdapters.java     |  3 +-
 .../src/main/java/com/vimeo/stag/Types.java   |  1 +
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 10 ++--
 31 files changed, 123 insertions(+), 108 deletions(-)

diff --git a/integration-test-android/src/main/AndroidManifest.xml b/integration-test-android/src/main/AndroidManifest.xml
index f22240a7..c2541512 100644
--- a/integration-test-android/src/main/AndroidManifest.xml
+++ b/integration-test-android/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest
-    package="com.vimeo.integration_test_android"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest package="com.vimeo.integration_test_android" />
diff --git a/integration-test-java-cross-module/src/main/AndroidManifest.xml b/integration-test-java-cross-module/src/main/AndroidManifest.xml
index ae0c9521..f77162a6 100644
--- a/integration-test-java-cross-module/src/main/AndroidManifest.xml
+++ b/integration-test-java-cross-module/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest
-    package="com.vimeo.sample.integration_test_android"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest package="com.vimeo.sample.integration_test_android" />
diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/NestedClass.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/NestedClass.java
index 16d1856f..6e4d7e43 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/NestedClass.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/NestedClass.java
@@ -14,6 +14,7 @@ public class NestedClass {
      * classes to explicitly specify the annotation in order to enable generation.
      */
     public static class NestedExtension extends NestedClass {
+
         String field;
     }
 
@@ -42,4 +43,4 @@ public static class NestedWithoutAnnotation {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/ObjectExample.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/ObjectExample.java
index 346d0d01..a2eced60 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/ObjectExample.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/ObjectExample.java
@@ -4,7 +4,6 @@
 
 /**
  * Example where Object is one of the member variables
- *
  */
 @UseStag
 public class ObjectExample {
diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/OuterClassWithInnerModel.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/OuterClassWithInnerModel.java
index 25305d23..817a4602 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/OuterClassWithInnerModel.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/OuterClassWithInnerModel.java
@@ -8,10 +8,10 @@
  */
 public class OuterClassWithInnerModel {
 
-	@UseStag
-	public static class InnerModel {
+    @UseStag
+    public static class InnerModel {
 
-		public int version;
+        public int version;
 
-	}
+    }
 }
diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/json_adapter/TestDeserializer.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/json_adapter/TestDeserializer.java
index 3cf7a3fa..80501ad0 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/json_adapter/TestDeserializer.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/json_adapter/TestDeserializer.java
@@ -13,6 +13,7 @@
  */
 
 public class TestDeserializer implements JsonDeserializer<BasicModel2> {
+
     @Override
     public BasicModel2 deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         return context.deserialize(json, BasicModel2.class);
diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model1/ParameterizedData.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model1/ParameterizedData.java
index d711badb..7ec4c980 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model1/ParameterizedData.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model1/ParameterizedData.java
@@ -7,10 +7,11 @@
 /**
  * Since this class is not annotated with @UseStag, this will use TypeToken for its adapter generation.
  * As it is of paramterized type, this will use TypeToken.getParameterized() instead of TypeToken.get()
+ *
  * @param <T>
  */
 public class ParameterizedData<T> {
 
     @SerializedName("list")
     public List<T> list;
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
index 10df380f..614a0967 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
@@ -8,9 +8,10 @@
  * Created by anshul.garg on 12/04/17.
  */
 public class ObjectExampleTest {
+
     @Test
     public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ObjectExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
index 6f4c8cd1..73366009 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
@@ -8,8 +8,9 @@
  * Created by anshul.garg on 03/03/17.
  */
 public class JsonAdapterExampleTest {
+
     @Test
     public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(JsonAdapterExample.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeJavaModel.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeJavaModel.java
index 4208a5c2..40e90f78 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeJavaModel.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeJavaModel.java
@@ -17,6 +17,7 @@ public void setTopLevel(String mTopLevel) {
 
     @UseStag
     public static class Nested {
+
         private String mNested;
 
         public String getNested() {
@@ -29,6 +30,7 @@ public void setNested(String mNested) {
     }
 
     public static class NestedWithoutAnnotation {
+
         private String mNestedWithoutAnnotation;
 
         public String getNestedWithoutAnnotation() {
@@ -42,6 +44,7 @@ public void setNestedWithoutAnnotation(String mNestedWithoutAnnotation) {
 
     @UseStag
     public static class NestedExtension extends NativeJavaModel {
+
         private String mNestedExtension;
 
         public String getNestedExtension() {
@@ -54,6 +57,7 @@ public void setNestedExtension(String mNestedExtension) {
     }
 
     public static class NestedExtensionWithoutAnnotation extends NativeJavaModel {
+
         private String mNestedExtensionWithoutAnnotation;
 
         public String getNestedExtensionWithoutAnnotation() {
@@ -67,6 +71,7 @@ public void setNestedExtensionWithoutAnnotation(String mNestedExtensionWithoutAn
 
     @UseStag
     public static class NestedExtensionFromNoAnnotation extends NestedWithoutAnnotation {
+
         private String mNestedExtensionFromNoAnnotation;
 
         public String getNestedExtensionFromNoAnnotation() {
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
index a0de5975..61e7d938 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
@@ -8,14 +8,13 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.vimeo.sample_java_model.WrapperTypeAdapterModel.InnerType;
+import com.vimeo.sample_java_model.stag.generated.Stag;
 
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.vimeo.sample_java_model.stag.generated.Stag;
-
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
index 0225d694..22049aa0 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
@@ -9,7 +9,8 @@ import org.junit.Test
  */
 class KotlinSamplesTest {
 
-    @Test fun verifyTypeAdapterGenerated() {
+    @Test
+    fun verifyTypeAdapterGenerated() {
         Utils.verifyTypeAdapterGeneration(KotlinSamples::class)
     }
 
@@ -17,4 +18,4 @@ class KotlinSamplesTest {
     fun verifyTypeAdapterCorrectness() {
         Utils.verifyTypeAdapterCorrectness(KotlinSamples::class)
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
index d4c75cca..536b2f08 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
@@ -3,7 +3,6 @@ package com.vimeo.dummy.sample_kotlin
 import com.google.gson.Gson
 import com.google.gson.TypeAdapter
 import com.google.gson.reflect.TypeToken
-import com.vimeo.sample_kotlin.stag.generated.Stag
 import junit.framework.Assert
 import junit.framework.Assert.assertEquals
 import uk.co.jemos.podam.api.PodamFactoryImpl
@@ -72,4 +71,4 @@ class Utils {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/sample/build.gradle b/sample/build.gradle
index 1d2cfc18..498539fc 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -21,8 +21,8 @@ android {
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
-                        stagGeneratedPackageName: 'com.vimeo.sample.stag.generated',
-                        stagDebug               : 'true',
+                        stagGeneratedPackageName   : 'com.vimeo.sample.stag.generated',
+                        stagDebug                  : 'true',
                         stagAssumeHungarianNotation: 'true'
                 ]
             }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 2235938a..b6e1bc6e 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
+<manifest
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.vimeo.sample"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -15,11 +16,11 @@
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 017b9a29..e8e1252e 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?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"
diff --git a/sample/src/main/res/layout/row_layout.xml b/sample/src/main/res/layout/row_layout.xml
index aee24f9b..0de48420 100644
--- a/sample/src/main/res/layout/row_layout.xml
+++ b/sample/src/main/res/layout/row_layout.xml
@@ -12,6 +12,6 @@
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 6e014884..0935c8fb 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme"
-           parent="Theme.AppCompat.Light.DarkActionBar">
+        parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
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 ed81a110..87c6547b 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
@@ -86,6 +86,7 @@ static String[] getAlternateJsonNames(@NotNull Element element) {
 
     /**
      * Creates a TypeToken field in the generated adapter factory
+     *
      * @param typeMirror Type of class for which typetoken has to be generated
      * @return {@link FieldSpec}
      */
@@ -96,4 +97,4 @@ FieldSpec createTypeTokenSpec(@NotNull TypeMirror typeMirror) {
         typeTokenBuilder.initializer("TypeToken.get(" + typeMirror.toString() + ".class)");
         return typeTokenBuilder.build();
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
index 36955115..423db6a7 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
@@ -20,6 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 
 public class StagFactoryGenerator {
+
     public static final String NAME = "StagFactory";
     private final List<ClassInfo> classInfoList;
     private final String fileName;
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 27740b33..6f20261c 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
@@ -104,12 +104,12 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
 
         ParameterizedTypeName hashMapOfStringToInteger = ParameterizedTypeName.get(HashMap.class, String.class, Integer.class);
         FieldSpec.Builder packageToIndexMapField = FieldSpec.builder(hashMapOfStringToInteger,
-                "packageToIndexMap", Modifier.FINAL, Modifier.PRIVATE).initializer("new " + hashMapOfStringToInteger.toString() + "( " + generatedStagFactoryWrappers.size() + ")");
+                                                                     "packageToIndexMap", Modifier.FINAL, Modifier.PRIVATE).initializer("new " + hashMapOfStringToInteger.toString() + "( " + generatedStagFactoryWrappers.size() + ")");
         adapterFactoryBuilder.addField(packageToIndexMapField.build());
 
         TypeVariableName typeAdapterFactoryArray = TypeVariableName.get("TypeAdapterFactory[]");
         FieldSpec.Builder typeAdapterFactoryArrayField = FieldSpec.builder(typeAdapterFactoryArray,
-                "typeAdapterFactoryArray", Modifier.FINAL, Modifier.PRIVATE).initializer("new TypeAdapterFactory[" + generatedStagFactoryWrappers.size() + "]");
+                                                                           "typeAdapterFactoryArray", Modifier.FINAL, Modifier.PRIVATE).initializer("new TypeAdapterFactory[" + generatedStagFactoryWrappers.size() + "]");
         adapterFactoryBuilder.addField(typeAdapterFactoryArrayField.build());
 
         MethodSpec.Builder getPackageNameMethodBuilder = MethodSpec.methodBuilder("getPackageName")
@@ -118,8 +118,8 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
                 .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
                 .addParameter(ParameterizedTypeName.get(ClassName.get(Class.class), genericTypeName), "clazz")
                 .addCode("String name = clazz.getName();\n" +
-                        "int last = name.lastIndexOf('.');\n" +
-                        "return last == -1 ? null : name.substring(0, last);\n");
+                         "int last = name.lastIndexOf('.');\n" +
+                         "return last == -1 ? null : name.substring(0, last);\n");
         adapterFactoryBuilder.addMethod(getPackageNameMethodBuilder.build());
 
         MethodSpec.Builder createTypeAdapterFactoryMethodBuilder = MethodSpec.methodBuilder("createTypeAdapterFactory")
@@ -146,11 +146,11 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
                 .addModifiers(Modifier.PRIVATE)
                 .addParameter(int.class, "index")
                 .addCode("TypeAdapterFactory typeAdapterFactory = typeAdapterFactoryArray[index];\n" +
-                        "if(null == typeAdapterFactory) {\n" +
-                        "   typeAdapterFactory = createTypeAdapterFactory(index);\n" +
-                        "   typeAdapterFactoryArray[index] = typeAdapterFactory;\n" +
-                        "}\n" +
-                        "return typeAdapterFactory;\n");
+                         "if(null == typeAdapterFactory) {\n" +
+                         "   typeAdapterFactory = createTypeAdapterFactory(index);\n" +
+                         "   typeAdapterFactoryArray[index] = typeAdapterFactory;\n" +
+                         "}\n" +
+                         "return typeAdapterFactory;\n");
         adapterFactoryBuilder.addMethod(getTypeAdapterFactoryMethodBuilder.build());
 
         MethodSpec.Builder getTypeAdapterMethodBuilder = MethodSpec.methodBuilder("getTypeAdapterFactory")
@@ -160,18 +160,18 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
                 .addParameter(String.class, "currentPackageName")
                 .addParameter(int.class, "index")
                 .addCode("String packageName = getPackageName(clazz);\n" +
-                        "packageToIndexMap.put(packageName, index);\n" +
-                        "if(currentPackageName.equals(packageName)) {\n" +
-                        "   return getTypeAdapterFactory(index);\n" +
-                        "}\n" +
-                        "return null;\n");
+                         "packageToIndexMap.put(packageName, index);\n" +
+                         "if(currentPackageName.equals(packageName)) {\n" +
+                         "   return getTypeAdapterFactory(index);\n" +
+                         "}\n" +
+                         "return null;\n");
         adapterFactoryBuilder.addMethod(getTypeAdapterMethodBuilder.build());
 
         MethodSpec.Builder getSubTypeAdapterMethodBuilder = MethodSpec.methodBuilder("getSubFactory")
                 .returns(ClassName.get(TypeAdapterFactory.class))
                 .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
-                                .addMember("value", "\"fallthrough\"")
-                                .build())
+                                       .addMember("value", "\"fallthrough\"")
+                                       .build())
                 .addModifiers(Modifier.PRIVATE, Modifier.SYNCHRONIZED)
                 .addParameter(String.class, "currentPackageName");
 
@@ -188,7 +188,7 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
             getSubTypeAdapterMethodBuilder.addCode("case " + mapIndex + " : ");
             getSubTypeAdapterMethodBuilder.addCode("\n");
             getSubTypeAdapterMethodBuilder.addCode("\tresult = getTypeAdapterFactory(" + subFactoriesInfo.representativeClassInfo.getClassAndPackage() + ".class, " +
-                    "currentPackageName, " + mapIndex + ");");
+                                                   "currentPackageName, " + mapIndex + ");");
             getSubTypeAdapterMethodBuilder.addCode("\n");
             getSubTypeAdapterMethodBuilder.addCode("\tif(null != result) {");
             getSubTypeAdapterMethodBuilder.addCode("\n");
@@ -208,14 +208,14 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
                 .addModifiers(Modifier.PUBLIC)
                 .addAnnotation(Override.class)
                 .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
-                        .addMember(suppressWarningValue, "\"unchecked\"")
-                        .addMember(suppressWarningValue, "\"rawtypes\"")
-                        .build())
+                                       .addMember(suppressWarningValue, "\"unchecked\"")
+                                       .addMember(suppressWarningValue, "\"rawtypes\"")
+                                       .build())
                 .addTypeVariable(genericTypeName)
                 .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericTypeName))
                 .addParameter(Gson.class, "gson")
                 .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName),
-                        "type");
+                              "type");
 
         createMethodBuilder.addStatement("Class<? super T> clazz = type.getRawType()");
         createMethodBuilder.addStatement("String currentPackageName = getPackageName(clazz)");
@@ -232,6 +232,7 @@ private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generated
     }
 
     public static class SubFactoriesInfo {
+
         ClassInfo representativeClassInfo;
         String classAndPackageName;
 
@@ -240,4 +241,4 @@ public SubFactoriesInfo(ClassInfo classInfo, String classAndPackageName) {
             this.classAndPackageName = classAndPackageName;
         }
     }
-}
\ 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 3601f0be..71c985ca 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
@@ -123,7 +123,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
             DeclaredType declaredFieldType = (DeclaredType) fieldType;
             List<? extends TypeMirror> typeMirrors = ((DeclaredType) fieldType).getTypeArguments();
             StringBuilder result = new StringBuilder("(com.google.gson.reflect.TypeToken<" + fieldType.toString() + ">)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
@@ -234,12 +234,12 @@ private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
 
             if (isPrimitive) {
                 builder.addStatement("\tobject." +
-                        fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
-                                ".read(reader, object." + fieldAccessor.createGetterCode() + ")"));
+                                     fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
+                                                                    ".read(reader, object." + fieldAccessor.createGetterCode() + ")"));
 
             } else {
                 builder.addStatement("\tobject." + fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
-                        ".read(reader)"));
+                                                                                  ".read(reader)"));
             }
 
 
@@ -307,14 +307,14 @@ private static String getInitializationCodeForKnownJsonAdapterType(@NotNull Exec
             String typeTokenAccessorCode = getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo);
             fieldAdapterAccessor += "().create(gson, " + typeTokenAccessorCode + ")";
         } else if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER
-                || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_DESERIALIZER
-                || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
+                   || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_DESERIALIZER
+                   || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
             String serializer = null, deserializer = null;
 
             if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
                 String varName = keyFieldName + "SerializerDeserializer";
                 String initializer = adapterType.getEnclosingElement().toString() + " " + varName + " = " +
-                        "new " + adapterType;
+                                     "new " + adapterType;
                 constructorBuilder.addStatement(initializer);
                 serializer = deserializer = varName;
             } else if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER) {
@@ -327,7 +327,7 @@ private static String getInitializationCodeForKnownJsonAdapterType(@NotNull Exec
         } else {
             throw new IllegalArgumentException(
                     "@JsonAdapter value must be TypeAdapter, TypeAdapterFactory, "
-                            + "JsonSerializer or JsonDeserializer reference.");
+                    + "JsonSerializer or JsonDeserializer reference.");
         }
         String adapterCode = getCleanedFieldInitializer(fieldAdapterAccessor);
         if (isNullSafe) {
@@ -352,7 +352,7 @@ private static String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldT
         if (null == fieldName) {
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             String fieldInitializationCode = "gson.getAdapter(" +
-                    getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo) + ")";
+                                             getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo) + ")";
             adapterFieldInfo.addField(fieldType, fieldName, fieldInitializationCode);
         }
         return fieldName;
@@ -395,7 +395,7 @@ private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
             if (!isPrimitive) {
                 builder.addStatement(
                         adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
-                                getterCode + ")");
+                        getterCode + ")");
                 /*
                 * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
                 */
@@ -446,12 +446,12 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType
                 return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
             } else {
                 String adapterAccessor = getAdapterAccessor(arrayInnerType, stagGenerator, typeVarsMap,
-                        adapterFieldInfo);
+                                                            adapterFieldInfo);
                 String nativeArrayInstantiator =
                         KnownTypeAdapterUtils.getNativeArrayInstantiator(arrayInnerType);
                 return "new " + TypeUtils.className(ArrayTypeAdapter.class) + "<" +
-                        arrayInnerType.toString() + ">" +
-                        "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
+                       arrayInnerType.toString() + ">" +
+                       "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
             }
         } else if (TypeUtils.isSupportedList(fieldType)) {
             DeclaredType declaredType = (DeclaredType) fieldType;
@@ -461,8 +461,8 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType
             String listInstantiator = KnownTypeAdapterUtils.getListInstantiator(fieldType);
             String adapterCode =
                     "new " + TypeUtils.className(KnownTypeAdapters.ListTypeAdapter.class) + "<" + param.toString() + "," +
-                            fieldType.toString() + ">" +
-                            "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
+                    fieldType.toString() + ">" +
+                    "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             adapterFieldInfo.addField(fieldType, fieldName, adapterCode);
             return fieldName;
@@ -480,7 +480,7 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType
                 keyAdapterAccessor = getAdapterAccessor(keyType, stagGenerator, typeVarsMap, adapterFieldInfo);
                 valueAdapterAccessor = getAdapterAccessor(valueType, stagGenerator, typeVarsMap, adapterFieldInfo);
                 arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " +
-                        fieldType.toString() + ">";
+                            fieldType.toString() + ">";
             } else {
                 // If the map does not have any type arguments, use Object as type params in this case
                 keyAdapterAccessor = "mGson.getAdapter(KnownTypeAdapters.ObjectTypeAdapter.TYPE_TOKEN)";
@@ -488,8 +488,8 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType
             }
 
             String adapterCode = "new " + TypeUtils.className(KnownTypeAdapters.MapTypeAdapter.class) + arguments +
-                    "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " +
-                    mapInstantiator + ")";
+                                 "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " +
+                                 mapInstantiator + ")";
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             adapterFieldInfo.addField(fieldType, fieldName, adapterCode);
             return fieldName;
@@ -516,8 +516,8 @@ private AdapterFieldInfo addAdapterFields(@NotNull StagGenerator stagGenerator,
                 if (constructor != null) {
                     TypeUtils.JsonAdapterType jsonAdapterType1 = TypeUtils.getJsonAdapterType(optionalJsonAdapter);
                     String initiazationCode = getInitializationCodeForKnownJsonAdapterType(constructor, stagGenerator,
-                            typeVarsMap, constructorBuilder, fieldType,
-                            jsonAdapterType1, result, fieldAccessor.isJsonAdapterNullSafe(), fieldAccessor.getJsonName());
+                                                                                           typeVarsMap, constructorBuilder, fieldType,
+                                                                                           jsonAdapterType1, result, fieldAccessor.isJsonAdapterNullSafe(), fieldAccessor.getJsonName());
 
                     String fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
                     result.addFieldToAccessor(fieldAccessor.getJsonName(), fieldName, fieldType, initiazationCode);
@@ -561,9 +561,9 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
         String className = FileGenUtils.unescapeEscapedString(mInfo.getTypeAdapterClassName());
         TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(className)
                 .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
-                        .addMember("value", "\"unchecked\"")
-                        .addMember("value", "\"rawtypes\"")
-                        .build())
+                                       .addMember("value", "\"unchecked\"")
+                                       .addMember("value", "\"rawtypes\"")
+                                       .build())
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
 
@@ -638,6 +638,7 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
     }
 
     private static class FieldInfo {
+
         @NotNull
         private final TypeMirror type;
         @NotNull
@@ -712,4 +713,4 @@ void addFieldToAccessor(@NotNull String fieldName, @NotNull String variableName,
             mFieldAdapterAccessor.put(fieldName, new FieldInfo(fieldType, fieldInitializationCode, variableName));
         }
     }
-}
\ No newline at end of file
+}
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 b384aea8..bf7b923b 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
@@ -108,7 +108,7 @@ public static boolean isSupportedElementKind(@Nullable Element element) {
         }
         ElementKind elementKind = element.getKind();
         return (elementKind == ElementKind.CLASS || elementKind == ElementKind.ENUM)
-            && isAnnotatedWith(UseStag.class, element);
+               && isAnnotatedWith(UseStag.class, element);
     }
 
     @Nullable
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 2f4802fa..4d7fd09d 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
@@ -383,7 +383,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), resolvedType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                        " resolved to - " + resolvedType.toString());
+                                      " resolved to - " + resolvedType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -391,7 +391,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                        " resolved to - " + concreteType.toString());
+                                      " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -443,7 +443,7 @@ private static TypeMirror resolveTypeVars(@NotNull TypeMirror element,
             concreteGenericTypes.add(resolveTypeVars(type, inheritedTypes, concreteTypes));
         }
         TypeMirror[] concreteTypeArray =
-            concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
+                concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
         return types.getDeclaredType(typeElement, concreteTypeArray);
     }
 
@@ -509,8 +509,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());
     }
 
     /**
@@ -539,11 +539,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());
     }
 
     /**
@@ -554,9 +554,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());
     }
 
     /**
@@ -565,7 +565,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);
+                .get(0);
     }
 
     @NotNull
@@ -672,4 +672,4 @@ public static DeclaredType getDeclaredType(TypeElement typeElem, TypeMirror... t
     public static boolean isWildcardType(@Nullable TypeMirror typeMirror) {
         return typeMirror instanceof WildcardType;
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
index e945029d..6eb4ca32 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
@@ -33,7 +33,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
-import java.util.*
+import java.util.ArrayList
 
 class ElementUtilsUnitTest : BaseUnitTest() {
 
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
index 09e2cfd1..384d18fb 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
@@ -4,7 +4,6 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.google.gson.stream.JsonWriter
 import com.vimeo.sample_java_model.NullFields
-import com.vimeo.sample_java_model.stag.generated.Stag
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.io.StringWriter
@@ -34,4 +33,4 @@ class StagProcessorIntegrationTest {
         // Assert that a null value emits null JSON
         assertThat(typeAdapter.toJson(null)).isEqualTo("null")
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyGenericClass.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyGenericClass.kt
index 68d597e2..5bd76c1c 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyGenericClass.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyGenericClass.kt
@@ -24,7 +24,9 @@
 package com.vimeo.stag.processor.dummy
 
 import com.vimeo.stag.processor.TypeUtilsUnitTest
-import java.util.*
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.HashSet
 
 /**
  * Do not change this class without sure the
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index e7e32ac9..ffb4a665 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -63,7 +63,7 @@ def pomConfig = {
             organisationUrl "https://github.com/vimeo"
         }
     }
-    
+
     scm {
         connection "scm:git:git://github.com/vimeo/stag-java.git"
         developerConnection "scm:git:ssh://github.com:vimeo/stag-java.git"
@@ -123,10 +123,12 @@ allprojects {
                             passphrase = System.getenv('BINTRAY_GPG_PASSWORD')
                         }
                         mavenCentralSync {
-                            sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
+                            sync = true
+                            //Optional (true by default). Determines whether to sync the version to Maven Central.
                             user = System.getenv('SONATYPE_TOKEN_USER') //OSS user token
                             password = System.getenv('SONATYPE_TOKEN_PASSWORD') //OSS user password
-                            close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
+                            close = '1'
+                            //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
                         }
                     }
                 }
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 1f333fb3..6d6f70be 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -989,6 +989,7 @@ private static String keyToString(@NotNull JsonElement keyElement) {
      * Type Adapter for {@link Object}
      */
     public static final class ObjectTypeAdapter extends TypeAdapter<Object> {
+
         public final TypeToken<Object> TYPE_TOKEN = TypeToken.get(Object.class);
 
         private final Gson gson;
@@ -1111,4 +1112,4 @@ public JsonNull read(JsonReader in) throws IOException {
             return jsonElement != null && jsonElement.isJsonNull() ? jsonElement.getAsJsonNull() : null;
         }
     }.nullSafe();
-}
\ No newline at end of file
+}
diff --git a/stag-library/src/main/java/com/vimeo/stag/Types.java b/stag-library/src/main/java/com/vimeo/stag/Types.java
index b292e893..665657d5 100644
--- a/stag-library/src/main/java/com/vimeo/stag/Types.java
+++ b/stag-library/src/main/java/com/vimeo/stag/Types.java
@@ -5,6 +5,7 @@
 import java.lang.reflect.WildcardType;
 
 public class Types {
+
     public static WildcardType getWildcardType(Type[] upperBounds, Type[] lowerBounds) {
         return new WildcardTypeImpl(upperBounds, lowerBounds);
     }
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 93e29835..c6732d05 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -552,7 +552,7 @@ public void testForListTypeAdapter() throws Exception {
         ArrayList<String> dummyList = Utils.createStringDummyList();
 
         TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
-                new KnownTypeAdapters.ArrayListInstantiator<String>());
+                                                                                                 new KnownTypeAdapters.ArrayListInstantiator<String>());
 
         StringWriter stringWriter = new StringWriter();
         listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
@@ -569,7 +569,7 @@ public void testForListTypeAdapter() throws Exception {
         ArrayList<Integer> intDummyList = Utils.createIntegerDummyList();
 
         TypeAdapter<ArrayList<Integer>> listTypeAdapter1 = new KnownTypeAdapters.ListTypeAdapter<>(KnownTypeAdapters.INTEGER,
-                new KnownTypeAdapters.ArrayListInstantiator<Integer>());
+                                                                                                   new KnownTypeAdapters.ArrayListInstantiator<Integer>());
         stringWriter = new StringWriter();
         listTypeAdapter1.write(new JsonWriter(stringWriter), intDummyList);
         jsonString = stringWriter.toString();
@@ -594,7 +594,7 @@ public void testForMapTypeAdapter() throws Exception {
         HashMap<String, String> dummyMap = Utils.createStringDummyMap();
 
         TypeAdapter<HashMap<String, String>> mapTypeAdapter = new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING, TypeAdapters.STRING,
-                new KnownTypeAdapters.HashMapInstantiator<String, String>());
+                                                                                                     new KnownTypeAdapters.HashMapInstantiator<String, String>());
 
         StringWriter stringWriter = new StringWriter();
         mapTypeAdapter.write(new JsonWriter(stringWriter), dummyMap);
@@ -609,7 +609,7 @@ public void testForMapTypeAdapter() throws Exception {
         HashMap<Integer, Integer> intDummyMap = Utils.createIntegerDummyMap();
 
         TypeAdapter<HashMap<Integer, Integer>> mapTypeAdapter1 = new KnownTypeAdapters.MapTypeAdapter<>(KnownTypeAdapters.INTEGER, KnownTypeAdapters.INTEGER,
-                new KnownTypeAdapters.HashMapInstantiator<Integer, Integer>());
+                                                                                                        new KnownTypeAdapters.HashMapInstantiator<Integer, Integer>());
         stringWriter = new StringWriter();
         mapTypeAdapter1.write(new JsonWriter(stringWriter), intDummyMap);
         jsonString = stringWriter.toString();
@@ -661,4 +661,4 @@ public void testForJsonArrayTypeAdapter() throws Exception {
         }
     }
 
-}
\ No newline at end of file
+}

From c5efbf8e5a68b52348944282d482c94ab156c60b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:22:54 -0500
Subject: [PATCH 02/84] Update Kotlin version

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

diff --git a/build.gradle b/build.gradle
index bce8525d..bde702bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
-    ext.kotlinVersion = '1.2.20'
+    ext.kotlinVersion = '1.2.21'
     ext.jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
     ext.gsonVersion = '2.8.2'
 

From a84fdb1a89d627e42d773a9bfcb86cf9f909a20b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:24:29 -0500
Subject: [PATCH 03/84] Enabling test

---
 .../sample_java_model/SwappableParserExampleModelTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
index 6c1ad85c..2ed24670 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
@@ -55,6 +55,7 @@ public void verifyTypeAdapterWasNotGenerated_TestObject() throws Exception {
     /**
      * Stag does support being used across Gson instances now
      */
+    @Test
     public void test_SwappingTypeAdapters() {
 
         final Stag.Factory factory = new Stag.Factory();
@@ -147,4 +148,4 @@ public TestObject read(JsonReader in) throws IOException {
         }
     }
 
-}
\ No newline at end of file
+}

From 97bcdb13011033846d3fda403ab1aba5694e6e1c Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:33:08 -0500
Subject: [PATCH 04/84] Adding missing import

---
 .../src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
index 536b2f08..2c99eef4 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
@@ -7,6 +7,7 @@ import junit.framework.Assert
 import junit.framework.Assert.assertEquals
 import uk.co.jemos.podam.api.PodamFactoryImpl
 import kotlin.reflect.KClass
+import com.vimeo.sample_kotlin.stag.generated.Stag
 
 /**
  * Created by restainoa on 5/8/17.

From 023248c3f2a994f9eb306267d16571751cd7b03b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:35:19 -0500
Subject: [PATCH 05/84] Adding missing import

---
 .../com/vimeo/stag/processor/StagProcessorIntegrationTest.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
index 384d18fb..732515f5 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/StagProcessorIntegrationTest.kt
@@ -7,6 +7,7 @@ import com.vimeo.sample_java_model.NullFields
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.io.StringWriter
+import com.vimeo.sample_java_model.stag.generated.Stag
 
 /**
  * Integration tests for the compiler.

From 1a36720cfd273ef6901612f9aca077c1bdca9f1d Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:39:54 -0500
Subject: [PATCH 06/84] Cleaning up lint warnings

---
 .../model/SubClassWithSameVariableName.java   |  1 +
 .../java/com/vimeo/sample/MainActivity.java   |  8 ++---
 .../generators/AdapterGenerator.java          |  4 +--
 .../processor/generators/StagGenerator.java   |  2 +-
 .../generators/TypeAdapterGenerator.java      | 30 ++++++++-----------
 .../vimeo/stag/processor/utils/TypeUtils.java | 28 ++++++++---------
 .../vimeo/stag/processor/TypeUtilsUnitTest.kt |  4 +--
 .../stag/processor/dummy/DummyMapClass.kt     |  6 ++--
 8 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java
index c16ff47e..6242a22a 100644
--- a/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java
+++ b/integration-test-java-cross-module/src/main/java/com/vimeo/sample/model/SubClassWithSameVariableName.java
@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 
+@SuppressWarnings("FieldNameHidesFieldInSuperclass")
 @UseStag
 public class SubClassWithSameVariableName extends ClassWithArrayTypes {
 
diff --git a/sample/src/main/java/com/vimeo/sample/MainActivity.java b/sample/src/main/java/com/vimeo/sample/MainActivity.java
index bd9fd6a2..c52a1b96 100644
--- a/sample/src/main/java/com/vimeo/sample/MainActivity.java
+++ b/sample/src/main/java/com/vimeo/sample/MainActivity.java
@@ -49,9 +49,9 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        final ListView listView = (ListView) findViewById(R.id.list_view);
-        final ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar);
-        final TextView errorText = (TextView) findViewById(R.id.error_text);
+        final ListView listView = findViewById(R.id.list_view);
+        final ProgressBar progressBar = findViewById(R.id.progress_bar);
+        final TextView errorText = findViewById(R.id.error_text);
 
         if (listView == null || progressBar == null || errorText == null) {
             throw new RuntimeException("Unable to find view");
@@ -93,4 +93,4 @@ protected void onDestroy() {
         }
     }
 
-}
\ No newline at end of file
+}
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 87c6547b..54901e1d 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
@@ -87,11 +87,11 @@ static String[] getAlternateJsonNames(@NotNull Element element) {
     /**
      * Creates a TypeToken field in the generated adapter factory
      *
-     * @param typeMirror Type of class for which typetoken has to be generated
+     * @param typeMirror Type of class for which TypeToken has to be generated
      * @return {@link FieldSpec}
      */
     @NotNull
-    FieldSpec createTypeTokenSpec(@NotNull TypeMirror typeMirror) {
+    static FieldSpec createTypeTokenSpec(@NotNull TypeMirror typeMirror) {
         ParameterizedTypeName typeTokenType = ParameterizedTypeName.get(ClassName.get(TypeToken.class), TypeVariableName.get(typeMirror));
         FieldSpec.Builder typeTokenBuilder = FieldSpec.builder(typeTokenType, "TYPE_TOKEN", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL);
         typeTokenBuilder.initializer("TypeToken.get(" + typeMirror.toString() + ".class)");
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 6f20261c..e6929a22 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
@@ -95,7 +95,7 @@ public TypeSpec createStagSpec(List<SubFactoriesInfo> generatedStagFactoryWrappe
     }
 
     @NotNull
-    private TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generatedStagFactoryWrappers) {
+    private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> generatedStagFactoryWrappers) {
         TypeVariableName genericTypeName = TypeVariableName.get("T");
 
         TypeSpec.Builder adapterFactoryBuilder = TypeSpec.classBuilder(CLASS_TYPE_ADAPTER_FACTORY)
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 71c985ca..5352520e 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
@@ -422,9 +422,9 @@ private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
     /**
      * Returns the adapter code for the known types.
      */
-    private String getAdapterAccessor(@NotNull TypeMirror fieldType
+    private static String getAdapterAccessor(@NotNull TypeMirror fieldType
             , @NotNull StagGenerator stagGenerator, @NotNull Map<TypeMirror, String> typeVarsMap,
-                                      @NotNull AdapterFieldInfo adapterFieldInfo) {
+                                             @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
 
@@ -499,10 +499,10 @@ private String getAdapterAccessor(@NotNull TypeMirror fieldType
     }
 
     @NotNull
-    private AdapterFieldInfo addAdapterFields(@NotNull StagGenerator stagGenerator,
-                                              @NotNull MethodSpec.Builder constructorBuilder,
-                                              @NotNull Map<FieldAccessor, TypeMirror> memberVariables,
-                                              @NotNull Map<TypeMirror, String> typeVarsMap) {
+    private static AdapterFieldInfo addAdapterFields(@NotNull StagGenerator stagGenerator,
+                                                     @NotNull MethodSpec.Builder constructorBuilder,
+                                                     @NotNull Map<FieldAccessor, TypeMirror> memberVariables,
+                                                     @NotNull Map<TypeMirror, String> typeVarsMap) {
 
         AdapterFieldInfo result = new AdapterFieldInfo(memberVariables.size());
         for (Map.Entry<FieldAccessor, TypeMirror> entry : memberVariables.entrySet()) {
@@ -639,12 +639,9 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
 
     private static class FieldInfo {
 
-        @NotNull
-        private final TypeMirror type;
-        @NotNull
-        private final String initializationCode;
-        @NotNull
-        private final String accessorVariable;
+        @NotNull final TypeMirror type;
+        @NotNull final String initializationCode;
+        @NotNull final String accessorVariable;
 
         FieldInfo(@NotNull TypeMirror type, @NotNull String initializationCode, @NotNull String accessorVariable) {
             this.type = type;
@@ -660,16 +657,13 @@ private static class AdapterFieldInfo {
         private final Map<String, String> mAdapterAccessor;
 
         //FieldName -> Accessor Map
-        @NotNull
-        private final Map<String, FieldInfo> mFieldAdapterAccessor;
+        @NotNull final Map<String, FieldInfo> mFieldAdapterAccessor;
 
         //Type.toString -> Accessor Map
-        @NotNull
-        private final Map<String, FieldInfo> mAdapterFields;
+        @NotNull final Map<String, FieldInfo> mAdapterFields;
 
         //Type.toString -> Type Token Accessor Map
-        @NotNull
-        private final Map<String, FieldInfo> mTypeTokenAccessorFields;
+        @NotNull final Map<String, FieldInfo> mTypeTokenAccessorFields;
 
         AdapterFieldInfo(int capacity) {
             mAdapterFields = new LinkedHashMap<>(capacity);
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 4d7fd09d..0fa00cd4 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
@@ -383,7 +383,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), resolvedType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                                      " resolved to - " + resolvedType.toString());
+                        " resolved to - " + resolvedType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -391,7 +391,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                                      " resolved to - " + concreteType.toString());
+                        " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -443,7 +443,7 @@ private static TypeMirror resolveTypeVars(@NotNull TypeMirror element,
             concreteGenericTypes.add(resolveTypeVars(type, inheritedTypes, concreteTypes));
         }
         TypeMirror[] concreteTypeArray =
-                concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
+            concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
         return types.getDeclaredType(typeElement, concreteTypeArray);
     }
 
@@ -509,8 +509,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());
     }
 
     /**
@@ -539,11 +539,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());
     }
 
     /**
@@ -554,9 +554,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());
     }
 
     /**
@@ -565,7 +565,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);
+            .get(0);
     }
 
     @NotNull
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index 9c90101c..a20439bf 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -86,7 +86,7 @@ class TypeUtilsUnitTest : BaseUnitTest() {
         val genericMembers = HashMap<FieldAccessor, TypeMirror>()
         genericElement.enclosedElements
                 .filterIsInstance<VariableElement>()
-                .forEach { genericMembers.put(DirectFieldAccessor(it), it.asType()) }
+                .forEach { genericMembers[DirectFieldAccessor(it)] = it.asType() }
 
         val concreteType = TypeUtils.getInheritedType(Utils.getElementFromClass(DummyInheritedClass::class.java))
 
@@ -396,4 +396,4 @@ class TypeUtilsUnitTest : BaseUnitTest() {
         Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass::class.java)))
         Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String::class.java)))
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.kt
index 19ca4146..6099615a 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyMapClass.kt
@@ -45,10 +45,10 @@ class DummyMapClass : MutableMap<Any, Any> {
 
     override fun clear() {}
 
-    override fun put(key: Any, value: Any) = null
+    override fun put(key: Any, value: Any): Nothing? = null
 
     override fun putAll(from: Map<out Any, Any>) {}
 
-    override fun remove(key: Any) = null
+    override fun remove(key: Any): Nothing? = null
 
-}
\ No newline at end of file
+}

From 466eb57ec19f012dac8d671e4d9fc4fa401d9d63 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 15:44:25 -0500
Subject: [PATCH 07/84] Update dependencies

---
 stag-library-compiler/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 5d4edf8f..4022643e 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -24,7 +24,7 @@ jacocoTestReport.dependsOn test
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.8.0'
+    testImplementation 'org.assertj:assertj-core:3.9.0'
     testImplementation 'com.google.testing.compile:compile-testing:0.13'
     testImplementation project(path: ':integration-test-java')
     testImplementation project(path: ':integration-test-java-cross-module')
@@ -35,7 +35,7 @@ dependencies {
     implementation project(':stag-library')
 
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'com.squareup:javapoet:1.9.0'
+    implementation 'com.squareup:javapoet:1.10.0'
     implementation 'com.intellij:annotations:12.0@jar'
     implementation 'com.google.auto.service:auto-service:1.0-rc3'
 

From 7fa026bd4c2a0c9c6b317c49c5f855eacaa348b0 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 16:02:15 -0500
Subject: [PATCH 08/84] Remove unused code and cleanup

---
 .../java/com/vimeo/stag/processor/StagProcessor.java   |  8 +++-----
 .../processor/generators/StagFactoryGenerator.java     |  3 ++-
 .../vimeo/stag/processor/generators/StagGenerator.java | 10 +++-------
 .../processor/generators/TypeAdapterGenerator.java     |  3 ++-
 .../processor/generators/model/AnnotatedClass.java     |  6 ++----
 .../generators/model/SupportedTypesModel.java          |  4 +---
 stag-library/src/main/java/com/vimeo/stag/Types.java   |  7 +++++--
 stag-library/src/test/java/com/vimeo/stag/Utils.java   |  6 ++++--
 8 files changed, 22 insertions(+), 25 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 5c98dac7..4b7d9ef2 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
@@ -154,11 +154,9 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         ElementUtils.initialize(processingEnv.getElementUtils());
         MessagerUtils.initialize(processingEnv.getMessager());
 
-        String stagFactoryGeneratedName = StagGenerator.getGeneratedFactoryClassAndPackage(packageName);
-
         Notation notation = assumeHungarianNotation ? Notation.HUNGARIAN : Notation.STANDARD;
 
-        SupportedTypesModel supportedTypesModel = new SupportedTypesModel(stagFactoryGeneratedName, notation);
+        SupportedTypesModel supportedTypesModel = new SupportedTypesModel(notation);
 
         DebugLog.log("\nBeginning @UseStag annotation processing\n");
 
@@ -227,7 +225,7 @@ private void generateAdapterFactory(@NotNull List<ClassInfo> classInfos, @NotNul
     private void generateStagFactory(@NotNull StagGenerator stagGenerator,
                                      @NotNull String packageName, List<StagGenerator.SubFactoriesInfo> generatedStagFactoryWrappers) throws IOException {
         // Create the type spec
-        TypeSpec typeSpec = stagGenerator.createStagSpec(generatedStagFactoryWrappers);
+        TypeSpec typeSpec = StagGenerator.createStagSpec(generatedStagFactoryWrappers);
 
         // Write the type spec to a file
         writeTypeSpecToFile(typeSpec, packageName);
@@ -260,4 +258,4 @@ private void writeTypeSpecToFile(@NotNull TypeSpec typeSpec, @NotNull String pac
         // Write the Java file to disk
         FileGenUtils.writeToFile(javaFile, filer);
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
index 423db6a7..a96d6ce9 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
@@ -14,6 +14,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.lang.model.element.Modifier;
@@ -26,7 +27,7 @@ public class StagFactoryGenerator {
     private final String fileName;
 
     public StagFactoryGenerator(@NotNull List<ClassInfo> classInfoList, @NotNull String fileName) {
-        this.classInfoList = classInfoList;
+        this.classInfoList = new ArrayList<>(classInfoList);
         this.fileName = fileName;
     }
 
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 e6929a22..c4451530 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
@@ -69,10 +69,6 @@ public StagGenerator(@NotNull Set<TypeMirror> knownTypes) {
         }
     }
 
-    public static String getGeneratedFactoryClassAndPackage(String generatedPackageName) {
-        return generatedPackageName + "." + CLASS_STAG + "." + CLASS_TYPE_ADAPTER_FACTORY;
-    }
-
     @Nullable
     ClassInfo getKnownClass(@NotNull TypeMirror typeMirror) {
         return mKnownClasses.get(typeMirror.toString());
@@ -86,7 +82,7 @@ ClassInfo getKnownClass(@NotNull TypeMirror typeMirror) {
      * @return A non null TypeSpec for the factory class.
      */
     @NotNull
-    public TypeSpec createStagSpec(List<SubFactoriesInfo> generatedStagFactoryWrappers) {
+    public static TypeSpec createStagSpec(List<SubFactoriesInfo> generatedStagFactoryWrappers) {
         TypeSpec.Builder stagBuilder =
                 TypeSpec.classBuilder(CLASS_STAG).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
         stagBuilder.addType(getAdapterFactorySpec(generatedStagFactoryWrappers));
@@ -233,8 +229,8 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
 
     public static class SubFactoriesInfo {
 
-        ClassInfo representativeClassInfo;
-        String classAndPackageName;
+        final ClassInfo representativeClassInfo;
+        final String classAndPackageName;
 
         public SubFactoriesInfo(ClassInfo classInfo, String classAndPackageName) {
             this.representativeClassInfo = classInfo;
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 5352520e..eae91b37 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,8 @@ private static String getInitializationCodeForKnownJsonAdapterType(@NotNull Exec
                 String initializer = adapterType.getEnclosingElement().toString() + " " + varName + " = " +
                                      "new " + adapterType;
                 constructorBuilder.addStatement(initializer);
-                serializer = deserializer = varName;
+                serializer = varName;
+                deserializer = varName;
             } else if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER) {
                 serializer = "new " + adapterType;
             } else if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_DESERIALIZER) {
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 bb1a96df..5ed2a7cf 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
@@ -68,7 +68,6 @@ public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<Ann
     @NotNull private final TypeMirror mType;
     @NotNull private final TypeElement mElement;
     @NotNull private final LinkedHashMap<FieldAccessor, TypeMirror> mMemberVariables;
-    @NotNull private final SupportedTypesModel mSupportedTypesModel;
     @NotNull private final Notation mNamingNotation;
 
     AnnotatedClass(@NotNull SupportedTypesModel supportedTypesModel,
@@ -82,7 +81,6 @@ public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<Ann
                    @NotNull Notation namingNotation,
                    @Nullable FieldOption childFieldOption) {
         mNamingNotation = namingNotation;
-        mSupportedTypesModel = supportedTypesModel;
         mType = element.asType();
         mElement = element;
         Map<String, FieldAccessor> variableNames = new HashMap<>(element.getEnclosedElements().size());
@@ -105,7 +103,7 @@ public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<Ann
         if (inheritedType != null) {
             DebugLog.log(TAG, "\t\tInherited Type - " + inheritedType.toString());
 
-            AnnotatedClass genericInheritedType = mSupportedTypesModel.addToKnownInheritedType(inheritedType, fieldOption);
+            AnnotatedClass genericInheritedType = supportedTypesModel.addToKnownInheritedType(inheritedType, fieldOption);
 
             LinkedHashMap<FieldAccessor, TypeMirror> inheritedMemberVariables = TypeUtils.getConcreteMembers(inheritedType,
                                                                                                              genericInheritedType.getElement(),
@@ -210,4 +208,4 @@ public TypeElement getElement() {
     public LinkedHashMap<FieldAccessor, 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/generators/model/SupportedTypesModel.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/SupportedTypesModel.java
index b597f43c..d2327ab7 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
@@ -40,11 +40,9 @@ public final class SupportedTypesModel {
 
     @NotNull private final Map<String, AnnotatedClass> mSupportedTypesMap = new HashMap<>();
     @NotNull private final Map<String, AnnotatedClass> mKnownInheritedTypesMap = new HashMap<>();
-    @NotNull private final String mGeneratedStagFactoryName;
     @NotNull private final Notation mNamingNotation;
 
-    public SupportedTypesModel(@NotNull String generatedStagFactoryName, @NotNull Notation namingNotation) {
-        mGeneratedStagFactoryName = generatedStagFactoryName;
+    public SupportedTypesModel(@NotNull Notation namingNotation) {
         mNamingNotation = namingNotation;
     }
 
diff --git a/stag-library/src/main/java/com/vimeo/stag/Types.java b/stag-library/src/main/java/com/vimeo/stag/Types.java
index 665657d5..6200692d 100644
--- a/stag-library/src/main/java/com/vimeo/stag/Types.java
+++ b/stag-library/src/main/java/com/vimeo/stag/Types.java
@@ -4,7 +4,9 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 
-public class Types {
+public final class Types {
+
+    private Types() {}
 
     public static WildcardType getWildcardType(Type[] upperBounds, Type[] lowerBounds) {
         return new WildcardTypeImpl(upperBounds, lowerBounds);
@@ -12,7 +14,8 @@ public static WildcardType getWildcardType(Type[] upperBounds, Type[] lowerBound
 
     private static final class WildcardTypeImpl implements WildcardType {
 
-        private Type[] upperBounds, lowerBounds;
+        private final Type[] upperBounds;
+        private final Type[] lowerBounds;
 
         public WildcardTypeImpl(Type[] upperBounds, Type[] lowerBounds) {
             this.upperBounds = upperBounds;
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 f55c9891..88cc64bf 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.java
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.java
@@ -10,7 +10,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-public class Utils {
+public final class Utils {
+
+    private Utils() {}
 
     public static <K, V> void assertMapsEqual(Map<K, V> map1, Map<K, V> map2) throws Exception {
         for (Entry<K, V> kvEntry : map1.entrySet()) {
@@ -96,4 +98,4 @@ public static JsonArray createDummyJsonArray() {
 
         return jsonArray;
     }
-}
\ No newline at end of file
+}

From ff8d48c3161e2c7020962b79a4b8f67a1b7c9f15 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 16:08:40 -0500
Subject: [PATCH 09/84] Adding non null annotations

---
 .../generators/StagFactoryGenerator.java      | 10 +++----
 .../processor/generators/StagGenerator.java   |  7 +++--
 .../vimeo/stag/processor/utils/TypeUtils.java | 29 +++++++++----------
 .../dummy/DummyClassWithConstructor.kt        |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
index a96d6ce9..be86ab56 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
@@ -22,9 +22,9 @@
 
 public class StagFactoryGenerator {
 
-    public static final String NAME = "StagFactory";
-    private final List<ClassInfo> classInfoList;
-    private final String fileName;
+    @NotNull public static final String NAME = "StagFactory";
+    @NotNull private final List<ClassInfo> classInfoList;
+    @NotNull private final String fileName;
 
     public StagFactoryGenerator(@NotNull List<ClassInfo> classInfoList, @NotNull String fileName) {
         this.classInfoList = new ArrayList<>(classInfoList);
@@ -44,7 +44,7 @@ public TypeSpec getTypeAdapterFactorySpec() {
     @NotNull
     private MethodSpec getCreateMethodSpec() {
         TypeVariableName genericType = TypeVariableName.get("T");
-        AnnotationSpec suppressions = AnnotationSpec.builder(SuppressWarnings.class)
+        AnnotationSpec suppressedWarnings = AnnotationSpec.builder(SuppressWarnings.class)
                 .addMember("value", "\"unchecked\"")
                 .addMember("value", "\"rawtypes\"")
                 .build();
@@ -53,7 +53,7 @@ private MethodSpec getCreateMethodSpec() {
                 .addParameter(Gson.class, "gson")
                 .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericType), "type")
                 .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericType))
-                .addAnnotation(suppressions)
+                .addAnnotation(suppressedWarnings)
                 .addAnnotation(Override.class)
                 .addModifiers(Modifier.PUBLIC)
                 .addCode("Class<? super T> clazz = type.getRawType();\n");
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 c4451530..c249852f 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
@@ -229,10 +229,11 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
 
     public static class SubFactoriesInfo {
 
-        final ClassInfo representativeClassInfo;
-        final String classAndPackageName;
+        @NotNull final ClassInfo representativeClassInfo;
 
-        public SubFactoriesInfo(ClassInfo classInfo, String classAndPackageName) {
+        @NotNull final String classAndPackageName;
+
+        public SubFactoriesInfo(@NotNull ClassInfo classInfo, @NotNull String classAndPackageName) {
             this.representativeClassInfo = classInfo;
             this.classAndPackageName = classAndPackageName;
         }
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 0fa00cd4..26ad372d 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
@@ -59,7 +59,6 @@ public final class TypeUtils {
 
     @Nullable private static Types sTypeUtils;
 
-
     static {
         PRIMITIVE_TO_OBJECT_MAP.put(boolean.class.getName(), Boolean.class.getName());
         PRIMITIVE_TO_OBJECT_MAP.put(int.class.getName(), Integer.class.getName());
@@ -383,7 +382,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), resolvedType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                        " resolved to - " + resolvedType.toString());
+                                      " resolved to - " + resolvedType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -391,7 +390,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                        " resolved to - " + concreteType.toString());
+                                      " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -443,7 +442,7 @@ private static TypeMirror resolveTypeVars(@NotNull TypeMirror element,
             concreteGenericTypes.add(resolveTypeVars(type, inheritedTypes, concreteTypes));
         }
         TypeMirror[] concreteTypeArray =
-            concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
+                concreteGenericTypes.toArray(new TypeMirror[concreteGenericTypes.size()]);
         return types.getDeclaredType(typeElement, concreteTypeArray);
     }
 
@@ -509,8 +508,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());
     }
 
     /**
@@ -539,11 +538,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());
     }
 
     /**
@@ -554,9 +553,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());
     }
 
     /**
@@ -565,7 +564,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);
+                .get(0);
     }
 
     @NotNull
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyClassWithConstructor.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyClassWithConstructor.kt
index 411fba59..fb41a88e 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyClassWithConstructor.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/dummy/DummyClassWithConstructor.kt
@@ -12,5 +12,5 @@ class DummyClassWithConstructor {
         this.string = string
     }
 
-    constructor() {}
+    constructor()
 }

From 1823e6eabd3a0a1e0099c2e30ac6741d20fa63ed Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 16:22:51 -0500
Subject: [PATCH 10/84] Removing unused code

---
 .../vimeo/stag/processor/StagProcessor.java   |  6 +-
 .../processor/generators/model/ClassInfo.java | 12 +---
 .../generators/model/SupportedTypesModel.java |  6 +-
 .../stag/processor/utils/ElementUtils.java    |  4 +-
 .../stag/processor/utils/FileGenUtils.java    |  4 +-
 .../vimeo/stag/processor/utils/TypeUtils.java | 60 ++-----------------
 6 files changed, 13 insertions(+), 79 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 4b7d9ef2..7148633e 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
@@ -31,6 +31,7 @@
 import com.vimeo.stag.processor.generators.EnumTypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.StagFactoryGenerator;
 import com.vimeo.stag.processor.generators.StagGenerator;
+import com.vimeo.stag.processor.generators.StagGenerator.SubFactoriesInfo;
 import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
 import com.vimeo.stag.processor.generators.model.AnnotatedClass;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
@@ -201,7 +202,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 generatedStagFactoryWrappers.add(new StagGenerator.SubFactoriesInfo(classInfos.get(0), stringListEntry.getKey() + "." + StagFactoryGenerator.NAME));
             }
 
-            generateStagFactory(stagFactoryGenerator, packageName, generatedStagFactoryWrappers);
+            generateStagFactory(packageName, generatedStagFactoryWrappers);
             KnownTypeAdapterFactoriesUtils.writeKnownTypes(processingEnv, packageName, supportedTypes);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -222,8 +223,7 @@ private void generateAdapterFactory(@NotNull List<ClassInfo> classInfos, @NotNul
         writeTypeSpecToFile(typeAdapterSpec, packageName);
     }
 
-    private void generateStagFactory(@NotNull StagGenerator stagGenerator,
-                                     @NotNull String packageName, List<StagGenerator.SubFactoriesInfo> generatedStagFactoryWrappers) throws IOException {
+    private void generateStagFactory(@NotNull String packageName, List<SubFactoriesInfo> generatedStagFactoryWrappers) throws IOException {
         // Create the type spec
         TypeSpec typeSpec = StagGenerator.createStagSpec(generatedStagFactoryWrappers);
 
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 aff4c700..7b930102 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
@@ -95,16 +95,6 @@ public String getClassAndPackage() {
         return mTypeName;
     }
 
-    /**
-     * return the class name as will be returned by Class.name() on runtime
-     *
-     * @return a valid class and package name.
-     */
-    @NotNull
-    public String getQualifiedClassName() {
-        return FileGenUtils.escapeStringForCodeBlock(mPackageName + "." + mClassName);
-    }
-
     /**
      * The TypeMirror object backing this
      * ClassInfo object.
@@ -146,4 +136,4 @@ public int hashCode() {
         result = 31 * result + mType.hashCode();
         return result;
     }
-}
\ 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 d2327ab7..7a359f0c 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
@@ -114,11 +114,8 @@ public AnnotatedClass addToKnownInheritedType(@NotNull TypeMirror type, @Nullabl
      *
      * @param type the type that maps to a specific
      *             AnnotatedClass.
-     * @return the AnnotatedClass object associated
-     * with the class type.
      */
-    @NotNull
-    public AnnotatedClass addSupportedType(@NotNull TypeMirror type) {
+    public void addSupportedType(@NotNull TypeMirror type) {
         String outerClassType = TypeUtils.getOuterClassType(type);
         AnnotatedClass model = getSupportedType(outerClassType);
 
@@ -129,7 +126,6 @@ public AnnotatedClass addSupportedType(@NotNull TypeMirror type) {
             }
             addSupportedType(model);
         }
-        return model;
     }
 
     /**
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 bf7b923b..b31e1007 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
@@ -90,8 +90,8 @@ public static String getPackage(@NotNull TypeMirror type) {
      * @param <T>             annotation type
      * @return {@code true} if the element is annotated, {@code false} otherwise
      */
-    public static <T extends Annotation> boolean isAnnotatedWith(@NotNull Class<T> annotationClass,
-                                                                 @Nullable Element element) {
+    private static <T extends Annotation> boolean isAnnotatedWith(@NotNull Class<T> annotationClass,
+                                                                  @Nullable Element element) {
         return element != null && element.getAnnotation(annotationClass) != null;
     }
 
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 8aadc879..acdc514d 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 {
 
-    public static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
+    private static final String CODE_BLOCK_ESCAPED_SEPARATOR = "$$";
     private static final String UNESCAPED_SEPARATOR = "$";
 
     private FileGenUtils() {
@@ -166,4 +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 26ad372d..279f9486 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
@@ -119,26 +119,6 @@ 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.
      *
@@ -466,16 +446,6 @@ public static boolean isSupportedPrimitive(@NotNull String type) {
         return PRIMITIVE_TO_OBJECT_MAP.containsKey(type);
     }
 
-    /**
-     * Method to check if the {@link TypeMirror} is of primitive type
-     *
-     * @param type :TypeMirror type
-     * @return String
-     */
-    public static String getObjectForPrimitive(@NotNull String type) {
-        return PRIMITIVE_TO_OBJECT_MAP.get(type);
-    }
-
     /**
      * Method to check if the {@link TypeMirror} is of {@link ArrayType}
      *
@@ -512,20 +482,6 @@ public static boolean isSupportedList(@Nullable TypeMirror type) {
                outerClassType.equals(Collection.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;
-        }
-        String outerClassType = TypeUtils.getOuterClassType(type);
-        return outerClassType.equals(Object.class.getName());
-    }
-
     /**
      * Method to check if the {@link TypeMirror} is of {@link Map} type
      *
@@ -649,16 +605,11 @@ public static JsonAdapterType getJsonAdapterType(@NotNull TypeMirror type) {
         }
     }
 
-    public static boolean isAssignable(TypeMirror t1, TypeMirror t2) {
-        return getUtils().isAssignable(t1, t2);
-    }
-
     @NotNull
-    public static DeclaredType getDeclaredTypeForParameterizedClass(@NotNull String className) {
-        Types types = getUtils();
-        WildcardType wildcardType = types.getWildcardType(null, null);
-        TypeMirror[] typex = {wildcardType};
-        return types.getDeclaredType(ElementUtils.getTypeElementFromQualifiedName(className), typex);
+    private static DeclaredType getDeclaredTypeForParameterizedClass(@NotNull String className) {
+        WildcardType wildcardType = getUtils().getWildcardType(null, null);
+        TypeMirror[] types = {wildcardType};
+        return getUtils().getDeclaredType(ElementUtils.getTypeElementFromQualifiedName(className), types);
     }
 
 
@@ -668,7 +619,4 @@ public static DeclaredType getDeclaredType(TypeElement typeElem, TypeMirror... t
         return types.getDeclaredType(typeElem, typeArgs);
     }
 
-    public static boolean isWildcardType(@Nullable TypeMirror typeMirror) {
-        return typeMirror instanceof WildcardType;
-    }
 }

From dc6a3e31f276e0fc5fab7d155fee0fe51e0e1137 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 16:55:12 -0500
Subject: [PATCH 11/84] Cleaning up code style

---
 .../generators/AdapterGenerator.java          | 14 +++++-----
 .../processor/generators/StagGenerator.java   | 10 +++----
 .../generators/TypeAdapterGenerator.java      | 26 ++++++++++---------
 .../generators/model/AnnotatedClass.java      |  2 +-
 .../generators/model/SupportedTypesModel.java |  6 ++---
 .../model/accessor/FieldAccessor.java         | 14 +++++-----
 .../stag/processor/utils/ElementUtils.java    |  2 +-
 .../utils/KnownTypeAdapterFactoriesUtils.java |  6 ++---
 .../vimeo/stag/processor/utils/TypeUtils.java |  2 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     | 16 ++++++------
 10 files changed, 50 insertions(+), 48 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 54901e1d..b9d4c813 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
@@ -52,11 +52,11 @@ public abstract class AdapterGenerator {
     @NotNull
     static String getJsonName(@NotNull Element element) {
 
-        String name = null != element.getAnnotation(SerializedName.class) ?
-                element.getAnnotation(SerializedName.class).value() :
-                null;
+        String name = element.getAnnotation(SerializedName.class) != null
+                ? element.getAnnotation(SerializedName.class).value()
+                : null;
 
-        if (null == name || name.isEmpty()) {
+        if (name == null || name.isEmpty()) {
             name = element.getSimpleName().toString();
         }
         return name;
@@ -70,9 +70,9 @@ 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 element.getAnnotation(SerializedName.class) != null
+                ? element.getAnnotation(SerializedName.class).alternate()
+                : null;
     }
 
     /**
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 c249852f..1a0fbe94 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
@@ -142,7 +142,7 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .addModifiers(Modifier.PRIVATE)
                 .addParameter(int.class, "index")
                 .addCode("TypeAdapterFactory typeAdapterFactory = typeAdapterFactoryArray[index];\n" +
-                         "if(null == typeAdapterFactory) {\n" +
+                         "if(typeAdapterFactory == null) {\n" +
                          "   typeAdapterFactory = createTypeAdapterFactory(index);\n" +
                          "   typeAdapterFactoryArray[index] = typeAdapterFactory;\n" +
                          "}\n" +
@@ -172,7 +172,7 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .addParameter(String.class, "currentPackageName");
 
         getSubTypeAdapterMethodBuilder.addStatement("Integer index = packageToIndexMap.get(currentPackageName);");
-        getSubTypeAdapterMethodBuilder.beginControlFlow("if(null != index)");
+        getSubTypeAdapterMethodBuilder.beginControlFlow("if(index != null)");
         getSubTypeAdapterMethodBuilder.addStatement("TypeAdapterFactory typeAdapterFactory = getTypeAdapterFactory(index)");
         getSubTypeAdapterMethodBuilder.addStatement("return typeAdapterFactory");
         getSubTypeAdapterMethodBuilder.endControlFlow();
@@ -186,7 +186,7 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
             getSubTypeAdapterMethodBuilder.addCode("\tresult = getTypeAdapterFactory(" + subFactoriesInfo.representativeClassInfo.getClassAndPackage() + ".class, " +
                                                    "currentPackageName, " + mapIndex + ");");
             getSubTypeAdapterMethodBuilder.addCode("\n");
-            getSubTypeAdapterMethodBuilder.addCode("\tif(null != result) {");
+            getSubTypeAdapterMethodBuilder.addCode("\tif(result != null) {");
             getSubTypeAdapterMethodBuilder.addCode("\n");
             getSubTypeAdapterMethodBuilder.addStatement("\t\treturn result");
             getSubTypeAdapterMethodBuilder.addCode("\t}\n");
@@ -215,12 +215,12 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
 
         createMethodBuilder.addStatement("Class<? super T> clazz = type.getRawType()");
         createMethodBuilder.addStatement("String currentPackageName = getPackageName(clazz)");
-        createMethodBuilder.beginControlFlow("if(null == currentPackageName)");
+        createMethodBuilder.beginControlFlow("if(currentPackageName == null)");
         createMethodBuilder.addStatement("return null");
         createMethodBuilder.endControlFlow();
         createMethodBuilder.addCode("\n");
         createMethodBuilder.addStatement("TypeAdapterFactory typeAdapterFactory = getSubFactory(currentPackageName)");
-        createMethodBuilder.addStatement("return null != typeAdapterFactory ? typeAdapterFactory.create(gson, type) : null");
+        createMethodBuilder.addStatement("return typeAdapterFactory != null ? typeAdapterFactory.create(gson, type) : null");
 
         adapterFactoryBuilder.addMethod(createMethodBuilder.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 eae91b37..0e2bbcc3 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
@@ -133,13 +133,15 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
 
             int paramIndex = 0;
             for (TypeMirror parameterTypeMirror : typeMirrors) {
-                TypeMirror classArg = null != classArguments && classArguments.size() > paramIndex ? classArguments.get(paramIndex) : null;
-                if (null != classArg) {
+                TypeMirror classArg = classArguments != null && classArguments.size() > paramIndex
+                        ? classArguments.get(paramIndex)
+                        : null;
+                if (classArg != null) {
                     fieldTypeVarsMap.put(classArg, parameterTypeMirror);
                 }
                 if (parameterTypeMirror.getKind() == TypeKind.WILDCARD) {
                     String upperBoundString = "";
-                    if (null != classArg && classArg.getKind() == TypeKind.TYPEVAR) {
+                    if (classArg != null && classArg.getKind() == TypeKind.TYPEVAR) {
                         TypeVariable typeVariable = (TypeVariable) classArg;
                         TypeMirror upperBound = typeVariable.getUpperBound();
                         if (TypeUtils.isParameterizedType(upperBound)) {
@@ -350,7 +352,7 @@ private static String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldT
                                                           @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
-        if (null == fieldName) {
+        if (fieldName == null) {
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             String fieldInitializationCode = "gson.getAdapter(" +
                                              getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo) + ")";
@@ -429,12 +431,12 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
 
-        if (null != knownTypeAdapter) {
+        if (knownTypeAdapter != null) {
             return knownTypeAdapter;
         }
 
         String fieldName = adapterFieldInfo.getFieldName(fieldType);
-        if (null != fieldName) {
+        if (fieldName != null) {
             return fieldName;
         }
 
@@ -533,7 +535,7 @@ private static AdapterFieldInfo addAdapterFields(@NotNull StagGenerator stagGene
                 adapterAccessor = getAdapterAccessor(fieldType, stagGenerator, typeVarsMap, result);
             }
 
-            if (null != adapterAccessor) {
+            if (adapterAccessor != null) {
                 result.addTypeToAdapterAccessor(fieldType, adapterAccessor);
             }
         }
@@ -571,7 +573,7 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
         Map<TypeMirror, String> typeVarsMap = new HashMap<>();
 
         int idx = 0;
-        if (null != typeArguments) {
+        if (typeArguments != null) {
             for (TypeMirror innerTypeMirror : typeArguments) {
                 if (innerTypeMirror.getKind() == TypeKind.TYPEVAR) {
                     TypeVariable typeVariable = (TypeVariable) innerTypeMirror;
@@ -595,7 +597,7 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
         }
 
         AnnotatedClass annotatedClass = mSupportedTypesModel.getSupportedType(typeMirror);
-        if (null == annotatedClass) {
+        if (annotatedClass == null) {
             throw new IllegalStateException("The AnnotatedClass class can't be null in TypeAdapterGenerator : " + typeMirror.toString());
         }
         Map<FieldAccessor, TypeMirror> memberVariables = annotatedClass.getMemberVariables();
@@ -675,12 +677,12 @@ private static class AdapterFieldInfo {
 
         String getAdapterAccessor(@NotNull TypeMirror typeMirror, @NotNull String fieldName) {
             FieldInfo adapterAccessor = mFieldAdapterAccessor.get(fieldName);
-            return null != adapterAccessor ? adapterAccessor.accessorVariable : mAdapterAccessor.get(typeMirror.toString());
+            return adapterAccessor != null ? adapterAccessor.accessorVariable : mAdapterAccessor.get(typeMirror.toString());
         }
 
         String updateAndGetTypeTokenFieldName(@NotNull TypeMirror fieldType, @NotNull String initializationCode) {
             FieldInfo result = mTypeTokenAccessorFields.get(fieldType.toString());
-            if (null == result) {
+            if (result == null) {
                 result = new FieldInfo(fieldType, initializationCode, "typeToken" + mTypeTokenAccessorFields.size());
                 mTypeTokenAccessorFields.put(fieldType.toString(), result);
             }
@@ -689,7 +691,7 @@ String updateAndGetTypeTokenFieldName(@NotNull TypeMirror fieldType, @NotNull St
 
         String getFieldName(@NotNull TypeMirror fieldType) {
             FieldInfo fieldInfo = mAdapterFields.get(fieldType.toString());
-            return null != fieldInfo ? fieldInfo.accessorVariable : null;
+            return fieldInfo != null ? fieldInfo.accessorVariable : null;
         }
 
         int size() {
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 5ed2a7cf..d24a549c 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
@@ -127,7 +127,7 @@ public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<Ann
     private void addMemberVariable(@NotNull FieldAccessor element, @NotNull TypeMirror typeMirror,
                                    @NotNull Map<String, FieldAccessor> variableNames) {
         FieldAccessor previousElement = variableNames.put(element.createGetterCode(), element);
-        if (null != previousElement) {
+        if (previousElement != null) {
             mMemberVariables.remove(previousElement);
             MessagerUtils.logInfo("Ignoring inherited Member variable with the same variable name in class" +
                                   element.toString() + ", with variable name " + previousElement.asType().toString());
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 7a359f0c..ef2f4a71 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
@@ -98,9 +98,9 @@ private AnnotatedClass getSupportedType(@NotNull String type) {
     public AnnotatedClass addToKnownInheritedType(@NotNull TypeMirror type, @Nullable FieldOption childFieldOption) {
         String outerClassType = TypeUtils.getOuterClassType(type);
         AnnotatedClass model = getSupportedType(outerClassType);
-        if (null == model) {
+        if (model == null) {
             model = mKnownInheritedTypesMap.get(outerClassType);
-            if (null == model) {
+            if (model == null) {
                 model = new AnnotatedClass(this, TypeUtils.safeTypeMirrorToTypeElement(type), mNamingNotation, childFieldOption);
                 mKnownInheritedTypesMap.put(outerClassType, model);
             }
@@ -121,7 +121,7 @@ public void addSupportedType(@NotNull TypeMirror type) {
 
         if (model == null) {
             model = mKnownInheritedTypesMap.get(outerClassType);
-            if (null == model) {
+            if (model == null) {
                 model = new AnnotatedClass(this, TypeUtils.safeTypeMirrorToTypeElement(type), mNamingNotation);
             }
             addSupportedType(model);
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/FieldAccessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/FieldAccessor.java
index f708367c..0b93bb0a 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/FieldAccessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/FieldAccessor.java
@@ -157,11 +157,11 @@ public final TypeMirror asType() {
     @NotNull
     public final String getJsonName() {
 
-        String name = null != mVariableElement.getAnnotation(SerializedName.class) ?
-                mVariableElement.getAnnotation(SerializedName.class).value() :
-                null;
+        String name = mVariableElement.getAnnotation(SerializedName.class) != null
+                ? mVariableElement.getAnnotation(SerializedName.class).value()
+                : null;
 
-        if (null == name || name.isEmpty()) {
+        if (name == null || name.isEmpty()) {
             name = mVariableElement.getSimpleName().toString();
         }
         return name;
@@ -174,9 +174,9 @@ public final String getJsonName() {
      */
     @Nullable
     public final String[] getAlternateJsonNames() {
-        return null != mVariableElement.getAnnotation(SerializedName.class) ?
-                mVariableElement.getAnnotation(SerializedName.class).alternate() :
-                null;
+        return mVariableElement.getAnnotation(SerializedName.class) != null
+                ? mVariableElement.getAnnotation(SerializedName.class).alternate()
+                : null;
     }
 
 }
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 b31e1007..cb00be16 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
@@ -60,7 +60,7 @@ private static Elements getUtils() {
     @Nullable
     public static TypeMirror getTypeFromQualifiedName(@NotNull String qualifiedName) {
         TypeElement typeElement = getTypeElementFromQualifiedName(qualifiedName);
-        return null != typeElement ? typeElement.asType() : null;
+        return typeElement != null ? typeElement.asType() : null;
     }
 
     @Nullable
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 5fac5b21..310410dd 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
@@ -92,7 +92,7 @@ private static void loadKnownTypesFromFiler(@NotNull Elements elementUtils, @Not
         String[] knownFactories = content.toString().split("[\\n\\r]+");
         for (String knownFactory : knownFactories) {
             TypeElement element = elementUtils.getTypeElement(knownFactory);
-            if (null != element) {
+            if (element != null) {
                 resultSet.add(element.asType());
             }
         }
@@ -113,7 +113,7 @@ private static void loadKnownTypesFromClasspath(@NotNull Elements elementUtils,
                 String line;
                 while ((line = bufferedReader.readLine()) != null) {
                     TypeElement element = elementUtils.getTypeElement(line.trim());
-                    if (null != element) {
+                    if (element != null) {
                         resultSet.add(element.asType());
                     }
 
@@ -124,4 +124,4 @@ private static void loadKnownTypesFromClasspath(@NotNull Elements elementUtils,
         }
     }
 
-}
\ 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 279f9486..72bbf03b 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
@@ -128,7 +128,7 @@ public static String getOuterClassType(@NotNull TypeMirror type) {
      */
     public static boolean isParameterizedType(@Nullable TypeMirror type) {
         List<? extends TypeMirror> typeArguments = getTypeArguments(type);
-        return null != typeArguments && !typeArguments.isEmpty();
+        return typeArguments != null && !typeArguments.isEmpty();
     }
 
     /**
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 6d6f70be..5a67fff6 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -494,7 +494,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable int[] value) thro
         public static int[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Integer> arrayList = INTEGER_ARRAY_LIST_ADAPTER.read(reader);
             int[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new int[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -529,7 +529,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable long[] value) thr
         public static long[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Long> arrayList = LONG_ARRAY_LIST_ADAPTER.read(reader);
             long[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new long[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -564,7 +564,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable double[] value) t
         public static double[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Double> arrayList = DOUBLE_ARRAY_LIST_ADAPTER.read(reader);
             double[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new double[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -599,7 +599,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable short[] value) th
         public static short[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Short> arrayList = SHORT_ARRAY_LIST_ADAPTER.read(reader);
             short[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new short[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -634,7 +634,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable float[] value) th
         public static float[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Float> arrayList = FLOAT_ARRAY_LIST_ADAPTER.read(reader);
             float[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new float[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -669,7 +669,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable boolean[] value)
         public static boolean[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Boolean> arrayList = BOOLEAN_ARRAY_LIST_ADAPTER.read(reader);
             boolean[] result = null;
-            if (null != arrayList) {
+            if (arrayList != null) {
                 result = new boolean[arrayList.size()];
                 for (int idx = 0; idx < arrayList.size(); idx++) {
                     result[idx] = arrayList.get(idx);
@@ -704,7 +704,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable byte[] value) thr
         public static byte[] read(@NotNull JsonReader reader) throws IOException {
             ArrayList<Byte> byteArrayList = BYTE_ARRAY_LIST_ADAPTER.read(reader);
             byte[] result = null;
-            if (null != byteArrayList) {
+            if (byteArrayList != null) {
                 result = new byte[byteArrayList.size()];
                 for (int idx = 0; idx < byteArrayList.size(); idx++) {
                     result[idx] = byteArrayList.get(idx);
@@ -737,7 +737,7 @@ public static void write(@NotNull JsonWriter writer, @Nullable char[] value) thr
         @Nullable
         public static char[] read(@NotNull JsonReader reader) throws IOException {
             String string = STRING_NULL_SAFE_TYPE_ADAPTER.read(reader);
-            return null != string ? string.toCharArray() : null;
+            return string != null ? string.toCharArray() : null;
         }
     }
 

From c1c5de46ed05ace303a11336e1cbd71a9a7f98ab Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 16:57:20 -0500
Subject: [PATCH 12/84] Renaming to match project style

---
 .../processor/generators/StagFactoryGenerator.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
index be86ab56..411864f2 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
@@ -23,17 +23,17 @@
 public class StagFactoryGenerator {
 
     @NotNull public static final String NAME = "StagFactory";
-    @NotNull private final List<ClassInfo> classInfoList;
-    @NotNull private final String fileName;
+    @NotNull private final List<ClassInfo> mClassInfoList;
+    @NotNull private final String mFileName;
 
     public StagFactoryGenerator(@NotNull List<ClassInfo> classInfoList, @NotNull String fileName) {
-        this.classInfoList = new ArrayList<>(classInfoList);
-        this.fileName = fileName;
+        mClassInfoList = new ArrayList<>(classInfoList);
+        mFileName = fileName;
     }
 
     @NotNull
     public TypeSpec getTypeAdapterFactorySpec() {
-        TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(fileName)
+        TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(mFileName)
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .addSuperinterface(TypeAdapterFactory.class)
                 .addMethod(getCreateMethodSpec());
@@ -58,7 +58,7 @@ private MethodSpec getCreateMethodSpec() {
                 .addModifiers(Modifier.PUBLIC)
                 .addCode("Class<? super T> clazz = type.getRawType();\n");
 
-        for (ClassInfo classInfo : classInfoList) {
+        for (ClassInfo classInfo : mClassInfoList) {
             builder.beginControlFlow("if (clazz == " + classInfo.getClassAndPackage() + ".class)");
             List<? extends TypeMirror> typeArguments = classInfo.getTypeArguments();
             if (typeArguments == null || typeArguments.isEmpty()) {

From 809e60fc7730afca0bcc0de23828692d91308317 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 17:45:03 -0500
Subject: [PATCH 13/84] Cleaning up generated code

---
 .../vimeo/stag/processor/StagProcessor.java   |   2 +-
 .../generators/EnumTypeAdapterGenerator.java  |  28 +++--
 .../processor/generators/StagGenerator.java   | 110 +++++++++---------
 3 files changed, 66 insertions(+), 74 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 7148633e..fac7687a 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
@@ -251,7 +251,7 @@ private void generateTypeAdapter(@NotNull SupportedTypesModel supportedTypesMode
     private void writeTypeSpecToFile(@NotNull TypeSpec typeSpec, @NotNull String packageName) throws IOException {
 
         // Create the Java file
-        JavaFile javaFile = JavaFile.builder(packageName, typeSpec).build();
+        JavaFile javaFile = JavaFile.builder(packageName, typeSpec).indent("    ").build();
 
         Filer filer = processingEnv.getFiler();
 
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 10b10ce6..cf2f6734 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
@@ -64,33 +64,31 @@ public EnumTypeAdapterGenerator(@NotNull ClassInfo info, @NotNull TypeElement el
 
     @NotNull
     private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName) {
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+        return 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();
+                .addException(IOException.class)
+                .addStatement("writer.value(object == null ? null : CONSTANT_TO_NAME.get(object))")
+                .build();
     }
 
     @NotNull
     private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName) {
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
+        return 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();
+                .addException(IOException.class)
+                .beginControlFlow("if (reader.peek() == com.google.gson.stream.JsonToken.NULL)")
+                .addStatement("reader.nextNull()")
+                .addStatement("return null")
+                .endControlFlow()
+                .addStatement("return NAME_TO_CONSTANT.get(reader.nextString())")
+                .build();
     }
 
     /**
@@ -175,4 +173,4 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
 
         return adapterBuilder.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 1a0fbe94..c05877cd 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,9 +113,9 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .returns(String.class)
                 .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
                 .addParameter(ParameterizedTypeName.get(ClassName.get(Class.class), genericTypeName), "clazz")
-                .addCode("String name = clazz.getName();\n" +
-                         "int last = name.lastIndexOf('.');\n" +
-                         "return last == -1 ? null : name.substring(0, last);\n");
+                .addStatement("String name = clazz.getName()")
+                .addStatement("int last = name.lastIndexOf('.')")
+                .addStatement("return last == -1 ? null : name.substring(0, last)");
         adapterFactoryBuilder.addMethod(getPackageNameMethodBuilder.build());
 
         MethodSpec.Builder createTypeAdapterFactoryMethodBuilder = MethodSpec.methodBuilder("createTypeAdapterFactory")
@@ -125,28 +125,28 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .addStatement("TypeAdapterFactory result = null")
                 .beginControlFlow("switch(index)");
 
-        int index = 0;
-        for (SubFactoriesInfo subFactoriesInfo : generatedStagFactoryWrappers) {
-            createTypeAdapterFactoryMethodBuilder.addCode("case " + index + " : ");
-            createTypeAdapterFactoryMethodBuilder.addStatement("\t\nresult = new " + subFactoriesInfo.classAndPackageName + "()");
-            createTypeAdapterFactoryMethodBuilder.addCode("\tbreak;\n");
-            index++;
+        for (int index = 0; index < generatedStagFactoryWrappers.size(); index++) {
+            createTypeAdapterFactoryMethodBuilder
+                    .addStatement("case $L : ", index)
+                    .addStatement("result = new $L()", generatedStagFactoryWrappers.get(index).classAndPackageName)
+                    .addStatement("break");
         }
 
-        createTypeAdapterFactoryMethodBuilder.endControlFlow();
-        createTypeAdapterFactoryMethodBuilder.addStatement("return result");
+        createTypeAdapterFactoryMethodBuilder
+                .endControlFlow()
+                .addStatement("return result");
         adapterFactoryBuilder.addMethod(createTypeAdapterFactoryMethodBuilder.build());
 
         MethodSpec.Builder getTypeAdapterFactoryMethodBuilder = MethodSpec.methodBuilder("getTypeAdapterFactory")
                 .returns(TypeAdapterFactory.class)
                 .addModifiers(Modifier.PRIVATE)
                 .addParameter(int.class, "index")
-                .addCode("TypeAdapterFactory typeAdapterFactory = typeAdapterFactoryArray[index];\n" +
-                         "if(typeAdapterFactory == null) {\n" +
-                         "   typeAdapterFactory = createTypeAdapterFactory(index);\n" +
-                         "   typeAdapterFactoryArray[index] = typeAdapterFactory;\n" +
-                         "}\n" +
-                         "return typeAdapterFactory;\n");
+                .addStatement("TypeAdapterFactory typeAdapterFactory = typeAdapterFactoryArray[index]")
+                .beginControlFlow("if (typeAdapterFactory == null)")
+                .addStatement("typeAdapterFactory = createTypeAdapterFactory(index)")
+                .addStatement("typeAdapterFactoryArray[index] = typeAdapterFactory")
+                .endControlFlow()
+                .addStatement("return typeAdapterFactory");
         adapterFactoryBuilder.addMethod(getTypeAdapterFactoryMethodBuilder.build());
 
         MethodSpec.Builder getTypeAdapterMethodBuilder = MethodSpec.methodBuilder("getTypeAdapterFactory")
@@ -155,12 +155,12 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .addParameter(ParameterizedTypeName.get(ClassName.get(Class.class), TypeVariableName.get("?")), "clazz")
                 .addParameter(String.class, "currentPackageName")
                 .addParameter(int.class, "index")
-                .addCode("String packageName = getPackageName(clazz);\n" +
-                         "packageToIndexMap.put(packageName, index);\n" +
-                         "if(currentPackageName.equals(packageName)) {\n" +
-                         "   return getTypeAdapterFactory(index);\n" +
-                         "}\n" +
-                         "return null;\n");
+                .addStatement("String packageName = getPackageName(clazz)")
+                .addStatement("packageToIndexMap.put(packageName, index)")
+                .beginControlFlow("if (currentPackageName.equals(packageName))")
+                .addStatement("return getTypeAdapterFactory(index)")
+                .endControlFlow()
+                .addStatement("return null");
         adapterFactoryBuilder.addMethod(getTypeAdapterMethodBuilder.build());
 
         MethodSpec.Builder getSubTypeAdapterMethodBuilder = MethodSpec.methodBuilder("getSubFactory")
@@ -169,33 +169,28 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                                        .addMember("value", "\"fallthrough\"")
                                        .build())
                 .addModifiers(Modifier.PRIVATE, Modifier.SYNCHRONIZED)
-                .addParameter(String.class, "currentPackageName");
-
-        getSubTypeAdapterMethodBuilder.addStatement("Integer index = packageToIndexMap.get(currentPackageName);");
-        getSubTypeAdapterMethodBuilder.beginControlFlow("if(index != null)");
-        getSubTypeAdapterMethodBuilder.addStatement("TypeAdapterFactory typeAdapterFactory = getTypeAdapterFactory(index)");
-        getSubTypeAdapterMethodBuilder.addStatement("return typeAdapterFactory");
-        getSubTypeAdapterMethodBuilder.endControlFlow();
-        getSubTypeAdapterMethodBuilder.addStatement("TypeAdapterFactory result = null");
-        getSubTypeAdapterMethodBuilder.beginControlFlow("switch(packageToIndexMap.size())");
-
-        int mapIndex = 0;
-        for (SubFactoriesInfo subFactoriesInfo : generatedStagFactoryWrappers) {
-            getSubTypeAdapterMethodBuilder.addCode("case " + mapIndex + " : ");
-            getSubTypeAdapterMethodBuilder.addCode("\n");
-            getSubTypeAdapterMethodBuilder.addCode("\tresult = getTypeAdapterFactory(" + subFactoriesInfo.representativeClassInfo.getClassAndPackage() + ".class, " +
-                                                   "currentPackageName, " + mapIndex + ");");
-            getSubTypeAdapterMethodBuilder.addCode("\n");
-            getSubTypeAdapterMethodBuilder.addCode("\tif(result != null) {");
-            getSubTypeAdapterMethodBuilder.addCode("\n");
-            getSubTypeAdapterMethodBuilder.addStatement("\t\treturn result");
-            getSubTypeAdapterMethodBuilder.addCode("\t}\n");
-            mapIndex++;
+                .addParameter(String.class, "currentPackageName")
+                .addStatement("Integer index = packageToIndexMap.get(currentPackageName);")
+                .beginControlFlow("if (index != null)")
+                .addStatement("TypeAdapterFactory typeAdapterFactory = getTypeAdapterFactory(index)")
+                .addStatement("return typeAdapterFactory")
+                .endControlFlow()
+                .addStatement("TypeAdapterFactory result = null")
+                .beginControlFlow("switch(packageToIndexMap.size())");
+
+        for (int index = 0; index < generatedStagFactoryWrappers.size(); index++) {
+            getSubTypeAdapterMethodBuilder
+                    .addStatement("case $L :", index)
+                    .addStatement("result = getTypeAdapterFactory($L.class, currentPackageName, $L)", generatedStagFactoryWrappers.get(index).representativeClassInfo.getClassAndPackage(), index)
+                    .beginControlFlow("if (result != null)")
+                    .addStatement("return result")
+                    .endControlFlow();
         }
 
-        getSubTypeAdapterMethodBuilder.addCode("default : ");
-        getSubTypeAdapterMethodBuilder.addStatement("\t\nreturn null");
-        getSubTypeAdapterMethodBuilder.endControlFlow();
+        getSubTypeAdapterMethodBuilder
+                .addStatement("default :")
+                .addStatement("return null")
+                .endControlFlow();
 
         adapterFactoryBuilder.addMethod(getSubTypeAdapterMethodBuilder.build());
 
@@ -211,16 +206,15 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericTypeName))
                 .addParameter(Gson.class, "gson")
                 .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericTypeName),
-                              "type");
-
-        createMethodBuilder.addStatement("Class<? super T> clazz = type.getRawType()");
-        createMethodBuilder.addStatement("String currentPackageName = getPackageName(clazz)");
-        createMethodBuilder.beginControlFlow("if(currentPackageName == null)");
-        createMethodBuilder.addStatement("return null");
-        createMethodBuilder.endControlFlow();
-        createMethodBuilder.addCode("\n");
-        createMethodBuilder.addStatement("TypeAdapterFactory typeAdapterFactory = getSubFactory(currentPackageName)");
-        createMethodBuilder.addStatement("return typeAdapterFactory != null ? typeAdapterFactory.create(gson, type) : null");
+                              "type")
+
+                .addStatement("Class<? super T> clazz = type.getRawType()")
+                .addStatement("String currentPackageName = getPackageName(clazz)")
+                .beginControlFlow("if (currentPackageName == null)")
+                .addStatement("return null")
+                .endControlFlow()
+                .addStatement("TypeAdapterFactory typeAdapterFactory = getSubFactory(currentPackageName)")
+                .addStatement("return typeAdapterFactory != null ? typeAdapterFactory.create(gson, type) : null");
 
         adapterFactoryBuilder.addMethod(createMethodBuilder.build());
 

From 7a0b6f288800d7dcc2349e60aec50ecd09517ac6 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 21 Feb 2018 18:27:51 -0500
Subject: [PATCH 14/84] improving code generation of switches

---
 .../codegen/SwitchCodeBlockBuilder.java       | 101 ++++++++++++++++++
 .../processor/generators/StagGenerator.java   |  35 +++---
 2 files changed, 123 insertions(+), 13 deletions(-)
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/codegen/SwitchCodeBlockBuilder.java

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/codegen/SwitchCodeBlockBuilder.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/codegen/SwitchCodeBlockBuilder.java
new file mode 100644
index 00000000..a0e75e31
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/codegen/SwitchCodeBlockBuilder.java
@@ -0,0 +1,101 @@
+package com.vimeo.stag.processor.codegen;
+
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.CodeBlock.Builder;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An extension of JavaPoet that makes creating switches easier.
+ * <p>
+ * Created by restainoa on 2/21/18.
+ */
+public class SwitchCodeBlockBuilder {
+
+    private final CodeBlock.Builder mCodeBlockBuilder = CodeBlock.builder();
+    private boolean mIsCaseIndented;
+
+    /**
+     * Begins a switch.
+     *
+     * @param switchCode the switch code.
+     * @param args       the arguments for the switch, optional.
+     * @return the builder.
+     */
+    public SwitchCodeBlockBuilder beginSwitch(@NotNull String switchCode, @NotNull Object... args) {
+        mCodeBlockBuilder.beginControlFlow(switchCode, args);
+        return this;
+    }
+
+    /**
+     * Ends the switch.
+     *
+     * @return the builder.
+     */
+    public SwitchCodeBlockBuilder endSwitch() {
+        mCodeBlockBuilder.endControlFlow();
+        return this;
+    }
+
+    /**
+     * Begins a case, taking care of control characters like the colon.
+     *
+     * @param caseCode the case to use.
+     * @param args     the optional arguments.
+     * @return the builder.
+     */
+    public SwitchCodeBlockBuilder beginCase(@NotNull String caseCode, @NotNull Object... args) {
+        if (mIsCaseIndented) {
+            mCodeBlockBuilder.unindent();
+        }
+        mCodeBlockBuilder.add(caseCode + ":\n", args).indent();
+        mIsCaseIndented = true;
+        return this;
+    }
+
+    /**
+     * @see CodeBlock.Builder#addStatement(CodeBlock)
+     */
+    public SwitchCodeBlockBuilder addStatement(@NotNull String caseCode, @NotNull Object... args) {
+        mCodeBlockBuilder.addStatement(caseCode, args);
+        return this;
+    }
+
+    /**
+     * @see CodeBlock.Builder#beginControlFlow(String, Object...)
+     */
+    public SwitchCodeBlockBuilder beginControlFlow(@NotNull String caseCode, @NotNull Object... args) {
+        mCodeBlockBuilder.beginControlFlow(caseCode, args);
+        return this;
+    }
+
+    /**
+     * @see Builder#endControlFlow()
+     */
+    public SwitchCodeBlockBuilder endControlFlow() {
+        mCodeBlockBuilder.endControlFlow();
+        return this;
+    }
+
+    /**
+     * Ends the case with a break.
+     *
+     * @return the builder.
+     */
+    public SwitchCodeBlockBuilder endCase() {
+        mCodeBlockBuilder.addStatement("break").unindent();
+        mIsCaseIndented = false;
+        return this;
+    }
+
+    /**
+     * Builds the code block.
+     *
+     * @return the {@link CodeBlock}.
+     */
+    public CodeBlock build() {
+        return mCodeBlockBuilder.build();
+    }
+
+
+}
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 c05877cd..fcdf8fa1 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
@@ -34,6 +34,7 @@
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import com.vimeo.stag.processor.codegen.SwitchCodeBlockBuilder;
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
@@ -122,18 +123,22 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .returns(TypeAdapterFactory.class)
                 .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
                 .addParameter(int.class, "index")
-                .addStatement("TypeAdapterFactory result = null")
-                .beginControlFlow("switch(index)");
+                .addStatement("TypeAdapterFactory result = null");
+
+        SwitchCodeBlockBuilder factorySwitchBuilder = new SwitchCodeBlockBuilder()
+                .beginSwitch("switch(index)");
 
         for (int index = 0; index < generatedStagFactoryWrappers.size(); index++) {
-            createTypeAdapterFactoryMethodBuilder
-                    .addStatement("case $L : ", index)
+            factorySwitchBuilder
+                    .beginCase("case $L", index)
                     .addStatement("result = new $L()", generatedStagFactoryWrappers.get(index).classAndPackageName)
-                    .addStatement("break");
+                    .endCase();
         }
 
+        factorySwitchBuilder.endSwitch();
+
         createTypeAdapterFactoryMethodBuilder
-                .endControlFlow()
+                .addCode(factorySwitchBuilder.build())
                 .addStatement("return result");
         adapterFactoryBuilder.addMethod(createTypeAdapterFactoryMethodBuilder.build());
 
@@ -175,22 +180,26 @@ private static TypeSpec getAdapterFactorySpec(@NotNull List<SubFactoriesInfo> ge
                 .addStatement("TypeAdapterFactory typeAdapterFactory = getTypeAdapterFactory(index)")
                 .addStatement("return typeAdapterFactory")
                 .endControlFlow()
-                .addStatement("TypeAdapterFactory result = null")
-                .beginControlFlow("switch(packageToIndexMap.size())");
+                .addStatement("TypeAdapterFactory result = null");
+
+        SwitchCodeBlockBuilder subFactorySwitchBuilder = new SwitchCodeBlockBuilder()
+                .beginSwitch("switch(packageToIndexMap.size())");
 
         for (int index = 0; index < generatedStagFactoryWrappers.size(); index++) {
-            getSubTypeAdapterMethodBuilder
-                    .addStatement("case $L :", index)
+            subFactorySwitchBuilder
+                    .beginCase("case $L", index)
                     .addStatement("result = getTypeAdapterFactory($L.class, currentPackageName, $L)", generatedStagFactoryWrappers.get(index).representativeClassInfo.getClassAndPackage(), index)
                     .beginControlFlow("if (result != null)")
                     .addStatement("return result")
                     .endControlFlow();
         }
 
-        getSubTypeAdapterMethodBuilder
-                .addStatement("default :")
+        subFactorySwitchBuilder
+                .beginCase("default")
                 .addStatement("return null")
-                .endControlFlow();
+                .endSwitch();
+
+        getSubTypeAdapterMethodBuilder.addCode(subFactorySwitchBuilder.build());
 
         adapterFactoryBuilder.addMethod(getSubTypeAdapterMethodBuilder.build());
 

From 5256e66c1e3f83fdac65108ae6c37f53cd00e0e1 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 22 Feb 2018 12:32:10 -0500
Subject: [PATCH 15/84] Adding codecov yml to set branch

---
 .codecov.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .codecov.yml

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 00000000..457c19d4
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,2 @@
+codecov:
+  branch: develop

From a2276a15d85e9b8e9920269b666b2a7eb558a73c Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Tue, 27 Feb 2018 16:33:35 -0500
Subject: [PATCH 16/84] Using PODAM to run some integration tests on type
 adapter output

---
 integration-test-java/build.gradle            |  1 +
 .../sample_java_model/AbstractDataList.java   | 18 ++++++++++
 .../sample_java_model/AlternateNameModel.java | 22 +++++++++++-
 .../sample_java_model/BaseExternalModel.java  | 18 ++++++++++
 .../SuperAbstractDataList.java                | 18 ++++++++++
 .../AbstractDataListTest.java                 |  2 ++
 .../AlternateNameModel1Test.java              |  8 ++++-
 .../AlternateNameModelTest.java               |  8 ++++-
 .../BaseExternalModelTest.java                |  8 ++++-
 .../sample_java_model/BooleanFieldsTest.java  |  5 ++-
 .../ConcreteDataListTest.java                 |  7 ++++
 .../DynamicallyTypedModelTest.java            |  3 ++
 .../DynamicallyTypedWildcardTest.java         |  2 ++
 .../EnumWithFieldsModelTest.java              |  4 ++-
 .../ExternalAbstractClassTest.java            |  4 ++-
 .../sample_java_model/ExternalModel1Test.java |  4 ++-
 .../sample_java_model/ExternalModel2Test.java |  4 ++-
 .../ExternalModelGeneric1Test.java            |  4 ++-
 .../ExternalModelGenericTest.java             |  4 ++-
 .../ModelWithNestedInterfaceTest.java         |  4 ++-
 .../NativeJavaModelExtensionTest.java         |  4 ++-
 ...vaModelExtensionWithoutAnnotationTest.java |  4 ++-
 .../NativeJavaModelTest.java                  |  4 ++-
 .../sample_java_model/PrivateMembersTest.java |  4 ++-
 .../RawGenericFieldTest.java                  |  2 ++
 .../SuperAbstractDataListTest.java            |  2 ++
 .../SwappableParserExampleModelTest.java      |  2 ++
 .../sample_java_model/WildcardModelTest.java  |  4 ++-
 .../WrapperTypeAdapterModelTest.java          |  2 ++
 .../HungarianNotationClassInfoStrategy.java   | 20 +++++++++++
 .../Utils.java                                | 34 ++++++++++++++++++-
 31 files changed, 212 insertions(+), 18 deletions(-)
 create mode 100644 integration-test-java/src/test/java/verification/HungarianNotationClassInfoStrategy.java
 rename integration-test-java/src/test/java/{com/vimeo/sample_java_model => verification}/Utils.java (71%)

diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index 3fe51506..5174fc02 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     apt project(':stag-library-compiler')
 
     testImplementation 'junit:junit:4.12'
+    testImplementation 'uk.co.jemos.podam:podam:7.1.0.RELEASE'
 }
 
 gradle.projectsEvaluated {
diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/AbstractDataList.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/AbstractDataList.java
index bfc6418c..fa2b643b 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/AbstractDataList.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/AbstractDataList.java
@@ -39,4 +39,22 @@
 public abstract class AbstractDataList<T> extends SuperAbstractDataList<BaseExternalModel, ArrayList<T>> {
 
     public int page;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+        if (!super.equals(o)) { return false; }
+
+        AbstractDataList<?> that = (AbstractDataList<?>) o;
+
+        return page == that.page;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + page;
+        return result;
+    }
 }
diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/AlternateNameModel.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/AlternateNameModel.java
index ee2ccab6..8f744c64 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/AlternateNameModel.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/AlternateNameModel.java
@@ -27,4 +27,24 @@ public String getAndroidNameVersions() {
     public void setAndroidNameVersions(String androidNameVersions) {
         mAndroidNameVersions = androidNameVersions;
     }
-}
\ No newline at end of file
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+
+        AlternateNameModel that = (AlternateNameModel) o;
+
+        if (mAndroidVersions != null ? !mAndroidVersions.equals(that.mAndroidVersions) : that.mAndroidVersions != null) {
+            return false;
+        }
+        return mAndroidNameVersions != null ? mAndroidNameVersions.equals(that.mAndroidNameVersions) : that.mAndroidNameVersions == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = mAndroidVersions != null ? mAndroidVersions.hashCode() : 0;
+        result = 31 * result + (mAndroidNameVersions != null ? mAndroidNameVersions.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/BaseExternalModel.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/BaseExternalModel.java
index 7d68bf21..bdce49bb 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/BaseExternalModel.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/BaseExternalModel.java
@@ -27,4 +27,22 @@ public int getBaseValue() {
     public void setBaseValue(int baseValue) {
         this.mBaseValue = baseValue;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+
+        BaseExternalModel that = (BaseExternalModel) o;
+
+        if (mBaseValue != that.mBaseValue) { return false; }
+        return mType != null ? mType.equals(that.mType) : that.mType == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = mType != null ? mType.hashCode() : 0;
+        result = 31 * result + mBaseValue;
+        return result;
+    }
 }
diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/SuperAbstractDataList.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/SuperAbstractDataList.java
index 283c7e4c..5a90f541 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/SuperAbstractDataList.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/SuperAbstractDataList.java
@@ -41,4 +41,22 @@ public abstract class SuperAbstractDataList<T, K> {
     public T paging;
 
     public K data;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+
+        SuperAbstractDataList<?, ?> that = (SuperAbstractDataList<?, ?>) o;
+
+        if (paging != null ? !paging.equals(that.paging) : that.paging != null) { return false; }
+        return data != null ? data.equals(that.data) : that.data == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = paging != null ? paging.hashCode() : 0;
+        result = 31 * result + (data != null ? data.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AbstractDataListTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AbstractDataListTest.java
index c502a862..4441086b 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AbstractDataListTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AbstractDataListTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link AbstractDataList}.
  */
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModel1Test.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModel1Test.java
index 327dd28f..e1d0ea51 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModel1Test.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModel1Test.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,8 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(AlternateNameModel1.class);
     }
 
-}
\ No newline at end of file
+    @Test
+    public void verifyTypeAdapterCorrectness() {
+        Utils.verifyTypeAdapterCorrectness(AlternateNameModel1.class);
+    }
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModelTest.java
index 5210a0a3..518f8e87 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/AlternateNameModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,8 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(AlternateNameModel.class);
     }
 
-}
\ No newline at end of file
+    @Test
+    public void verifyTypeAdapterCorrectness() {
+        Utils.verifyTypeAdapterCorrectness(AlternateNameModel.class);
+    }
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/BaseExternalModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/BaseExternalModelTest.java
index 6d719c84..67ac2fe8 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/BaseExternalModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/BaseExternalModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by anthonycr on 2/7/17.
  */
@@ -12,4 +14,8 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(BaseExternalModel.class);
     }
 
-}
\ No newline at end of file
+    @Test
+    public void verifyTypeAdapterCorrectness() {
+        Utils.verifyTypeAdapterCorrectness(BaseExternalModel.class);
+    }
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/BooleanFieldsTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/BooleanFieldsTest.java
index 7aba4b35..92a28fff 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/BooleanFieldsTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/BooleanFieldsTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link BooleanFields}.
  * <p>
@@ -13,4 +15,5 @@ public class BooleanFieldsTest {
     public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(BooleanFields.class);
     }
-}
\ No newline at end of file
+
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ConcreteDataListTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ConcreteDataListTest.java
index 0967f909..73290cfb 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ConcreteDataListTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ConcreteDataListTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link ConcreteDataList}.
  */
@@ -11,4 +13,9 @@ public class ConcreteDataListTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ConcreteDataList.class);
     }
+
+    @Test
+    public void verifyTypeAdapterCorrectness() {
+        Utils.verifyTypeAdapterCorrectness(ConcreteDataList.class);
+    }
 }
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedModelTest.java
index 2fd4c2d0..d590b384 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link DynamicallyTypedModel}.
  */
@@ -11,4 +13,5 @@ public class DynamicallyTypedModelTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(DynamicallyTypedModel.class);
     }
+
 }
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedWildcardTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedWildcardTest.java
index 1facac24..d7ab2c30 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedWildcardTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/DynamicallyTypedWildcardTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link DynamicallyTypedWildcard}.
  */
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/EnumWithFieldsModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/EnumWithFieldsModelTest.java
index b051e933..8f69ae23 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/EnumWithFieldsModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/EnumWithFieldsModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by anthonycr on 4/9/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(EnumWithFieldsModel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalAbstractClassTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalAbstractClassTest.java
index 4b4e09c7..a8fd5b96 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalAbstractClassTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalAbstractClassTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasNotGenerated() throws Exception {
         Utils.verifyNoTypeAdapterGeneration(ExternalAbstractClass.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel1Test.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel1Test.java
index 1e63487e..9b0ac3d5 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel1Test.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel1Test.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModel1.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel2Test.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel2Test.java
index 5a061de0..7e320a3f 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel2Test.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModel2Test.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModel2.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGeneric1Test.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGeneric1Test.java
index 58b2165d..2e7974a4 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGeneric1Test.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGeneric1Test.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelGeneric1.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGenericTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGenericTest.java
index 69866fde..cd20cc11 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGenericTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ExternalModelGenericTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelGeneric.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ModelWithNestedInterfaceTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ModelWithNestedInterfaceTest.java
index 0d46af2e..de65bb13 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/ModelWithNestedInterfaceTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/ModelWithNestedInterfaceTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/3/17.
  */
@@ -23,4 +25,4 @@ public void typeAdapterWasNotGenerated_ModelWithNestedInterface_NestedInterface_
         Utils.verifyNoTypeAdapterGeneration(ModelWithNestedInterface.NestedInterface.NestedModel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionTest.java
index 4c67338b..139884fb 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 public class NativeJavaModelExtensionTest {
 
     @Test
@@ -9,4 +11,4 @@ public void typeAdapterWasGenerated_NativeJavaModelExtension() throws Exception
         Utils.verifyTypeAdapterGeneration(NativeJavaModelExtension.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionWithoutAnnotationTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionWithoutAnnotationTest.java
index 5e1d2d5a..78682e5b 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionWithoutAnnotationTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelExtensionWithoutAnnotationTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 public class NativeJavaModelExtensionWithoutAnnotationTest {
 
     @Test
@@ -9,4 +11,4 @@ public void typeAdapterWasNotGenerated_NativeJavaModelExtension() throws Excepti
         Utils.verifyNoTypeAdapterGeneration(NativeJavaModelExtensionWithoutAnnotation.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelTest.java
index 602b6f26..a513a7fd 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeJavaModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 public class NativeJavaModelTest {
 
     @Test
@@ -34,4 +36,4 @@ public void typeAdapterWasGenerated_NativeJavaModel_NestedExtensionFromNoAnnotat
         Utils.verifyTypeAdapterGeneration(NativeJavaModel.NestedExtensionFromNoAnnotation.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/PrivateMembersTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/PrivateMembersTest.java
index bf7d89ac..870ab68a 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/PrivateMembersTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/PrivateMembersTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Tests for {@link PrivateMembers}.
  * <p>
@@ -14,4 +16,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(PrivateMembers.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/RawGenericFieldTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/RawGenericFieldTest.java
index 5b494e48..e176d010 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/RawGenericFieldTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/RawGenericFieldTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link RawGenericField}.
  */
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SuperAbstractDataListTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SuperAbstractDataListTest.java
index 860bd61e..8dd59536 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SuperAbstractDataListTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SuperAbstractDataListTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Integration tests for {@link SuperAbstractDataList}.
  */
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
index 2ed24670..92079ce2 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
@@ -37,6 +37,8 @@
 
 import java.io.IOException;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link SwappableParserExampleModel}.
  */
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WildcardModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WildcardModelTest.java
index d23ad89e..c87064a6 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WildcardModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WildcardModelTest.java
@@ -4,6 +4,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 @UseStag
 public class WildcardModelTest {
 
@@ -11,4 +13,4 @@ public class WildcardModelTest {
     public void typeAdapterWasGenerated_WildcardModel() throws Exception {
         Utils.verifyTypeAdapterGeneration(WildcardModel.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
index 61e7d938..4db882fb 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/WrapperTypeAdapterModelTest.java
@@ -15,6 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import verification.Utils;
+
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/integration-test-java/src/test/java/verification/HungarianNotationClassInfoStrategy.java b/integration-test-java/src/test/java/verification/HungarianNotationClassInfoStrategy.java
new file mode 100644
index 00000000..00267ae1
--- /dev/null
+++ b/integration-test-java/src/test/java/verification/HungarianNotationClassInfoStrategy.java
@@ -0,0 +1,20 @@
+package verification;
+
+import java.util.regex.Pattern;
+
+import uk.co.jemos.podam.api.AbstractClassInfoStrategy;
+
+/**
+ * A class info strategy that allows for hungarian notation in field names.
+ * <p>
+ * Created by restainoa on 2/27/18.
+ */
+public class HungarianNotationClassInfoStrategy extends AbstractClassInfoStrategy {
+
+    @Override
+    protected String extractFieldNameFromMethod(String methodName, Pattern pattern) {
+        final String fieldName = super.extractFieldNameFromMethod(methodName, pattern);
+        return "m" + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java b/integration-test-java/src/test/java/verification/Utils.java
similarity index 71%
rename from integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java
rename to integration-test-java/src/test/java/verification/Utils.java
index 9394e8da..c95e347b 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java
+++ b/integration-test-java/src/test/java/verification/Utils.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.vimeo.sample_java_model;
+package verification;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
@@ -30,6 +30,12 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
+
+import uk.co.jemos.podam.api.PodamFactory;
+import uk.co.jemos.podam.api.PodamFactoryImpl;
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -73,4 +79,30 @@ public static <T> void verifyNoTypeAdapterGeneration(@NotNull Class<T> clazz) th
         assertNull("Type adapter should not have been generated by Stag", typeAdapter);
     }
 
+    /**
+     * Verifies that the type adapter for a class is correct. It does this by manufacturing an
+     * instance of the class, writing it to JSON, and then reading that object back out of JSON
+     * and comparing the two instances.
+     *
+     * @param clazz the {@link Class} to use to get the {@link TypeAdapter}.
+     */
+    public static <T> void verifyTypeAdapterCorrectness(@NotNull Class<T> clazz) {
+        final PodamFactory factory = new PodamFactoryImpl();
+        factory.setClassStrategy(new HungarianNotationClassInfoStrategy());
+
+        final T object = factory.manufacturePojo(clazz);
+        final TypeAdapter<T> typeAdapter = getTypeAdapter(clazz);
+
+
+        T newObject = null;
+        if (typeAdapter != null) {
+            String json = typeAdapter.toJson(object);
+            try {
+                newObject = typeAdapter.fromJson(json);
+            } catch (IOException ignored) {}
+        }
+
+        assertEquals(object, newObject);
+    }
+
 }

From 7403f8a692521a18c76cb734b5c631bb55e64048 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Tue, 27 Feb 2018 16:55:46 -0500
Subject: [PATCH 17/84] Moving utils classes to verification package for
 clarity

---
 .../vimeo/integration_test_android/ClassWithMapTypesTest.java | 4 +++-
 .../ComplexGenericClassExtendedTest.java                      | 4 +++-
 .../integration_test_android/ComplexGenericClassTest.java     | 4 +++-
 .../com/vimeo/integration_test_android/TestModelTest.java     | 4 +++-
 .../UnserializablePlatformTypeTest.java                       | 4 +++-
 .../integration_test_android => verification}/Utils.java      | 2 +-
 .../test/java/com/vimeo/sample/model/AccessModifiersTest.java | 2 +-
 .../java/com/vimeo/sample/model/AnnotationExampleTest.java    | 2 +-
 .../java/com/vimeo/sample/model/ClassWithArrayTypesTest.java  | 2 +-
 .../com/vimeo/sample/model/ClassWithNestedInterfaceTest.java  | 4 ++--
 .../test/java/com/vimeo/sample/model/ConcreteClassTest.java   | 2 +-
 .../test/java/com/vimeo/sample/model/DuplicateNameTest.java   | 4 ++--
 .../src/test/java/com/vimeo/sample/model/EnumExampleTest.java | 2 +-
 .../vimeo/sample/model/ExternalModelDerivedExampleTest.java   | 4 ++--
 .../com/vimeo/sample/model/ExternalModelExample1Test.java     | 4 ++--
 .../com/vimeo/sample/model/ExternalModelExample2Test.java     | 4 ++--
 .../com/vimeo/sample/model/ExternalModelExample3Test.java     | 4 ++--
 .../java/com/vimeo/sample/model/ExternalModelExampleTest.java | 4 ++--
 .../com/vimeo/sample/model/FieldOptionAllExampleTest.java     | 4 ++--
 .../com/vimeo/sample/model/FieldOptionNoneExampleTest.java    | 4 ++--
 .../vimeo/sample/model/FieldOptionsSerializedName2Test.java   | 4 ++--
 .../vimeo/sample/model/FieldOptionsSerializedName3Test.java   | 4 ++--
 .../vimeo/sample/model/FieldOptionsSerializedNameTest.java    | 4 ++--
 .../test/java/com/vimeo/sample/model/GenericClassTest.java    | 4 ++--
 .../java/com/vimeo/sample/model/IdenticalFieldTypesTest.java  | 4 ++--
 .../com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java  | 4 ++--
 .../src/test/java/com/vimeo/sample/model/NestedClassTest.java | 2 +-
 .../src/test/java/com/vimeo/sample/model/NestedEnumTest.java  | 4 ++--
 .../src/test/java/com/vimeo/sample/model/NestedModelTest.java | 4 ++--
 .../java/com/vimeo/sample/model/NoUseStagAnnotationTest.java  | 2 +-
 .../test/java/com/vimeo/sample/model/ObjectExampleTest.java   | 2 +-
 .../com/vimeo/sample/model/OuterClassWithInnerModelTest.java  | 2 +-
 .../com/vimeo/sample/model/PrimitiveTypesExampleTest.java     | 4 ++--
 .../test/java/com/vimeo/sample/model/RecursiveClassTest.java  | 4 ++--
 .../test/java/com/vimeo/sample/model/SampleInterfaceTest.java | 2 +-
 .../vimeo/sample/model/SubClassWithSameVariableNameTest.java  | 4 ++--
 .../java/com/vimeo/sample/model/TestExternalExampleTest.java  | 4 ++--
 .../java/com/vimeo/sample/model/basic/BasicModel1Test.java    | 2 +-
 .../java/com/vimeo/sample/model/basic/BasicModel2Test.java    | 4 ++--
 .../sample/model/json_adapter/JsonAdapterExampleTest.java     | 2 +-
 .../src/test/java/com/vimeo/sample/model1/DataTest.java       | 4 ++--
 .../test/java/com/vimeo/sample/model1/DuplicateNameTest.java  | 4 ++--
 .../java/com/vimeo/sample/model1/ParameterizedDataTest.java   | 4 ++--
 .../test/java/{com/vimeo/sample => verification}/Utils.java   | 2 +-
 .../kotlin/com/vimeo/dummy/sample_kotlin/BoolFieldsTest.kt    | 3 ++-
 .../vimeo/dummy/sample_kotlin/KotlinConcreteExampleTest.kt    | 3 ++-
 .../com/vimeo/dummy/sample_kotlin/KotlinGenericExampleTest.kt | 3 ++-
 .../kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt | 1 +
 .../{com/vimeo/dummy/sample_kotlin => verification}/Utils.kt  | 2 +-
 .../src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java   | 2 ++
 .../src/test/java/{com/vimeo/stag => verification}/Utils.java | 2 +-
 51 files changed, 90 insertions(+), 74 deletions(-)
 rename integration-test-android/src/test/java/{com/vimeo/integration_test_android => verification}/Utils.java (98%)
 rename integration-test-java-cross-module/src/test/java/{com/vimeo/sample => verification}/Utils.java (98%)
 rename integration-test-kotlin/src/test/kotlin/{com/vimeo/dummy/sample_kotlin => verification}/Utils.kt (98%)
 rename stag-library/src/test/java/{com/vimeo/stag => verification}/Utils.java (99%)

diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java
index d020eea6..b5c310bf 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java
+++ b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ClassWithMapTypes.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java
index 8da7f1b1..9606245c 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java
+++ b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 public class ComplexGenericClassExtendedTest {
 
     @Test
@@ -9,4 +11,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ComplexGenericClassExtended.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java
index c67896b6..ed9ee78f 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java
+++ b/integration-test-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ComplexGenericClass.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java
index 6543a718..153f3204 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java
+++ b/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link TestModel}.
  */
@@ -11,4 +13,4 @@ public class TestModelTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(TestModel.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java
index 6ffbd0ef..7a2f6724 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java
+++ b/integration-test-android/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link UnserializablePlatformType}.
  */
@@ -11,4 +13,4 @@ public class UnserializablePlatformTypeTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(UnserializablePlatformType.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/Utils.java b/integration-test-android/src/test/java/verification/Utils.java
similarity index 98%
rename from integration-test-android/src/test/java/com/vimeo/integration_test_android/Utils.java
rename to integration-test-android/src/test/java/verification/Utils.java
index 61316e9a..aa61acbb 100644
--- a/integration-test-android/src/test/java/com/vimeo/integration_test_android/Utils.java
+++ b/integration-test-android/src/test/java/verification/Utils.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.vimeo.integration_test_android;
+package verification;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java
index 348896a8..6e19dc3c 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java
index c02626c4..9183bcf3 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java
index e1f471ca..6f2692cd 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java
index 795cd110..4bc0316e 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -18,4 +18,4 @@ public void typeAdapterWasNotGenerated_AvailabilityIntentDef() throws Exception
     public void typeAdapterWasGenerated_ClassWithNestedInterface() throws Exception {
         Utils.verifyTypeAdapterGeneration(ClassWithNestedInterface.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java
index aef716d2..b154f509 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java
index c5beea56..24bc2607 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -13,4 +13,4 @@ public class DuplicateNameTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(DuplicateName.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java
index 9a4e9a42..e7644aa8 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java
index 1c746098..1cbe1c45 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 import com.vimeo.sample_java_model.BaseExternalModel;
 
 import org.junit.Test;
@@ -22,4 +22,4 @@ public void verifyNoTypeAdapterWasGenerated_BaseExternalModel() throws Exception
         Utils.verifyNoTypeAdapterGeneration(BaseExternalModel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java
index 85c6d33f..62ae1cb1 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample1.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java
index 46f4a5ad..9661f1fb 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample2.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java
index f7a8c679..89f7cebb 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample3.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java
index 87551367..87b4f6b9 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java
index d76e29b0..fec50867 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionAllExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java
index 619c5177..d8e2b679 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionNoneExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java
index 33d70e1c..83e5aa99 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName2.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java
index 9ec98eb2..2dcbd76d 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName3.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java
index 38d702f6..16d467d7 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java
index 47a91ecf..707e9f22 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(GenericClass.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java
index 5ae3276a..9c7cd338 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(IdenticalFieldTypes.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java
index cdcdcb0d..eed0b30f 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(KnownTypeAdaptersExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java
index dd44b19e..96603e0b 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java
index 96227dde..fd0baf1a 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -21,4 +21,4 @@ public void typeAdapterWasGenerated_NestedEnum_NestedWithAnnotation() throws Exc
         Utils.verifyTypeAdapterGeneration(NestedEnum.NestedWithAnnotation.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java
index 811762b4..c745797b 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -19,4 +19,4 @@ public void typeAdapterWasGenerated_NestedModel_NestedEnum() throws Exception {
         Utils.verifyTypeAdapterGeneration(NestedModel.NestedEnum.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java
index 559f4e87..b9dd8c43 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
index 614a0967..0cad36ca 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ObjectExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/OuterClassWithInnerModelTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/OuterClassWithInnerModelTest.java
index 1e1b4b25..50768efc 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/OuterClassWithInnerModelTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/OuterClassWithInnerModelTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/PrimitiveTypesExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/PrimitiveTypesExampleTest.java
index be8ab62b..dc21d65d 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/PrimitiveTypesExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/PrimitiveTypesExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(PrimitiveTypesExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/RecursiveClassTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/RecursiveClassTest.java
index fe10b2da..7d1b1278 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/RecursiveClassTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/RecursiveClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(RecursiveClass.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SampleInterfaceTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SampleInterfaceTest.java
index 47c79ce0..c42dc4d6 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SampleInterfaceTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SampleInterfaceTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SubClassWithSameVariableNameTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SubClassWithSameVariableNameTest.java
index 7f0c84d2..203200bc 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SubClassWithSameVariableNameTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/SubClassWithSameVariableNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(SubClassWithSameVariableName.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/TestExternalExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/TestExternalExampleTest.java
index 237b7042..7389d31a 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/TestExternalExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/TestExternalExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(TestExternalExample.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel1Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel1Test.java
index 44099041..bcbe2a85 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel1Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel1Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model.basic;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel2Test.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel2Test.java
index 066787e2..b3ee511c 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel2Test.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/basic/BasicModel2Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model.basic;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(BasicModel2.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
index 73366009..fc8583f4 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/json_adapter/JsonAdapterExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model.json_adapter;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DataTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DataTest.java
index d162deb3..bd8f546e 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DataTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DataTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model1;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasNotGenerated() throws Exception {
         Utils.verifyNoTypeAdapterGeneration(Data.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DuplicateNameTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DuplicateNameTest.java
index f830ca0d..305ae327 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DuplicateNameTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/DuplicateNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model1;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -13,4 +13,4 @@ public class DuplicateNameTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(DuplicateName.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/ParameterizedDataTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/ParameterizedDataTest.java
index 97c4402d..db13be31 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/ParameterizedDataTest.java
+++ b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model1/ParameterizedDataTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model1;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -13,4 +13,4 @@ public class ParameterizedDataTest {
     public void verifyTypeAdapterWasNotGenerated() throws Exception {
         Utils.verifyNoTypeAdapterGeneration(ParameterizedData.class);
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/Utils.java b/integration-test-java-cross-module/src/test/java/verification/Utils.java
similarity index 98%
rename from integration-test-java-cross-module/src/test/java/com/vimeo/sample/Utils.java
rename to integration-test-java-cross-module/src/test/java/verification/Utils.java
index b2c2ab51..846ce734 100644
--- a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/Utils.java
+++ b/integration-test-java-cross-module/src/test/java/verification/Utils.java
@@ -1,4 +1,4 @@
-package com.vimeo.sample;
+package verification;
 
 import android.support.annotation.NonNull;
 
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/BoolFieldsTest.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/BoolFieldsTest.kt
index e5e6699f..caf0ef09 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/BoolFieldsTest.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/BoolFieldsTest.kt
@@ -1,6 +1,7 @@
 package com.vimeo.dummy.sample_kotlin
 
 import org.junit.Test
+import verification.Utils
 
 /**
  * Unit tests for [BoolFields].
@@ -18,4 +19,4 @@ class BoolFieldsTest {
     fun verifyTypeAdapterCorrect() {
         Utils.verifyTypeAdapterCorrectness(BoolFields::class)
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinConcreteExampleTest.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinConcreteExampleTest.kt
index 35b958b5..731981a9 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinConcreteExampleTest.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinConcreteExampleTest.kt
@@ -1,6 +1,7 @@
 package com.vimeo.dummy.sample_kotlin
 
 import org.junit.Test
+import verification.Utils
 
 /**
  * Unit tests for [KotlinConcreteExample].
@@ -18,4 +19,4 @@ class KotlinConcreteExampleTest {
     fun verifyTypeAdapterCorrectness() {
         Utils.verifyTypeAdapterCorrectness(KotlinConcreteExample::class)
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinGenericExampleTest.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinGenericExampleTest.kt
index 5f42cd8b..ae8ee6ee 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinGenericExampleTest.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinGenericExampleTest.kt
@@ -1,6 +1,7 @@
 package com.vimeo.dummy.sample_kotlin
 
 import org.junit.Test
+import verification.Utils
 
 /**
  * Unit tests for [KotlinGenericExample]
@@ -13,4 +14,4 @@ class KotlinGenericExampleTest {
     fun verifyTypeAdapterGenerated() {
         Utils.verifyNoTypeAdapterGeneration(KotlinGenericExample::class)
     }
-}
\ No newline at end of file
+}
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
index 22049aa0..5f2c37c8 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/KotlinSamplesTest.kt
@@ -1,6 +1,7 @@
 package com.vimeo.dummy.sample_kotlin
 
 import org.junit.Test
+import verification.Utils
 
 /**
  * Unit tests for [KotlinSamples].
diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt b/integration-test-kotlin/src/test/kotlin/verification/Utils.kt
similarity index 98%
rename from integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
rename to integration-test-kotlin/src/test/kotlin/verification/Utils.kt
index 2c99eef4..00e71139 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
+++ b/integration-test-kotlin/src/test/kotlin/verification/Utils.kt
@@ -1,4 +1,4 @@
-package com.vimeo.dummy.sample_kotlin
+package verification
 
 import com.google.gson.Gson
 import com.google.gson.TypeAdapter
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 c6732d05..b96ae491 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -15,6 +15,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import verification.Utils;
+
 public class KnownTypeAdaptersTest {
 
     /**
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.java b/stag-library/src/test/java/verification/Utils.java
similarity index 99%
rename from stag-library/src/test/java/com/vimeo/stag/Utils.java
rename to stag-library/src/test/java/verification/Utils.java
index 88cc64bf..bd69ac03 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.java
+++ b/stag-library/src/test/java/verification/Utils.java
@@ -1,4 +1,4 @@
-package com.vimeo.stag;
+package verification;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

From 16932f69e14ab45fe3c8b9bc44093c7356ed65e7 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 12 Mar 2018 10:23:27 -0400
Subject: [PATCH 18/84] Remove info logging, replace with debug logging

---
 .../processor/generators/model/AnnotatedClass.java     |  4 ++--
 .../generators/model/accessor/MethodFieldAccessor.java | 10 +++++-----
 .../com/vimeo/stag/processor/utils/MessagerUtils.java  |  4 ----
 3 files changed, 7 insertions(+), 11 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 d24a549c..59b3e733 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
@@ -129,8 +129,8 @@ private void addMemberVariable(@NotNull FieldAccessor element, @NotNull TypeMirr
         FieldAccessor previousElement = variableNames.put(element.createGetterCode(), element);
         if (previousElement != null) {
             mMemberVariables.remove(previousElement);
-            MessagerUtils.logInfo("Ignoring inherited Member variable with the same variable name in class" +
-                                  element.toString() + ", with variable name " + previousElement.asType().toString());
+            DebugLog.log("Ignoring inherited Member variable with the same variable name in class" +
+                         element.toString() + ", with variable name " + previousElement.asType().toString());
         }
         mMemberVariables.put(element, typeMirror);
     }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
index 00118116..1ce69439 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
@@ -1,7 +1,7 @@
 package com.vimeo.stag.processor.generators.model.accessor;
 
+import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.ElementUtils;
-import com.vimeo.stag.processor.utils.MessagerUtils;
 import com.vimeo.stag.processor.utils.StringUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
 
@@ -88,7 +88,7 @@ private static boolean isSupportedSetter(@NotNull final ExecutableElement method
     @NotNull
     private static String findSetterMethodName(@NotNull final VariableElement variableElement,
                                                @NotNull final Notation namingNotation) throws UnsupportedOperationException {
-        MessagerUtils.logInfo("Looking for setter");
+        DebugLog.log("Looking for setter");
 
         for (final ExecutableElement method : getSiblingMethods(variableElement)) {
 
@@ -98,7 +98,7 @@ private static String findSetterMethodName(@NotNull final VariableElement variab
                 parameters.size() == 1 &&
                 TypeUtils.areEqual(parameters.get(0).asType(), variableElement.asType()) &&
                 isSupportedSetter(method, variableElement, namingNotation)) {
-                MessagerUtils.logInfo("Found setter");
+                DebugLog.log("Found setter");
 
                 return method.getSimpleName().toString();
             }
@@ -138,7 +138,7 @@ private static boolean variableNameBeginsWithIs(@NotNull final String variableNa
     @NotNull
     private static String findGetterMethodName(@NotNull final VariableElement variableElement,
                                                @NotNull final Notation namingNotation) throws UnsupportedOperationException {
-        MessagerUtils.logInfo("Looking for getter");
+        DebugLog.log("Looking for getter");
 
         for (final ExecutableElement method : getSiblingMethods(variableElement)) {
 
@@ -147,7 +147,7 @@ private static String findGetterMethodName(@NotNull final VariableElement variab
                 && method.getParameters().isEmpty()
                 && isSupportedGetter(method, variableElement, namingNotation)) {
 
-                MessagerUtils.logInfo("Found getter");
+                DebugLog.log("Found getter");
 
                 return method.getSimpleName().toString();
             }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
index ba4aa4ab..975d9a66 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
@@ -57,8 +57,4 @@ public static void reportWarning(@NotNull String message) {
         getMessager().printMessage(Kind.MANDATORY_WARNING, message);
     }
 
-    public static void logInfo(@NotNull String message) {
-        getMessager().printMessage(Kind.NOTE, message);
-    }
-
 }

From 72e8308a01d7e4f197f3fc57fbf6aaf85cec0c75 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 12 Mar 2018 10:31:07 -0400
Subject: [PATCH 19/84] Adding documentation to logging class

---
 .../com/vimeo/stag/processor/utils/DebugLog.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java
index 6f5b799f..cb7a2375 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java
@@ -28,6 +28,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * A logging utility that only logs to the console if {@link StagProcessor#DEBUG} is true.
+ */
 public final class DebugLog {
 
     private static final String TAG = "Stag";
@@ -36,6 +39,11 @@ private DebugLog() {
         throw new UnsupportedOperationException("This class is not instantiable");
     }
 
+    /**
+     * Log the provided message with the default log tag "Stag"
+     *
+     * @param message the message to log.
+     */
     public static void log(@Nullable CharSequence message) {
         if (StagProcessor.DEBUG) {
             //noinspection UseOfSystemOutOrSystemErr
@@ -43,6 +51,12 @@ public static void log(@Nullable CharSequence message) {
         }
     }
 
+    /**
+     * Log the provided message with an additional log tag.
+     *
+     * @param tag     the tag to add to the log.
+     * @param message the message to log.
+     */
     public static void log(@NotNull CharSequence tag, @Nullable CharSequence message) {
         if (StagProcessor.DEBUG) {
             //noinspection UseOfSystemOutOrSystemErr

From b877aa13f55af0b53125a0a6a44385ecdf05c174 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Mon, 12 Mar 2018 14:07:36 -0400
Subject: [PATCH 20/84] Add kotlin to initialization section

---
 README.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e3268a5a..2d5e1c22 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,28 @@ gradle.projectsEvaluated {
 }
 ```
 
-### Android Gradle
+### Kotlin Gradle
+```groovy
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    def stagVersion = '2.5.1'
+    compile "com.vimeo.stag:stag-library:$stagVersion"
+    kapt "com.vimeo.stag:stag-library-compiler:$stagVersion"
+}
+
+kapt {
+    correctErrorTypes = true
+    // Optional annotation processor arguments (see below)
+    arguments {
+        arg("stagDebug", "true")
+        arg("stagGeneratedPackageName", "com.vimeo.sample.stag.generated")
+        arg("stagAssumeHungarianNotation", "true")
+    }
+}
+```
+
+### Android Gradle (Java)
 
 ```groovy
 dependencies {

From ba84b441b57e3c4d77080218ea894b282c4c9b53 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 12 Mar 2018 14:31:48 -0400
Subject: [PATCH 21/84] Importing the correct assert class

---
 .../kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
index 2c99eef4..9dfdfd4d 100644
--- a/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
+++ b/integration-test-kotlin/src/test/kotlin/com/vimeo/dummy/sample_kotlin/Utils.kt
@@ -3,13 +3,14 @@ package com.vimeo.dummy.sample_kotlin
 import com.google.gson.Gson
 import com.google.gson.TypeAdapter
 import com.google.gson.reflect.TypeToken
-import junit.framework.Assert
-import junit.framework.Assert.assertEquals
+import com.vimeo.sample_kotlin.stag.generated.Stag
+import org.junit.Assert.*
 import uk.co.jemos.podam.api.PodamFactoryImpl
 import kotlin.reflect.KClass
-import com.vimeo.sample_kotlin.stag.generated.Stag
 
 /**
+ * Unit test utilities.
+ *
  * Created by restainoa on 5/8/17.
  */
 class Utils {
@@ -35,7 +36,7 @@ class Utils {
         @Throws(Exception::class)
         fun <T : Any> verifyTypeAdapterGeneration(clazz: KClass<T>) {
             val typeAdapter = getTypeAdapter(clazz)
-            Assert.assertNotNull("Type adapter should have been generated by Stag", typeAdapter)
+            assertNotNull("Type adapter should have been generated by Stag", typeAdapter)
         }
 
         /**
@@ -50,7 +51,7 @@ class Utils {
         @Throws(Exception::class)
         fun <T : Any> verifyNoTypeAdapterGeneration(clazz: KClass<T>) {
             val typeAdapter = getTypeAdapter(clazz)
-            Assert.assertNull("Type adapter should not have been generated by Stag", typeAdapter)
+            assertNull("Type adapter should not have been generated by Stag", typeAdapter)
         }
 
         /**

From ab9f753d03a295fa8c16382c1c394722067f440a Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:18:08 -0400
Subject: [PATCH 22/84] Update gradle plugin

---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index bde702bb..2d9492f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,11 +17,11 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "net.ltgt.gradle:gradle-apt-plugin:0.11"
+        classpath 'net.ltgt.gradle:gradle-apt-plugin:0.15'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8becd2b3..207e72b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 25 13:24:54 EDT 2017
+#Mon Apr 09 13:12:02 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

From cce8ac42b2806d4195c8de291d6b9e13fc9f3a79 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:18:21 -0400
Subject: [PATCH 23/84] Update kotlin version

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

diff --git a/build.gradle b/build.gradle
index 2d9492f7..420f12ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
-    ext.kotlinVersion = '1.2.21'
+    ext.kotlinVersion = '1.2.31'
     ext.jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
     ext.gsonVersion = '2.8.2'
 

From 3df0ec3f7718d93e3f17b4f48d43da7231fda04b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:22:41 -0400
Subject: [PATCH 24/84] Updating various dependencies

---
 build.gradle                                    | 2 +-
 integration-test-android/build.gradle           | 4 ++--
 integration-test-java-cross-module/build.gradle | 2 +-
 sample/build.gradle                             | 2 +-
 stag-library-compiler/build.gradle              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 420f12ae..ffabaf1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     // android dependencies
     ext.targetSdk = 27
     ext.minSdk = 14
-    ext.buildTools = "27.0.2"
+    ext.buildTools = "27.0.3"
 
     repositories {
         google()
diff --git a/integration-test-android/build.gradle b/integration-test-android/build.gradle
index c22c7ea4..2ae3cfa1 100644
--- a/integration-test-android/build.gradle
+++ b/integration-test-android/build.gradle
@@ -35,8 +35,8 @@ android {
 dependencies {
     testImplementation 'junit:junit:4.12'
 
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-annotations:27.1.1'
 
     implementation project(':stag-library')
     annotationProcessor project(':stag-library-compiler')
diff --git a/integration-test-java-cross-module/build.gradle b/integration-test-java-cross-module/build.gradle
index 3b35b8ac..2f3c5309 100644
--- a/integration-test-java-cross-module/build.gradle
+++ b/integration-test-java-cross-module/build.gradle
@@ -3,7 +3,7 @@ apply plugin: "net.ltgt.apt"
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:support-annotations:27.1.1'
 
     implementation project(':stag-library')
     apt project(':stag-library-compiler')
diff --git a/sample/build.gradle b/sample/build.gradle
index 498539fc..400fcdd9 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -45,7 +45,7 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 
     implementation project(':stag-library')
     annotationProcessor project(':stag-library-compiler')
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 4022643e..852376ed 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -24,8 +24,8 @@ jacocoTestReport.dependsOn test
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.9.0'
-    testImplementation 'com.google.testing.compile:compile-testing:0.13'
+    testImplementation 'org.assertj:assertj-core:3.9.1'
+    testImplementation 'com.google.testing.compile:compile-testing:0.15'
     testImplementation project(path: ':integration-test-java')
     testImplementation project(path: ':integration-test-java-cross-module')
 

From adcf72269160993b79886cf0449f0bbd79a99da6 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:28:54 -0400
Subject: [PATCH 25/84] Removing unnecessary throws docs

---
 .../vimeo/stag/processor/TypeUtilsUnitTest.kt |  2 -
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 52 -------------------
 2 files changed, 54 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index a20439bf..ca00c1d6 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -75,8 +75,6 @@ class TypeUtilsUnitTest : BaseUnitTest() {
      * added, removed, renamed, or changed, will probably
      * break this test either explicitly, or implicitly.
      * Any changes to that class need to be reflected here.
-     *
-     * @throws Exception thrown if the test fails.
      */
     @Test
     fun getConcreteMembers_isCorrect() {
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 c6732d05..fee0d150 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -19,8 +19,6 @@ public class KnownTypeAdaptersTest {
 
     /**
      * Test for {@link KnownTypeAdapters#INTEGER}
-     *
-     * @throws Exception
      */
     @Test
     public void testForIntegerTypeAdapter() throws Exception {
@@ -41,8 +39,6 @@ public void testForIntegerTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveIntTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveIntegerTypeAdapter() throws Exception {
@@ -61,8 +57,6 @@ public void testForPrimitiveIntegerTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveIntegerArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayIntegerTypeAdapter() throws Exception {
@@ -87,8 +81,6 @@ public void testForPrimitiveArrayIntegerTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#BYTE}
-     *
-     * @throws Exception
      */
     @Test
     public void testForByteTypeAdapter() throws Exception {
@@ -111,8 +103,6 @@ public void testForByteTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveByteTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveByteTypeAdapter() throws Exception {
@@ -131,8 +121,6 @@ public void testForPrimitiveByteTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveByteArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayByteTypeAdapter() throws Exception {
@@ -157,8 +145,6 @@ public void testForPrimitiveArrayByteTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#SHORT}
-     *
-     * @throws Exception
      */
     @Test
     public void testForShortTypeAdapter() throws Exception {
@@ -181,8 +167,6 @@ public void testForShortTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveShortTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveShortTypeAdapter() throws Exception {
@@ -201,8 +185,6 @@ public void testForPrimitiveShortTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveShortArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayShortTypeAdapter() throws Exception {
@@ -227,8 +209,6 @@ public void testForPrimitiveArrayShortTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#LONG}
-     *
-     * @throws Exception
      */
     @Test
     public void testForLongTypeAdapter() throws Exception {
@@ -251,8 +231,6 @@ public void testForLongTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveLongTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveLongTypeAdapter() throws Exception {
@@ -271,8 +249,6 @@ public void testForPrimitiveLongTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveLongArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayLongTypeAdapter() throws Exception {
@@ -297,8 +273,6 @@ public void testForPrimitiveArrayLongTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#FLOAT}
-     *
-     * @throws Exception
      */
     @Test
     public void testForFloatTypeAdapter() throws Exception {
@@ -321,8 +295,6 @@ public void testForFloatTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveFloatTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveFloatTypeAdapter() throws Exception {
@@ -341,8 +313,6 @@ public void testForPrimitiveFloatTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveFloatArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayFloatTypeAdapter() throws Exception {
@@ -367,8 +337,6 @@ public void testForPrimitiveArrayFloatTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#DOUBLE}
-     *
-     * @throws Exception
      */
     @Test
     public void testForDoubleTypeAdapter() throws Exception {
@@ -390,8 +358,6 @@ public void testForDoubleTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveDoubleTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveDoubleTypeAdapter() throws Exception {
@@ -410,8 +376,6 @@ public void testForPrimitiveDoubleTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveDoubleArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayDoubleTypeAdapter() throws Exception {
@@ -436,8 +400,6 @@ public void testForPrimitiveArrayDoubleTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveBooleanTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveBooleanTypeAdapter() throws Exception {
@@ -456,8 +418,6 @@ public void testForPrimitiveBooleanTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveBooleanArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayBooleanTypeAdapter() throws Exception {
@@ -482,8 +442,6 @@ public void testForPrimitiveArrayBooleanTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveCharTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveCharacterTypeAdapter() throws Exception {
@@ -502,8 +460,6 @@ public void testForPrimitiveCharacterTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveCharArrayAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForPrimitiveArrayCharacterTypeAdapter() throws Exception {
@@ -542,8 +498,6 @@ public void testForPrimitiveArrayCharacterTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.ListTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForListTypeAdapter() throws Exception {
@@ -584,8 +538,6 @@ public void testForListTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters.MapTypeAdapter}
-     *
-     * @throws Exception
      */
     @Test
     public void testForMapTypeAdapter() throws Exception {
@@ -622,8 +574,6 @@ public void testForMapTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#JSON_OBJECT}
-     *
-     * @throws Exception
      */
     @Test
     public void testForJsonObjectTypeAdapter() throws Exception {
@@ -641,8 +591,6 @@ public void testForJsonObjectTypeAdapter() throws Exception {
 
     /**
      * Test for {@link KnownTypeAdapters#JSON_ARRAY}
-     *
-     * @throws Exception
      */
     @Test
     public void testForJsonArrayTypeAdapter() throws Exception {

From a8ca0be4bea215e6bc0b960b002e49e98dbf91ca Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:41:34 -0400
Subject: [PATCH 26/84] Cleaning up KnownTypeAdaptersTest

---
 stag-library-compiler/build.gradle            |   2 +-
 .../java/com/vimeo/stag/processor/Utils.kt    |   1 -
 stag-library/build.gradle                     |   3 +
 .../com/vimeo/stag/KnownTypeAdapters.java     |   2 +-
 .../com/vimeo/stag/KnownTypeAdaptersTest.java |  22 +++-
 .../src/test/java/com/vimeo/stag/Utils.java   | 101 ----------------
 .../src/test/java/com/vimeo/stag/Utils.kt     | 109 ++++++++++++++++++
 7 files changed, 132 insertions(+), 108 deletions(-)
 delete mode 100644 stag-library/src/test/java/com/vimeo/stag/Utils.java
 create mode 100644 stag-library/src/test/java/com/vimeo/stag/Utils.kt

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 852376ed..3055bffb 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     // Used by both auto-service and compile-testing, we need to resolve the version for them.
     implementation 'com.google.guava:guava:23.5-jre'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
 }
 
 test {
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
index 998c05fc..d74eaee5 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
@@ -43,7 +43,6 @@ internal object Utils {
         return types
     }
 
-    @Throws(Exception::class)
     fun <T> testZeroArgumentConstructorFinalClass(clazz: Class<T>) {
         var exceptionThrown = false
         try {
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index ffb4a665..301298a6 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'kotlin'
 apply plugin: 'jacoco'
 apply plugin: 'maven-publish'
 
@@ -25,6 +26,8 @@ dependencies {
     compile "com.google.code.gson:gson:$gsonVersion"
     compile 'com.intellij:annotations:12.0@jar'
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.9.1'
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
 }
 
 tasks.withType(Javadoc).all { enabled = true }
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 5a67fff6..de221f44 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -67,7 +67,7 @@
 public final class KnownTypeAdapters {
 
     private KnownTypeAdapters() {
-        throw new IllegalStateException("KnownTypeAdapters cannot be instantiated");
+        throw new UnsupportedOperationException("KnownTypeAdapters cannot be instantiated");
     }
 
     /**
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 fee0d150..8ded85d9 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -15,8 +15,16 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SuppressWarnings("MagicNumber")
 public class KnownTypeAdaptersTest {
 
+    @Test
+    public void testThatKnownTypeAdaptersIsNotInstantiable() {
+        Utils.testZeroArgumentConstructorFinalClass(KnownTypeAdapters.class);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#INTEGER}
      */
@@ -403,17 +411,15 @@ public void testForPrimitiveArrayDoubleTypeAdapter() throws Exception {
      */
     @Test
     public void testForPrimitiveBooleanTypeAdapter() throws Exception {
-        boolean value = true;
-
         // create a string writer, and write the value to it using adapter
         StringWriter stringWriter = new StringWriter();
-        KnownTypeAdapters.PrimitiveBooleanTypeAdapter.write(new JsonWriter(stringWriter), value);
+        KnownTypeAdapters.PrimitiveBooleanTypeAdapter.write(new JsonWriter(stringWriter), true);
         String jsonString = stringWriter.toString();
 
         // call the TypeAdapter#read method
         boolean readValue = KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(new JsonReader(new StringReader(jsonString)), false);
 
-        Assert.assertEquals(value, readValue);
+        Assert.assertEquals(true, readValue);
     }
 
     /**
@@ -514,6 +520,8 @@ public void testForListTypeAdapter() throws Exception {
 
         ArrayList<String> readValue = listTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
+        assertThat(readValue).isNotNull();
+
         Assert.assertEquals(dummyList.size(), readValue.size());
         for (int i = 0; i < dummyList.size(); i++) {
             Assert.assertEquals(dummyList.get(i), readValue.get(i));
@@ -530,6 +538,8 @@ public void testForListTypeAdapter() throws Exception {
 
         ArrayList<Integer> readValue1 = listTypeAdapter1.read(new JsonReader(new StringReader(jsonString)));
 
+        assertThat(readValue1).isNotNull();
+
         Assert.assertEquals(intDummyList.size(), readValue1.size());
         for (int i = 0; i < intDummyList.size(); i++) {
             Assert.assertEquals(intDummyList.get(i), readValue1.get(i));
@@ -554,6 +564,8 @@ public void testForMapTypeAdapter() throws Exception {
 
         HashMap<String, String> readValue = mapTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
+        assertThat(readValue).isNotNull();
+
         Assert.assertEquals(dummyMap.size(), readValue.size());
         Utils.assertMapsEqual(dummyMap, readValue);
 
@@ -568,6 +580,8 @@ public void testForMapTypeAdapter() throws Exception {
 
         HashMap<Integer, Integer> readValue1 = mapTypeAdapter1.read(new JsonReader(new StringReader(jsonString)));
 
+        assertThat(readValue1).isNotNull();
+
         Assert.assertEquals(intDummyMap.size(), readValue1.size());
         Utils.assertMapsEqual(intDummyMap, readValue1);
     }
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.java b/stag-library/src/test/java/com/vimeo/stag/Utils.java
deleted file mode 100644
index 88cc64bf..00000000
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.vimeo.stag;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
-import org.junit.Assert;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public final class Utils {
-
-    private Utils() {}
-
-    public static <K, V> void assertMapsEqual(Map<K, V> map1, Map<K, V> map2) throws Exception {
-        for (Entry<K, V> kvEntry : map1.entrySet()) {
-            Assert.assertEquals(kvEntry.getValue(), map2.get(kvEntry.getKey()));
-        }
-
-        for (Entry<K, V> kvEntry : map2.entrySet()) {
-            Assert.assertEquals(kvEntry.getValue(), map1.get(kvEntry.getKey()));
-        }
-    }
-
-    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 HashMap<String, String> createStringDummyMap() {
-        HashMap<String, String> stringMap = new HashMap<>();
-
-        stringMap.put("abc", "0");
-        stringMap.put("abc1", "1");
-        stringMap.put("abc2", "2");
-        stringMap.put("abc3", "3");
-        stringMap.put("abc4", "4");
-        stringMap.put("abc5", "5");
-
-        return stringMap;
-    }
-
-    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;
-    }
-
-    public static HashMap<Integer, Integer> createIntegerDummyMap() {
-        HashMap<Integer, Integer> integerMap = new HashMap<>();
-
-        integerMap.put(1, 11);
-        integerMap.put(2, 22);
-        integerMap.put(3, 33);
-        integerMap.put(4, 44);
-        integerMap.put(5, 55);
-        integerMap.put(6, 66);
-
-        return integerMap;
-    }
-
-    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;
-    }
-}
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.kt b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
new file mode 100644
index 00000000..d18a6005
--- /dev/null
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
@@ -0,0 +1,109 @@
+@file:JvmName("Utils")
+package com.vimeo.stag
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.junit.Assert
+import java.lang.reflect.InvocationTargetException
+import java.util.ArrayList
+import java.util.HashMap
+
+fun <T> testZeroArgumentConstructorFinalClass(clazz: Class<T>) {
+    var exceptionThrown = false
+    try {
+        val constructor = clazz.getDeclaredConstructor()
+        constructor.isAccessible = true
+        constructor.newInstance()
+    } catch (e: InvocationTargetException) {
+        if (e.cause is UnsupportedOperationException) {
+            exceptionThrown = true
+        }
+    }
+
+    Assert.assertTrue(exceptionThrown)
+}
+
+fun <K, V> assertMapsEqual(map1: Map<K, V>, map2: Map<K, V>) {
+    for ((key, value) in map1) {
+        Assert.assertEquals(value, map2[key])
+    }
+
+    for ((key, value) in map2) {
+        Assert.assertEquals(value, map1[key])
+    }
+}
+
+fun createStringDummyList(): ArrayList<String> {
+    val stringList = ArrayList<String>()
+
+    stringList.add("abc")
+    stringList.add("abc1")
+    stringList.add("abc2")
+    stringList.add("abc3")
+    stringList.add("abc4")
+    stringList.add("abc5")
+
+    return stringList
+}
+
+fun createStringDummyMap(): HashMap<String, String> {
+    val stringMap = HashMap<String, String>()
+
+    stringMap["abc"] = "0"
+    stringMap["abc1"] = "1"
+    stringMap["abc2"] = "2"
+    stringMap["abc3"] = "3"
+    stringMap["abc4"] = "4"
+    stringMap["abc5"] = "5"
+
+    return stringMap
+}
+
+fun createIntegerDummyList(): ArrayList<Int> {
+    val integerArrayList = ArrayList<Int>()
+
+    integerArrayList.add(1)
+    integerArrayList.add(2)
+    integerArrayList.add(3)
+    integerArrayList.add(4)
+    integerArrayList.add(5)
+    integerArrayList.add(6)
+
+    return integerArrayList
+}
+
+fun createIntegerDummyMap(): HashMap<Int, Int> {
+    val integerMap = HashMap<Int, Int>()
+
+    integerMap[1] = 11
+    integerMap[2] = 22
+    integerMap[3] = 33
+    integerMap[4] = 44
+    integerMap[5] = 55
+    integerMap[6] = 66
+
+    return integerMap
+}
+
+fun createDummyJsonObject(): JsonObject {
+    val jsonObject = JsonObject()
+
+    jsonObject.addProperty("key", "value")
+    jsonObject.addProperty("key1", "value1")
+    jsonObject.addProperty("key2", "value2")
+    jsonObject.addProperty("key3", "value3")
+    jsonObject.addProperty("key4", "value4")
+
+    return jsonObject
+}
+
+fun createDummyJsonArray(): JsonArray {
+    val jsonArray = JsonArray()
+
+    jsonArray.add("item1")
+    jsonArray.add("item2")
+    jsonArray.add("item3")
+    jsonArray.add("item4")
+
+    return jsonArray
+}

From 68d6ccd320608b4390c8a2fe2ad517b119d97d6e Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:42:02 -0400
Subject: [PATCH 27/84] Updating build tools on travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8658533c..ed7bd28c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-27.0.2
+    - build-tools-27.0.3
     - android-27
     - extra-android-support
     - extra-android-m2repository

From 5feeb6e228685a1b906c3e88f966129af2fc4113 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 13:48:13 -0400
Subject: [PATCH 28/84] Cleaning up utils

---
 .../src/test/java/com/vimeo/stag/Utils.kt     | 111 +++++++-----------
 1 file changed, 44 insertions(+), 67 deletions(-)

diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.kt b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
index d18a6005..742948d1 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
@@ -1,9 +1,10 @@
 @file:JvmName("Utils")
+
 package com.vimeo.stag
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import org.junit.Assert
+import org.assertj.core.api.Assertions.assertThat
 import java.lang.reflect.InvocationTargetException
 import java.util.ArrayList
 import java.util.HashMap
@@ -20,90 +21,66 @@ fun <T> testZeroArgumentConstructorFinalClass(clazz: Class<T>) {
         }
     }
 
-    Assert.assertTrue(exceptionThrown)
+    assertThat(exceptionThrown).isTrue()
 }
 
 fun <K, V> assertMapsEqual(map1: Map<K, V>, map2: Map<K, V>) {
     for ((key, value) in map1) {
-        Assert.assertEquals(value, map2[key])
+        assertThat(value).isEqualTo(map2[key])
     }
 
     for ((key, value) in map2) {
-        Assert.assertEquals(value, map1[key])
+        assertThat(value).isEqualTo(map1[key])
     }
 }
 
-fun createStringDummyList(): ArrayList<String> {
-    val stringList = ArrayList<String>()
-
-    stringList.add("abc")
-    stringList.add("abc1")
-    stringList.add("abc2")
-    stringList.add("abc3")
-    stringList.add("abc4")
-    stringList.add("abc5")
-
-    return stringList
+fun createStringDummyList() = ArrayList<String>().apply {
+    add("abc")
+    add("abc1")
+    add("abc2")
+    add("abc3")
+    add("abc4")
+    add("abc5")
 }
 
-fun createStringDummyMap(): HashMap<String, String> {
-    val stringMap = HashMap<String, String>()
-
-    stringMap["abc"] = "0"
-    stringMap["abc1"] = "1"
-    stringMap["abc2"] = "2"
-    stringMap["abc3"] = "3"
-    stringMap["abc4"] = "4"
-    stringMap["abc5"] = "5"
-
-    return stringMap
+fun createStringDummyMap() = HashMap<String, String>().apply {
+    this["abc"] = "0"
+    this["abc1"] = "1"
+    this["abc2"] = "2"
+    this["abc3"] = "3"
+    this["abc4"] = "4"
+    this["abc5"] = "5"
 }
 
-fun createIntegerDummyList(): ArrayList<Int> {
-    val integerArrayList = ArrayList<Int>()
-
-    integerArrayList.add(1)
-    integerArrayList.add(2)
-    integerArrayList.add(3)
-    integerArrayList.add(4)
-    integerArrayList.add(5)
-    integerArrayList.add(6)
-
-    return integerArrayList
+fun createIntegerDummyList() = ArrayList<Int>().apply {
+    add(1)
+    add(2)
+    add(3)
+    add(4)
+    add(5)
+    add(6)
 }
 
-fun createIntegerDummyMap(): HashMap<Int, Int> {
-    val integerMap = HashMap<Int, Int>()
-
-    integerMap[1] = 11
-    integerMap[2] = 22
-    integerMap[3] = 33
-    integerMap[4] = 44
-    integerMap[5] = 55
-    integerMap[6] = 66
-
-    return integerMap
+fun createIntegerDummyMap() = HashMap<Int, Int>().apply {
+    this[1] = 11
+    this[2] = 22
+    this[3] = 33
+    this[4] = 44
+    this[5] = 55
+    this[6] = 66
 }
 
-fun createDummyJsonObject(): JsonObject {
-    val jsonObject = JsonObject()
-
-    jsonObject.addProperty("key", "value")
-    jsonObject.addProperty("key1", "value1")
-    jsonObject.addProperty("key2", "value2")
-    jsonObject.addProperty("key3", "value3")
-    jsonObject.addProperty("key4", "value4")
-
-    return jsonObject
+fun createDummyJsonObject() = JsonObject().apply {
+    addProperty("key", "value")
+    addProperty("key1", "value1")
+    addProperty("key2", "value2")
+    addProperty("key3", "value3")
+    addProperty("key4", "value4")
 }
 
-fun createDummyJsonArray(): JsonArray {
-    val jsonArray = JsonArray()
-
-    jsonArray.add("item1")
-    jsonArray.add("item2")
-    jsonArray.add("item3")
-    jsonArray.add("item4")
-
-    return jsonArray
+fun createDummyJsonArray() = JsonArray().apply {
+    add("item1")
+    add("item2")
+    add("item3")
+    add("item4")
 }

From 772190dbe43e3f6f9d4e8215b3832e7e8c2c0196 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 14:59:44 -0400
Subject: [PATCH 29/84] Additional tests for KnownTypeAdapters

---
 .../sample_java_model/NativeArrayTypes.java   |  21 ++++
 .../NativeArrayTypesTest.java                 |  14 +++
 .../com/vimeo/sample_java_model/Utils.java    |   6 +-
 .../com/vimeo/stag/KnownTypeAdapters.java     |   7 --
 .../com/vimeo/stag/KnownTypeAdaptersTest.java |   5 -
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 113 ++++++++++++++++++
 6 files changed, 150 insertions(+), 16 deletions(-)
 create mode 100644 integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeArrayTypes.java
 create mode 100644 integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeArrayTypesTest.java
 create mode 100644 stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt

diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeArrayTypes.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeArrayTypes.java
new file mode 100644
index 00000000..905b315e
--- /dev/null
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/NativeArrayTypes.java
@@ -0,0 +1,21 @@
+package com.vimeo.sample_java_model;
+
+import com.vimeo.stag.UseStag;
+
+/**
+ * An integration test for various array types.
+ */
+@UseStag
+public class NativeArrayTypes {
+
+    public String[] mStrings;
+
+    public Integer[] mIntegers;
+
+    public Boolean[] mBooleans;
+
+    public int[] mInts;
+
+    public boolean[] mBools;
+
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeArrayTypesTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeArrayTypesTest.java
new file mode 100644
index 00000000..a6bad20c
--- /dev/null
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/NativeArrayTypesTest.java
@@ -0,0 +1,14 @@
+package com.vimeo.sample_java_model;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link NativeArrayTypes}.
+ */
+public class NativeArrayTypesTest {
+
+    @Test
+    public void verifyTypeAdapterWasGenerated() {
+        Utils.verifyTypeAdapterGeneration(NativeArrayTypes.class);
+    }
+}
diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java
index 9394e8da..d0b7f659 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/Utils.java
@@ -54,9 +54,8 @@ private static <T> TypeAdapter<T> getTypeAdapter(@NotNull Class<T> clazz) {
      *
      * @param clazz the class to check.
      * @param <T>   the type of the class, used internally.
-     * @throws Exception throws an exception if an adapter was not generated.
      */
-    public static <T> void verifyTypeAdapterGeneration(@NotNull Class<T> clazz) throws Exception {
+    public static <T> void verifyTypeAdapterGeneration(@NotNull Class<T> clazz) {
         TypeAdapter<T> typeAdapter = getTypeAdapter(clazz);
         assertNotNull("Type adapter should have been generated by Stag", typeAdapter);
     }
@@ -66,9 +65,8 @@ public static <T> void verifyTypeAdapterGeneration(@NotNull Class<T> clazz) thro
      *
      * @param clazz the class to check.
      * @param <T>   the type of the class, used internally.
-     * @throws Exception throws an exception if an adapter was generated.
      */
-    public static <T> void verifyNoTypeAdapterGeneration(@NotNull Class<T> clazz) throws Exception {
+    public static <T> void verifyNoTypeAdapterGeneration(@NotNull Class<T> clazz) {
         TypeAdapter<T> typeAdapter = getTypeAdapter(clazz);
         assertNull("Type adapter should not have been generated by Stag", typeAdapter);
     }
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 de221f44..a1befe4f 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -74,7 +74,6 @@ private KnownTypeAdapters() {
      * Type Adapter for {@link Byte}.
      */
     public static final TypeAdapter<Byte> BYTE = new TypeAdapter<Byte>() {
-        public final TypeToken<Byte> TYPE_TOKEN = TypeToken.get(Byte.class);
 
         @Override
         public Byte read(JsonReader in) throws IOException {
@@ -121,7 +120,6 @@ public static void write(JsonWriter out, byte value) throws IOException {
      * Type Adapter for {@link Short}.
      */
     public static final TypeAdapter<Short> SHORT = new TypeAdapter<Short>() {
-        public final TypeToken<Short> TYPE_TOKEN = TypeToken.get(Short.class);
 
         @Override
         public Short read(JsonReader in) throws IOException {
@@ -166,7 +164,6 @@ public static void write(JsonWriter out, short value) throws IOException {
      * Type Adapter for {@link Integer}.
      */
     public static final TypeAdapter<Integer> INTEGER = new TypeAdapter<Integer>() {
-        public final TypeToken<Integer> TYPE_TOKEN = TypeToken.get(Integer.class);
 
         @Override
         public Integer read(JsonReader in) throws IOException {
@@ -212,7 +209,6 @@ public static void write(JsonWriter out, int value) throws IOException {
      * Type Adapter for {@link Long}.
      */
     public static final TypeAdapter<Long> LONG = new TypeAdapter<Long>() {
-        public final TypeToken<Long> TYPE_TOKEN = TypeToken.get(Long.class);
 
         @Override
         public Long read(JsonReader in) throws IOException {
@@ -259,8 +255,6 @@ public static void write(JsonWriter out, long value) throws IOException {
      * Type Adapter for {@link Float}.
      */
     public static final TypeAdapter<Float> FLOAT = new TypeAdapter<Float>() {
-        public final TypeToken<Float> TYPE_TOKEN = TypeToken.get(Float.class);
-
 
         @Override
         public Float read(JsonReader in) throws IOException {
@@ -303,7 +297,6 @@ public static void write(JsonWriter out, float value) throws IOException {
      * Type Adapter for {@link Double}.
      */
     public static final TypeAdapter<Double> DOUBLE = new TypeAdapter<Double>() {
-        public final TypeToken<Double> TYPE_TOKEN = TypeToken.get(double.class);
 
         @Override
         public Double read(JsonReader in) throws IOException {
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 8ded85d9..3d9acaac 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -20,11 +20,6 @@
 @SuppressWarnings("MagicNumber")
 public class KnownTypeAdaptersTest {
 
-    @Test
-    public void testThatKnownTypeAdaptersIsNotInstantiable() {
-        Utils.testZeroArgumentConstructorFinalClass(KnownTypeAdapters.class);
-    }
-
     /**
      * Test for {@link KnownTypeAdapters#INTEGER}
      */
diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
new file mode 100644
index 00000000..60eac7c0
--- /dev/null
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -0,0 +1,113 @@
+package com.vimeo.stag
+
+import com.google.gson.JsonSyntaxException
+import com.google.gson.stream.JsonReader
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import java.io.StringReader
+
+/**
+ * Created by restainoa on 4/9/18.
+ */
+class KnownTypeAdaptersTestKt {
+
+    /**
+     * Wraps a [String] in quotations.
+     */
+    private fun String.quote(): String = "\"$this\""
+
+    @Test
+    fun `KnownTypeAdapters is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters::class.java)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `Byte TypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.BYTE.fromJson("test".quote())
+    }
+
+    @Test
+    fun `PrimitiveByteTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveByteTypeAdapter.read(JsonReader(StringReader("null")), 1)).isEqualTo(1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveByteTypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.PrimitiveByteTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `Short TypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.SHORT.fromJson("test".quote())
+    }
+
+    @Test
+    fun `PrimitiveShortTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveShortTypeAdapter.read(JsonReader(StringReader("null")), 1)).isEqualTo(1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveShortTypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.PrimitiveShortTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `Integer TypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.INTEGER.fromJson("test".quote())
+    }
+
+    @Test
+    fun `PrimitiveIntTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveIntTypeAdapter.read(JsonReader(StringReader("null")), 1)).isEqualTo(1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveIntTypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.PrimitiveIntTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `Long TypeAdapter throws JsonSyntaxException if used on non long`() {
+        KnownTypeAdapters.LONG.fromJson("test".quote())
+    }
+
+    @Test
+    fun `PrimitiveLongTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveLongTypeAdapter.read(JsonReader(StringReader("null")), 1L)).isEqualTo(1L)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveLongTypeAdapter throws JsonSyntaxException if used on non integer`() {
+        KnownTypeAdapters.PrimitiveLongTypeAdapter.read(JsonReader(StringReader("test".quote())), 1L)
+    }
+
+    @Test
+    fun `PrimitiveDoubleTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveDoubleTypeAdapter.read(JsonReader(StringReader("null")), 1.0)).isEqualTo(1.0)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveDoubleTypeAdapter throws JsonSyntaxException if used on non double`() {
+        KnownTypeAdapters.PrimitiveDoubleTypeAdapter.read(JsonReader(StringReader("test".quote())), 1.0)
+    }
+
+    @Test
+    fun `PrimitiveCharTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveCharTypeAdapter.read(JsonReader(StringReader("null")), 'a')).isEqualTo('a')
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveCharTypeAdapter throws JsonSyntaxException if used on non double`() {
+        KnownTypeAdapters.PrimitiveCharTypeAdapter.read(JsonReader(StringReader("test".quote())), 'a')
+    }
+
+    @Test
+    fun `PrimitiveBooleanTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(JsonReader(StringReader("null")), true)).isTrue()
+    }
+
+    @Test
+    fun `PrimitiveBooleanTypeAdapter parses boolean from string`() {
+        assertThat(KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(JsonReader(StringReader("true".quote())), true)).isTrue()
+    }
+}

From e3b79055962aeb2611628fc4cceb3a3d8691ac4b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 15:26:46 -0400
Subject: [PATCH 30/84] Adding tests for constructors

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 19 +++----
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 50 +++++++++++++++++++
 2 files changed, 58 insertions(+), 11 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 a1befe4f..5f878df0 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -28,7 +28,6 @@
 import com.google.gson.internal.ObjectConstructor;
 import com.google.gson.internal.Streams;
 import com.google.gson.internal.bind.TypeAdapters;
-import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -468,7 +467,7 @@ public T[] read(JsonReader reader) throws IOException {
     public static final class PrimitiveIntegerArrayAdapter {
 
         private PrimitiveIntegerArrayAdapter() {
-            throw new IllegalStateException("PrimitiveIntegerArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveIntegerArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable int[] value) throws IOException {
@@ -503,7 +502,7 @@ public static int[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveLongArrayAdapter {
 
         private PrimitiveLongArrayAdapter() {
-            throw new IllegalStateException("PrimitiveLongArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveLongArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable long[] value) throws IOException {
@@ -538,7 +537,7 @@ public static long[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveDoubleArrayAdapter {
 
         private PrimitiveDoubleArrayAdapter() {
-            throw new IllegalStateException("PrimitiveDoubleArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveDoubleArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable double[] value) throws IOException {
@@ -573,7 +572,7 @@ public static double[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveShortArrayAdapter {
 
         private PrimitiveShortArrayAdapter() {
-            throw new IllegalStateException("PrimitiveShortArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveShortArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable short[] value) throws IOException {
@@ -608,7 +607,7 @@ public static short[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveFloatArrayAdapter {
 
         private PrimitiveFloatArrayAdapter() {
-            throw new IllegalStateException("PrimitiveFloatArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveFloatArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable float[] value) throws IOException {
@@ -643,7 +642,7 @@ public static float[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveBooleanArrayAdapter {
 
         private PrimitiveBooleanArrayAdapter() {
-            throw new IllegalStateException("PrimitiveBooleanArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveBooleanArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable boolean[] value) throws IOException {
@@ -678,7 +677,7 @@ public static boolean[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveByteArrayAdapter {
 
         private PrimitiveByteArrayAdapter() {
-            throw new IllegalStateException("PrimitiveByteArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveByteArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable byte[] value) throws IOException {
@@ -715,7 +714,7 @@ public static byte[] read(@NotNull JsonReader reader) throws IOException {
     public static final class PrimitiveCharArrayAdapter {
 
         private PrimitiveCharArrayAdapter() {
-            throw new IllegalStateException("PrimitiveCharArrayAdapter cannot be instantiated");
+            throw new UnsupportedOperationException("PrimitiveCharArrayAdapter cannot be instantiated");
         }
 
         public static void write(@NotNull JsonWriter writer, @Nullable char[] value) throws IOException {
@@ -983,8 +982,6 @@ private static String keyToString(@NotNull JsonElement keyElement) {
      */
     public static final class ObjectTypeAdapter extends TypeAdapter<Object> {
 
-        public final TypeToken<Object> TYPE_TOKEN = TypeToken.get(Object.class);
-
         private final Gson gson;
 
         public ObjectTypeAdapter(@NotNull Gson gson) {
diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 60eac7c0..0b3a5cdc 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -110,4 +110,54 @@ class KnownTypeAdaptersTestKt {
     fun `PrimitiveBooleanTypeAdapter parses boolean from string`() {
         assertThat(KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(JsonReader(StringReader("true".quote())), true)).isTrue()
     }
+
+    @Test
+    fun `PrimitiveFloatTypeAdapter returns default value for null`() {
+        assertThat(KnownTypeAdapters.PrimitiveFloatTypeAdapter.read(JsonReader(StringReader("null")), 1.0f)).isEqualTo(1.0f)
+    }
+
+    @Test(expected = JsonSyntaxException::class)
+    fun `PrimitiveFloatTypeAdapter throws JsonSyntaxException if used on non double`() {
+        KnownTypeAdapters.PrimitiveFloatTypeAdapter.read(JsonReader(StringReader("test".quote())), 1.0f)
+    }
+
+    @Test
+    fun `PrimitiveIntegerArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveIntegerArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveLongArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveLongArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveDoubleArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveDoubleArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveShortArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveShortArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveFloatArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveFloatArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveBooleanArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveBooleanArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveByteArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveByteArrayAdapter::class.java)
+    }
+
+    @Test
+    fun `PrimitiveCharArrayAdapter is non-instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveCharArrayAdapter::class.java)
+    }
 }

From 913e9cdb83819d685a65946502527a497de0398f Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 15:51:26 -0400
Subject: [PATCH 31/84] Adding test case for Maps without types specified

---
 .../java/com/vimeo/sample_java_model/RawGenericField.java | 8 ++++++++
 .../stag/processor/generators/TypeAdapterGenerator.java   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/integration-test-java/src/main/java/com/vimeo/sample_java_model/RawGenericField.java b/integration-test-java/src/main/java/com/vimeo/sample_java_model/RawGenericField.java
index b381a162..6d6ccc66 100644
--- a/integration-test-java/src/main/java/com/vimeo/sample_java_model/RawGenericField.java
+++ b/integration-test-java/src/main/java/com/vimeo/sample_java_model/RawGenericField.java
@@ -2,6 +2,8 @@
 
 import com.vimeo.stag.UseStag;
 
+import java.util.Map;
+
 /**
  * Model which references a generically typed object without generic bounds (i.e., as a raw
  * type).
@@ -12,4 +14,10 @@ public class RawGenericField {
     @SuppressWarnings("rawtypes")
     public ExternalModelGeneric rawTypedField;
 
+    /**
+     * Tests that map keys and values are handled correctly.
+     */
+    @SuppressWarnings("rawtypes")
+    public Map rawMap;
+
 }
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 0e2bbcc3..00e7d8ee 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
@@ -486,7 +486,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType
                             fieldType.toString() + ">";
             } else {
                 // If the map does not have any type arguments, use Object as type params in this case
-                keyAdapterAccessor = "mGson.getAdapter(KnownTypeAdapters.ObjectTypeAdapter.TYPE_TOKEN)";
+                keyAdapterAccessor = "new com.vimeo.stag.KnownTypeAdapters.ObjectTypeAdapter(mGson)";
                 valueAdapterAccessor = keyAdapterAccessor;
             }
 

From 682f0e9568da885bdb841541c5c3e0f6e8769b04 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 15:59:49 -0400
Subject: [PATCH 32/84] Adding basic test for ObjectTypeAdapter

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 0b3a5cdc..a0663a54 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -1,5 +1,6 @@
 package com.vimeo.stag
 
+import com.google.gson.GsonBuilder
 import com.google.gson.JsonSyntaxException
 import com.google.gson.stream.JsonReader
 import org.assertj.core.api.Assertions.assertThat
@@ -160,4 +161,19 @@ class KnownTypeAdaptersTestKt {
     fun `PrimitiveCharArrayAdapter is non-instantiable`() {
         testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveCharArrayAdapter::class.java)
     }
+
+    @Test
+    fun `ObjectTypeAdapter serializes data correctly`() {
+        val gson = GsonBuilder().create()
+        val objectTypeAdapter = KnownTypeAdapters.ObjectTypeAdapter(gson)
+
+        fun <T> assertSerializationEquality(type: T) {
+            assertThat(objectTypeAdapter.fromJson(objectTypeAdapter.toJson(type))).isEqualTo(type)
+        }
+
+        assertSerializationEquality("test")
+        assertSerializationEquality(123.0)
+        assertSerializationEquality(true)
+        assertSerializationEquality(null)
+    }
 }

From 1f408db0fe4eaaba99e7f6df622dd985c50b05bd Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 9 Apr 2018 17:46:15 -0400
Subject: [PATCH 33/84] Adding tests for ArrayTypeAdapter

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index a0663a54..704f77da 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -176,4 +176,22 @@ class KnownTypeAdaptersTestKt {
         assertSerializationEquality(true)
         assertSerializationEquality(null)
     }
+
+    @Test
+    fun `ArrayTypeAdapter serializes data correctly`() {
+        val intTypeAdapter = KnownTypeAdapters.INTEGER
+        val arrayTypeAdapter = KnownTypeAdapters.ArrayTypeAdapter(intTypeAdapter, KnownTypeAdapters.PrimitiveArrayConstructor<Int> { size -> Array(size, { 0 }) })
+
+        val testArray = arrayOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+
+        assertThat(arrayTypeAdapter.fromJson(arrayTypeAdapter.toJson(testArray))).isEqualTo(testArray)
+    }
+
+    @Test
+    fun `ArrayTypeAdapter serializes null correctly`() {
+        val intTypeAdapter = KnownTypeAdapters.INTEGER
+        val arrayTypeAdapter = KnownTypeAdapters.ArrayTypeAdapter(intTypeAdapter, KnownTypeAdapters.PrimitiveArrayConstructor<Int> { size -> Array(size, { 0 }) })
+
+        assertThat(arrayTypeAdapter.fromJson(arrayTypeAdapter.toJson(null))).isEqualTo(null)
+    }
 }

From 4f7885b64c108908caca149bb592ea98352cdf9c Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 13:51:24 -0400
Subject: [PATCH 34/84] Breaking out assertJ dependency into a constant,
 changing to implementation

---
 build.gradle                                  | 22 +++++++++----------
 integration-test-android/build.gradle         |  5 +++--
 .../build.gradle                              |  1 +
 integration-test-java/build.gradle            |  1 +
 integration-test-kotlin/build.gradle          |  6 +++--
 stag-library-compiler/build.gradle            |  2 +-
 stag-library/build.gradle                     |  6 ++---
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index ffabaf1d..71585340 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-
-    ext.kotlinVersion = '1.2.31'
-    ext.jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
-    ext.gsonVersion = '2.8.2'
-
-    // android dependencies
-    ext.targetSdk = 27
-    ext.minSdk = 14
-    ext.buildTools = "27.0.3"
-
+    ext {
+        kotlinVersion = '1.2.31'
+        jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
+        gsonVersion = '2.8.2'
+        assertJ = '3.9.1'
+
+        // android dependencies
+        targetSdk = 27
+        minSdk = 14
+        buildTools = "27.0.3"
+    }
     repositories {
         google()
         jcenter()
diff --git a/integration-test-android/build.gradle b/integration-test-android/build.gradle
index 2ae3cfa1..aeef8d3f 100644
--- a/integration-test-android/build.gradle
+++ b/integration-test-android/build.gradle
@@ -33,8 +33,7 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-
+    implementation 'com.intellij:annotations:12.0@jar'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:support-annotations:27.1.1'
 
@@ -42,6 +41,8 @@ dependencies {
     annotationProcessor project(':stag-library-compiler')
 
     implementation "com.google.code.gson:gson:$gsonVersion"
+
+    testImplementation 'junit:junit:4.12'
 }
 
 gradle.projectsEvaluated {
diff --git a/integration-test-java-cross-module/build.gradle b/integration-test-java-cross-module/build.gradle
index 2f3c5309..ee3010c8 100644
--- a/integration-test-java-cross-module/build.gradle
+++ b/integration-test-java-cross-module/build.gradle
@@ -3,6 +3,7 @@ apply plugin: "net.ltgt.apt"
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
+    implementation 'com.intellij:annotations:12.0@jar'
     implementation 'com.android.support:support-annotations:27.1.1'
 
     implementation project(':stag-library')
diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index 3fe51506..8fb5b001 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'java'
 apply plugin: "net.ltgt.apt"
 
 dependencies {
+    implementation 'com.intellij:annotations:12.0@jar'
     implementation "com.google.code.gson:gson:$gsonVersion"
 
     implementation project(':stag-library')
diff --git a/integration-test-kotlin/build.gradle b/integration-test-kotlin/build.gradle
index 47e282ed..c3c76f53 100644
--- a/integration-test-kotlin/build.gradle
+++ b/integration-test-kotlin/build.gradle
@@ -2,12 +2,14 @@ apply plugin: 'kotlin'
 apply plugin: 'kotlin-kapt'
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    implementation "com.google.code.gson:gson:$gsonVersion"
 
     implementation project(':stag-library')
     kapt project(':stag-library-compiler')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+
+    testImplementation 'junit:junit:4.12'
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
     testImplementation 'uk.co.jemos.podam:podam:7.1.0.RELEASE'
 }
@@ -19,4 +21,4 @@ kapt {
         arg("stagGeneratedPackageName", "com.vimeo.sample_kotlin.stag.generated")
         arg("stagAssumeHungarianNotation", "false")
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 3055bffb..6162dc57 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -24,7 +24,7 @@ jacocoTestReport.dependsOn test
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.9.1'
+    testImplementation "org.assertj:assertj-core:$assertJ"
     testImplementation 'com.google.testing.compile:compile-testing:0.15'
     testImplementation project(path: ':integration-test-java')
     testImplementation project(path: ':integration-test-java-cross-module')
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 301298a6..2c5b340b 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -23,10 +23,10 @@ check.dependsOn jacocoTestReport
 jacocoTestReport.dependsOn test
 
 dependencies {
-    compile "com.google.code.gson:gson:$gsonVersion"
-    compile 'com.intellij:annotations:12.0@jar'
+    implementation "com.google.code.gson:gson:$gsonVersion"
+    implementation 'com.intellij:annotations:12.0@jar'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.9.1'
+    testImplementation "org.assertj:assertj-core:$assertJ"
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
 }
 

From a0f28178cf449b7be882ad076c0c9fe894512b86 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 13:52:51 -0400
Subject: [PATCH 35/84] Using static import in tests

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 85 ++++++++++---------
 1 file changed, 43 insertions(+), 42 deletions(-)

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 3d9acaac..79284479 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -7,7 +7,6 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.StringReader;
@@ -16,6 +15,8 @@
 import java.util.HashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 @SuppressWarnings("MagicNumber")
 public class KnownTypeAdaptersTest {
@@ -37,7 +38,7 @@ public void testForIntegerTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         Integer readValue = integerTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value.intValue(), readValue.intValue());
     }
 
     /**
@@ -55,7 +56,7 @@ public void testForPrimitiveIntegerTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         int readValue = KnownTypeAdapters.PrimitiveIntTypeAdapter.read(new JsonReader(new StringReader(jsonString)), 0);
 
-        Assert.assertEquals(value, readValue);
+        assertEquals(value, readValue);
     }
 
     /**
@@ -79,7 +80,7 @@ public void testForPrimitiveArrayIntegerTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         int[] readValue = KnownTypeAdapters.PrimitiveIntegerArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
     }
 
     /**
@@ -99,9 +100,9 @@ public void testForByteTypeAdapter() throws Exception {
         // 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());
-        Assert.assertEquals(value, readValue);
+        assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value.byteValue(), readValue.byteValue());
+        assertEquals(value, readValue);
     }
 
     /**
@@ -119,7 +120,7 @@ public void testForPrimitiveByteTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         byte readValue = KnownTypeAdapters.PrimitiveByteTypeAdapter.read(new JsonReader(new StringReader(jsonString)), (byte) 0);
 
-        Assert.assertEquals(value, readValue);
+        assertEquals(value, readValue);
     }
 
     /**
@@ -143,7 +144,7 @@ public void testForPrimitiveArrayByteTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         byte[] readValue = KnownTypeAdapters.PrimitiveByteArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
     }
 
     /**
@@ -163,9 +164,9 @@ public void testForShortTypeAdapter() throws Exception {
         // 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());
-        Assert.assertEquals(value, readValue);
+        assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value.shortValue(), readValue.shortValue());
+        assertEquals(value, readValue);
     }
 
     /**
@@ -183,7 +184,7 @@ public void testForPrimitiveShortTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         short readValue = KnownTypeAdapters.PrimitiveShortTypeAdapter.read(new JsonReader(new StringReader(jsonString)), (short) 0);
 
-        Assert.assertEquals(value, readValue);
+        assertEquals(value, readValue);
     }
 
     /**
@@ -207,7 +208,7 @@ public void testForPrimitiveArrayShortTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         short[] readValue = KnownTypeAdapters.PrimitiveShortArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
     }
 
     /**
@@ -227,9 +228,9 @@ public void testForLongTypeAdapter() throws Exception {
         // 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());
-        Assert.assertEquals(value, readValue);
+        assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value.longValue(), readValue.longValue());
+        assertEquals(value, readValue);
     }
 
     /**
@@ -247,7 +248,7 @@ public void testForPrimitiveLongTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         long readValue = KnownTypeAdapters.PrimitiveLongTypeAdapter.read(new JsonReader(new StringReader(jsonString)), 0);
 
-        Assert.assertEquals(value, readValue);
+        assertEquals(value, readValue);
     }
 
     /**
@@ -271,7 +272,7 @@ public void testForPrimitiveArrayLongTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         long[] readValue = KnownTypeAdapters.PrimitiveLongArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
     }
 
     /**
@@ -291,9 +292,9 @@ public void testForFloatTypeAdapter() throws Exception {
         // 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);
+        assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value.doubleValue(), readValue.doubleValue(), 0);
+        assertEquals(value, readValue, 0);
     }
 
     /**
@@ -311,7 +312,7 @@ public void testForPrimitiveFloatTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         float readValue = KnownTypeAdapters.PrimitiveFloatTypeAdapter.read(new JsonReader(new StringReader(jsonString)), 0f);
 
-        Assert.assertEquals(value, readValue, 0);
+        assertEquals(value, readValue, 0);
     }
 
     /**
@@ -335,7 +336,7 @@ public void testForPrimitiveArrayFloatTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         float[] readValue = KnownTypeAdapters.PrimitiveFloatArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue, 0);
+        assertArrayEquals(value, readValue, 0);
     }
 
     /**
@@ -355,8 +356,8 @@ public void testForDoubleTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         Double readValue = floatTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertEquals(value.intValue(), readValue.intValue());
-        Assert.assertEquals(value, readValue, 0);
+        assertEquals(value.intValue(), readValue.intValue());
+        assertEquals(value, readValue, 0);
     }
 
     /**
@@ -374,7 +375,7 @@ public void testForPrimitiveDoubleTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         double readValue = KnownTypeAdapters.PrimitiveDoubleTypeAdapter.read(new JsonReader(new StringReader(jsonString)), 0f);
 
-        Assert.assertEquals(value, readValue, 0);
+        assertEquals(value, readValue, 0);
     }
 
     /**
@@ -398,7 +399,7 @@ public void testForPrimitiveArrayDoubleTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         double[] readValue = KnownTypeAdapters.PrimitiveDoubleArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue, 0);
+        assertArrayEquals(value, readValue, 0);
     }
 
     /**
@@ -414,7 +415,7 @@ public void testForPrimitiveBooleanTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         boolean readValue = KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(new JsonReader(new StringReader(jsonString)), false);
 
-        Assert.assertEquals(true, readValue);
+        assertEquals(true, readValue);
     }
 
     /**
@@ -438,7 +439,7 @@ public void testForPrimitiveArrayBooleanTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         boolean[] readValue = KnownTypeAdapters.PrimitiveBooleanArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
     }
 
     /**
@@ -456,7 +457,7 @@ public void testForPrimitiveCharacterTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         char readValue = KnownTypeAdapters.PrimitiveCharTypeAdapter.read(new JsonReader(new StringReader(jsonString)), 'B');
 
-        Assert.assertEquals(value, readValue);
+        assertEquals(value, readValue);
     }
 
     /**
@@ -481,7 +482,7 @@ public void testForPrimitiveArrayCharacterTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         char[] readValue = KnownTypeAdapters.PrimitiveCharArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertArrayEquals(value, readValue);
+        assertArrayEquals(value, readValue);
 
         // test a string as a char array
         char[] value1 = "abcde".toCharArray();
@@ -494,7 +495,7 @@ public void testForPrimitiveArrayCharacterTypeAdapter() throws Exception {
         // call the TypeAdapter#read method
         char[] readValue1 = KnownTypeAdapters.PrimitiveCharArrayAdapter.read(new JsonReader(new StringReader(jsonString1)));
 
-        Assert.assertArrayEquals(value1, readValue1);
+        assertArrayEquals(value1, readValue1);
     }
 
     /**
@@ -517,9 +518,9 @@ public void testForListTypeAdapter() throws Exception {
 
         assertThat(readValue).isNotNull();
 
-        Assert.assertEquals(dummyList.size(), readValue.size());
+        assertEquals(dummyList.size(), readValue.size());
         for (int i = 0; i < dummyList.size(); i++) {
-            Assert.assertEquals(dummyList.get(i), readValue.get(i));
+            assertEquals(dummyList.get(i), readValue.get(i));
         }
 
         // for integer arrays
@@ -535,9 +536,9 @@ public void testForListTypeAdapter() throws Exception {
 
         assertThat(readValue1).isNotNull();
 
-        Assert.assertEquals(intDummyList.size(), readValue1.size());
+        assertEquals(intDummyList.size(), readValue1.size());
         for (int i = 0; i < intDummyList.size(); i++) {
-            Assert.assertEquals(intDummyList.get(i), readValue1.get(i));
+            assertEquals(intDummyList.get(i), readValue1.get(i));
         }
     }
 
@@ -561,7 +562,7 @@ public void testForMapTypeAdapter() throws Exception {
 
         assertThat(readValue).isNotNull();
 
-        Assert.assertEquals(dummyMap.size(), readValue.size());
+        assertEquals(dummyMap.size(), readValue.size());
         Utils.assertMapsEqual(dummyMap, readValue);
 
         // for integer arrays
@@ -577,7 +578,7 @@ public void testForMapTypeAdapter() throws Exception {
 
         assertThat(readValue1).isNotNull();
 
-        Assert.assertEquals(intDummyMap.size(), readValue1.size());
+        assertEquals(intDummyMap.size(), readValue1.size());
         Utils.assertMapsEqual(intDummyMap, readValue1);
     }
 
@@ -595,7 +596,7 @@ public void testForJsonObjectTypeAdapter() throws Exception {
 
         JsonObject readValue = jsonObjectTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertEquals(jsonObject.size(), readValue.size());
+        assertEquals(jsonObject.size(), readValue.size());
     }
 
     /**
@@ -612,9 +613,9 @@ public void testForJsonArrayTypeAdapter() throws Exception {
 
         JsonArray readValue = jsonObjectTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
 
-        Assert.assertEquals(jsonArray.size(), readValue.size());
+        assertEquals(jsonArray.size(), readValue.size());
         for (int i = 0; i < jsonArray.size(); i++) {
-            Assert.assertEquals(jsonArray.get(i), readValue.get(i));
+            assertEquals(jsonArray.get(i), readValue.get(i));
         }
     }
 

From b1bc9f890ba7c65f9e350b93833d3a563c92ba25 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 13:56:52 -0400
Subject: [PATCH 36/84] Updating dependencies

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 71585340..ec111c56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlinVersion = '1.2.31'
+        kotlinVersion = '1.2.40'
         jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
         gsonVersion = '2.8.2'
         assertJ = '3.9.1'
@@ -17,7 +17,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

From 14790f97be26d10f2055e1ca78ec72e7973ad061 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:18:12 -0400
Subject: [PATCH 37/84] Adding more tests around the adapters

---
 .../com/vimeo/stag/KnownTypeAdapters.java     | 32 +++++++++++----
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 40 +++++++++++++++++++
 .../src/test/java/com/vimeo/stag/Utils.kt     | 19 ++++-----
 3 files changed, 72 insertions(+), 19 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 5f878df0..47705488 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -95,7 +95,9 @@ public void write(JsonWriter out, Byte value) throws IOException {
      */
     public static final class PrimitiveByteTypeAdapter {
 
-        private PrimitiveByteTypeAdapter() {}
+        private PrimitiveByteTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static byte read(JsonReader in, byte defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -140,7 +142,9 @@ public void write(JsonWriter out, Short value) throws IOException {
      */
     public static final class PrimitiveShortTypeAdapter {
 
-        private PrimitiveShortTypeAdapter() {}
+        private PrimitiveShortTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static short read(JsonReader in, short defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -184,7 +188,9 @@ public void write(JsonWriter out, Integer value) throws IOException {
      */
     public static final class PrimitiveIntTypeAdapter {
 
-        private PrimitiveIntTypeAdapter() {}
+        private PrimitiveIntTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static int read(JsonReader in, int defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -230,7 +236,9 @@ public void write(JsonWriter out, Long value) throws IOException {
      */
     public static final class PrimitiveLongTypeAdapter {
 
-        private PrimitiveLongTypeAdapter() {}
+        private PrimitiveLongTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static long read(JsonReader in, long defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -272,7 +280,9 @@ public void write(JsonWriter out, Float value) throws IOException {
      */
     public static final class PrimitiveFloatTypeAdapter {
 
-        private PrimitiveFloatTypeAdapter() {}
+        private PrimitiveFloatTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static float read(JsonReader in, float defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -313,7 +323,9 @@ public void write(JsonWriter out, Double value) throws IOException {
      */
     public static final class PrimitiveDoubleTypeAdapter {
 
-        private PrimitiveDoubleTypeAdapter() {}
+        private PrimitiveDoubleTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static double read(JsonReader in, double defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -337,7 +349,9 @@ public static void write(JsonWriter out, double value) throws IOException {
      */
     public static final class PrimitiveCharTypeAdapter {
 
-        private PrimitiveCharTypeAdapter() {}
+        private PrimitiveCharTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static char read(JsonReader in, char defaultValue) throws IOException {
             if (in.peek() == JsonToken.NULL) {
@@ -362,7 +376,9 @@ public static void write(JsonWriter out, char value) throws IOException {
      */
     public static final class PrimitiveBooleanTypeAdapter {
 
-        private PrimitiveBooleanTypeAdapter() {}
+        private PrimitiveBooleanTypeAdapter() {
+            throw new UnsupportedOperationException("Cannot be instantiated");
+        }
 
         public static boolean read(JsonReader in, boolean defaultValue) throws IOException {
             JsonToken peek = in.peek();
diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 704f77da..5e58cfa1 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -37,6 +37,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveByteTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
     }
 
+    @Test
+    fun `PrimitiveByteTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveByteTypeAdapter::class.java)
+    }
+
     @Test(expected = JsonSyntaxException::class)
     fun `Short TypeAdapter throws JsonSyntaxException if used on non integer`() {
         KnownTypeAdapters.SHORT.fromJson("test".quote())
@@ -52,6 +57,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveShortTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
     }
 
+    @Test
+    fun `PrimitiveShortTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveShortTypeAdapter::class.java)
+    }
+
     @Test(expected = JsonSyntaxException::class)
     fun `Integer TypeAdapter throws JsonSyntaxException if used on non integer`() {
         KnownTypeAdapters.INTEGER.fromJson("test".quote())
@@ -67,6 +77,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveIntTypeAdapter.read(JsonReader(StringReader("test".quote())), 1)
     }
 
+    @Test
+    fun `PrimitiveIntTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveIntTypeAdapter::class.java)
+    }
+
     @Test(expected = JsonSyntaxException::class)
     fun `Long TypeAdapter throws JsonSyntaxException if used on non long`() {
         KnownTypeAdapters.LONG.fromJson("test".quote())
@@ -82,6 +97,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveLongTypeAdapter.read(JsonReader(StringReader("test".quote())), 1L)
     }
 
+    @Test
+    fun `PrimitiveLongTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveLongTypeAdapter::class.java)
+    }
+
     @Test
     fun `PrimitiveDoubleTypeAdapter returns default value for null`() {
         assertThat(KnownTypeAdapters.PrimitiveDoubleTypeAdapter.read(JsonReader(StringReader("null")), 1.0)).isEqualTo(1.0)
@@ -92,6 +112,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveDoubleTypeAdapter.read(JsonReader(StringReader("test".quote())), 1.0)
     }
 
+    @Test
+    fun `PrimitiveDoubleTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveDoubleTypeAdapter::class.java)
+    }
+
     @Test
     fun `PrimitiveCharTypeAdapter returns default value for null`() {
         assertThat(KnownTypeAdapters.PrimitiveCharTypeAdapter.read(JsonReader(StringReader("null")), 'a')).isEqualTo('a')
@@ -102,6 +127,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveCharTypeAdapter.read(JsonReader(StringReader("test".quote())), 'a')
     }
 
+    @Test
+    fun `PrimitiveCharTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveCharTypeAdapter::class.java)
+    }
+
     @Test
     fun `PrimitiveBooleanTypeAdapter returns default value for null`() {
         assertThat(KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(JsonReader(StringReader("null")), true)).isTrue()
@@ -112,6 +142,11 @@ class KnownTypeAdaptersTestKt {
         assertThat(KnownTypeAdapters.PrimitiveBooleanTypeAdapter.read(JsonReader(StringReader("true".quote())), true)).isTrue()
     }
 
+    @Test
+    fun `PrimitiveBooleanTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveBooleanTypeAdapter::class.java)
+    }
+
     @Test
     fun `PrimitiveFloatTypeAdapter returns default value for null`() {
         assertThat(KnownTypeAdapters.PrimitiveFloatTypeAdapter.read(JsonReader(StringReader("null")), 1.0f)).isEqualTo(1.0f)
@@ -122,6 +157,11 @@ class KnownTypeAdaptersTestKt {
         KnownTypeAdapters.PrimitiveFloatTypeAdapter.read(JsonReader(StringReader("test".quote())), 1.0f)
     }
 
+    @Test
+    fun `PrimitiveFloatTypeAdapter is not instantiable`() {
+        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveFloatTypeAdapter::class.java)
+    }
+
     @Test
     fun `PrimitiveIntegerArrayAdapter is non-instantiable`() {
         testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveIntegerArrayAdapter::class.java)
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.kt b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
index 742948d1..18af38d6 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
@@ -5,23 +5,20 @@ package com.vimeo.stag
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import org.assertj.core.api.Assertions.assertThat
-import java.lang.reflect.InvocationTargetException
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import java.util.ArrayList
 import java.util.HashMap
 
 fun <T> testZeroArgumentConstructorFinalClass(clazz: Class<T>) {
-    var exceptionThrown = false
-    try {
-        val constructor = clazz.getDeclaredConstructor()
-        constructor.isAccessible = true
-        constructor.newInstance()
-    } catch (e: InvocationTargetException) {
-        if (e.cause is UnsupportedOperationException) {
-            exceptionThrown = true
-        }
+    fun instantiateClass(clazz: Class<T>): T {
+        return clazz.getDeclaredConstructor().apply {
+            isAccessible = true
+        }.newInstance()
     }
 
-    assertThat(exceptionThrown).isTrue()
+    assertThatThrownBy {
+        instantiateClass(clazz)
+    }.hasCauseInstanceOf(UnsupportedOperationException::class.java)
 }
 
 fun <K, V> assertMapsEqual(map1: Map<K, V>, map2: Map<K, V>) {

From b13aac112b39c5a133224ffbfb010efdb3fe62c0 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:21:34 -0400
Subject: [PATCH 38/84] Disallow ArrayTypeAdapter from being able to "parse"
 non arrays

---
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java       | 4 ----
 1 file changed, 4 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 47705488..265b8ba7 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -459,10 +459,6 @@ public T[] read(JsonReader reader) throws IOException {
                 reader.nextNull();
                 return null;
             }
-            if (JsonToken.BEGIN_ARRAY != peek) {
-                reader.skipValue();
-                return null;
-            }
             reader.beginArray();
 
             ArrayList<T> object = new ArrayList<>();

From 0d80bdf719c93450cf097f16681be1e62ed6065f Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:36:26 -0400
Subject: [PATCH 39/84] Adding test cases for null handling in type adapters

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 104 ++++++++++++++++++
 1 file changed, 104 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 79284479..4d366077 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -83,6 +83,19 @@ public void testForPrimitiveArrayIntegerTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue);
     }
 
+    @Test
+    public void primitiveArrayIntegerTypeAdapterWritesNullCorrectly() throws Exception {
+        final int[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveIntegerArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        final int[] readValue = KnownTypeAdapters.PrimitiveIntegerArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#BYTE}
      */
@@ -147,6 +160,19 @@ public void testForPrimitiveArrayByteTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue);
     }
 
+    @Test
+    public void primitiveArrayByteTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final byte[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveByteArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        byte[] readValue = KnownTypeAdapters.PrimitiveByteArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#SHORT}
      */
@@ -211,6 +237,19 @@ public void testForPrimitiveArrayShortTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue);
     }
 
+    @Test
+    public void primitiveArrayShortTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final short[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveShortArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        final short[] readValue = KnownTypeAdapters.PrimitiveShortArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#LONG}
      */
@@ -275,6 +314,19 @@ public void testForPrimitiveArrayLongTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue);
     }
 
+    @Test
+    public void primitiveArrayLongTypeAdapterWritesNullsCorrectly() throws Exception {
+        final long[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveLongArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        long[] readValue = KnownTypeAdapters.PrimitiveLongArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertArrayEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#FLOAT}
      */
@@ -339,6 +391,19 @@ public void testForPrimitiveArrayFloatTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue, 0);
     }
 
+    @Test
+    public void primitiveArrayFloatTypeAdapterHandlesNullsCorrectly() {
+        final float[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveFloatArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        final float[] readValue = KnownTypeAdapters.PrimitiveFloatArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#DOUBLE}
      */
@@ -402,6 +467,19 @@ public void testForPrimitiveArrayDoubleTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue, 0);
     }
 
+    @Test
+    public void primitiveArrayDoubleTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final double[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveDoubleArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        double[] readValue = KnownTypeAdapters.PrimitiveDoubleArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveBooleanTypeAdapter}
      */
@@ -442,6 +520,19 @@ public void testForPrimitiveArrayBooleanTypeAdapter() throws Exception {
         assertArrayEquals(value, readValue);
     }
 
+    @Test
+    public void primitiveArrayBooleanTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final boolean[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveBooleanArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        boolean[] readValue = KnownTypeAdapters.PrimitiveBooleanArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters.PrimitiveCharTypeAdapter}
      */
@@ -498,6 +589,19 @@ public void testForPrimitiveArrayCharacterTypeAdapter() throws Exception {
         assertArrayEquals(value1, readValue1);
     }
 
+    @Test
+    public void primitiveArrayCharacterTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final char[] input = null;
+        StringWriter stringWriter = new StringWriter();
+        KnownTypeAdapters.PrimitiveCharArrayAdapter.write(new JsonWriter(stringWriter), input);
+        String jsonString = stringWriter.toString();
+
+        // call the TypeAdapter#read method
+        char[] readValue = KnownTypeAdapters.PrimitiveCharArrayAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertEquals(input, readValue);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters.ListTypeAdapter}
      */

From 5ec259990ef170a476529e19cabcc87a6b17717e Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:37:54 -0400
Subject: [PATCH 40/84] Adding missing throws declaration

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

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 4d366077..c5cf6b33 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -392,7 +392,7 @@ public void testForPrimitiveArrayFloatTypeAdapter() throws Exception {
     }
 
     @Test
-    public void primitiveArrayFloatTypeAdapterHandlesNullsCorrectly() {
+    public void primitiveArrayFloatTypeAdapterHandlesNullsCorrectly() throws Exception {
         final float[] input = null;
         StringWriter stringWriter = new StringWriter();
         KnownTypeAdapters.PrimitiveFloatArrayAdapter.write(new JsonWriter(stringWriter), input);

From c3d8c8c3dead12f9a2464f965fe5749e6c75c953 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:41:27 -0400
Subject: [PATCH 41/84] Adding tests for instantiators

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 5e58cfa1..843ce748 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -234,4 +234,29 @@ class KnownTypeAdaptersTestKt {
 
         assertThat(arrayTypeAdapter.fromJson(arrayTypeAdapter.toJson(null))).isEqualTo(null)
     }
+
+    @Test
+    fun `ListInstantiator creates an empty List`() {
+        assertThat(KnownTypeAdapters.ListInstantiator<String>().construct()).isEmpty()
+    }
+
+    @Test
+    fun `CollectionInstantiator creates an empty Collection`() {
+        assertThat(KnownTypeAdapters.CollectionInstantiator<String>().construct()).isEmpty()
+    }
+
+    @Test
+    fun `ConcurrentHashMapInstantiator creates an empty ConcurrentHashMap`() {
+        assertThat(KnownTypeAdapters.ConcurrentHashMapInstantiator<String, String>().construct()).isEmpty()
+    }
+
+    @Test
+    fun `LinkedHashMapInstantiator creates an empty LinkedHashMap`() {
+        assertThat(KnownTypeAdapters.LinkedHashMapInstantiator<String, String>().construct()).isEmpty()
+    }
+
+    @Test
+    fun `MapInstantiator creates an empty Map`() {
+        assertThat(KnownTypeAdapters.MapInstantiator<String, String>().construct()).isEmpty()
+    }
 }

From 6ab4a925aaf053980508c96d167bca559d106f2d Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:46:09 -0400
Subject: [PATCH 42/84] Don't allow deserialization when type is incorrect

---
 .../src/main/java/com/vimeo/stag/KnownTypeAdapters.java      | 5 -----
 1 file changed, 5 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 265b8ba7..74eabf73 100644
--- a/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
+++ b/stag-library/src/main/java/com/vimeo/stag/KnownTypeAdapters.java
@@ -859,11 +859,6 @@ public T read(JsonReader reader) throws IOException {
                 return null;
             }
 
-            if (JsonToken.BEGIN_ARRAY != peek) {
-                reader.skipValue();
-                return null;
-            }
-
             T collection = objectConstructor.construct();
             reader.beginArray();
             while (reader.hasNext()) {

From d909746ed09a539becc891e676127e71b48b4620 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:46:20 -0400
Subject: [PATCH 43/84] Adding null tests for list and map adapters

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 32 +++++++++++++++++++
 1 file changed, 32 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 c5cf6b33..a51656f3 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -646,6 +646,22 @@ public void testForListTypeAdapter() throws Exception {
         }
     }
 
+    @Test
+    public void listTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final ArrayList<String> dummyList = null;
+
+        TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
+                                                                                                 new KnownTypeAdapters.ArrayListInstantiator<String>());
+
+        StringWriter stringWriter = new StringWriter();
+        listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
+        String jsonString = stringWriter.toString();
+
+        final ArrayList<String> readValue = listTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertThat(readValue).isEqualTo(dummyList);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters.MapTypeAdapter}
      */
@@ -686,6 +702,22 @@ public void testForMapTypeAdapter() throws Exception {
         Utils.assertMapsEqual(intDummyMap, readValue1);
     }
 
+    @Test
+    public void mapTypeAdapterHandlesNullsCorrectly() throws Exception {
+        final HashMap<String, String> dummyMap = null;
+
+        TypeAdapter<HashMap<String, String>> mapTypeAdapter = new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING, TypeAdapters.STRING,
+                                                                                                     new KnownTypeAdapters.HashMapInstantiator<String, String>());
+
+        StringWriter stringWriter = new StringWriter();
+        mapTypeAdapter.write(new JsonWriter(stringWriter), dummyMap);
+        String jsonString = stringWriter.toString();
+
+        final HashMap<String, String> readValue = mapTypeAdapter.read(new JsonReader(new StringReader(jsonString)));
+
+        assertThat(readValue).isEqualTo(dummyMap);
+    }
+
     /**
      * Test for {@link KnownTypeAdapters#JSON_OBJECT}
      */

From 625fe2ec6b469dd5caeddd9afc43d20ccfb53115 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 23 Apr 2018 14:56:37 -0400
Subject: [PATCH 44/84] Adding test for JSON_PRIMITIVE

---
 .../test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 843ce748..377b2608 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -1,6 +1,7 @@
 package com.vimeo.stag
 
 import com.google.gson.GsonBuilder
+import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSyntaxException
 import com.google.gson.stream.JsonReader
 import org.assertj.core.api.Assertions.assertThat
@@ -259,4 +260,12 @@ class KnownTypeAdaptersTestKt {
     fun `MapInstantiator creates an empty Map`() {
         assertThat(KnownTypeAdapters.MapInstantiator<String, String>().construct()).isEmpty()
     }
+
+    @Test
+    fun `JSON_PRIMITIVE adapter serializes and deserializes correctly`() {
+        val value = JsonPrimitive(5)
+        val json = KnownTypeAdapters.JSON_PRIMITIVE.toJson(value)
+        assertThat(KnownTypeAdapters.JSON_PRIMITIVE.fromJson(json)).isEqualTo(value)
+    }
+
 }

From 60f8f326a0660045c834ba459d9eef1a0f79a09d Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 26 Apr 2018 14:23:02 -0400
Subject: [PATCH 45/84] Refactor assertion function to be easier to use in
 kotlin

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 34 +++++++++----------
 .../src/test/java/com/vimeo/stag/Utils.kt     | 11 +++---
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 377b2608..82e47813 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -20,7 +20,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `KnownTypeAdapters is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters>()
     }
 
     @Test(expected = JsonSyntaxException::class)
@@ -40,7 +40,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveByteTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveByteTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveByteTypeAdapter>()
     }
 
     @Test(expected = JsonSyntaxException::class)
@@ -60,7 +60,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveShortTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveShortTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveShortTypeAdapter>()
     }
 
     @Test(expected = JsonSyntaxException::class)
@@ -80,7 +80,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveIntTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveIntTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveIntTypeAdapter>()
     }
 
     @Test(expected = JsonSyntaxException::class)
@@ -100,7 +100,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveLongTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveLongTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveLongTypeAdapter>()
     }
 
     @Test
@@ -115,7 +115,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveDoubleTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveDoubleTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveDoubleTypeAdapter>()
     }
 
     @Test
@@ -130,7 +130,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveCharTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveCharTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveCharTypeAdapter>()
     }
 
     @Test
@@ -145,7 +145,7 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveBooleanTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveBooleanTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveBooleanTypeAdapter>()
     }
 
     @Test
@@ -160,47 +160,47 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `PrimitiveFloatTypeAdapter is not instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveFloatTypeAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveFloatTypeAdapter>()
     }
 
     @Test
     fun `PrimitiveIntegerArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveIntegerArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveIntegerArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveLongArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveLongArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveLongArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveDoubleArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveDoubleArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveDoubleArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveShortArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveShortArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveShortArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveFloatArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveFloatArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveFloatArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveBooleanArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveBooleanArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveBooleanArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveByteArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveByteArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveByteArrayAdapter>()
     }
 
     @Test
     fun `PrimitiveCharArrayAdapter is non-instantiable`() {
-        testZeroArgumentConstructorFinalClass(KnownTypeAdapters.PrimitiveCharArrayAdapter::class.java)
+        assertThatClassIsNotInstantiable<KnownTypeAdapters.PrimitiveCharArrayAdapter>()
     }
 
     @Test
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.kt b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
index 18af38d6..f24c4045 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/Utils.kt
@@ -9,15 +9,12 @@ import org.assertj.core.api.Assertions.assertThatThrownBy
 import java.util.ArrayList
 import java.util.HashMap
 
-fun <T> testZeroArgumentConstructorFinalClass(clazz: Class<T>) {
-    fun instantiateClass(clazz: Class<T>): T {
-        return clazz.getDeclaredConstructor().apply {
+inline fun <reified T : Any> assertThatClassIsNotInstantiable() {
+    assertThatThrownBy {
+        T::class.java.getDeclaredConstructor().apply {
+            assertThat(isAccessible).isFalse()
             isAccessible = true
         }.newInstance()
-    }
-
-    assertThatThrownBy {
-        instantiateClass(clazz)
     }.hasCauseInstanceOf(UnsupportedOperationException::class.java)
 }
 

From 3a0f860df919363d53dfbb4d3f2f1e064c1b4d5b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 26 Apr 2018 14:40:07 -0400
Subject: [PATCH 46/84] Fixing long lines

---
 .../com/vimeo/stag/KnownTypeAdaptersTest.java | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

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 a51656f3..8e9f0be4 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTest.java
@@ -611,8 +611,9 @@ public void testForListTypeAdapter() throws Exception {
         // for string arrays
         ArrayList<String> dummyList = Utils.createStringDummyList();
 
-        TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
-                                                                                                 new KnownTypeAdapters.ArrayListInstantiator<String>());
+        TypeAdapter<ArrayList<String>> listTypeAdapter =
+                new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
+                                                        new KnownTypeAdapters.ArrayListInstantiator<String>());
 
         StringWriter stringWriter = new StringWriter();
         listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
@@ -630,8 +631,9 @@ public void testForListTypeAdapter() throws Exception {
         // for integer arrays
         ArrayList<Integer> intDummyList = Utils.createIntegerDummyList();
 
-        TypeAdapter<ArrayList<Integer>> listTypeAdapter1 = new KnownTypeAdapters.ListTypeAdapter<>(KnownTypeAdapters.INTEGER,
-                                                                                                   new KnownTypeAdapters.ArrayListInstantiator<Integer>());
+        TypeAdapter<ArrayList<Integer>> listTypeAdapter1 =
+                new KnownTypeAdapters.ListTypeAdapter<>(KnownTypeAdapters.INTEGER,
+                                                        new KnownTypeAdapters.ArrayListInstantiator<Integer>());
         stringWriter = new StringWriter();
         listTypeAdapter1.write(new JsonWriter(stringWriter), intDummyList);
         jsonString = stringWriter.toString();
@@ -650,8 +652,9 @@ public void testForListTypeAdapter() throws Exception {
     public void listTypeAdapterHandlesNullsCorrectly() throws Exception {
         final ArrayList<String> dummyList = null;
 
-        TypeAdapter<ArrayList<String>> listTypeAdapter = new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
-                                                                                                 new KnownTypeAdapters.ArrayListInstantiator<String>());
+        TypeAdapter<ArrayList<String>> listTypeAdapter =
+                new KnownTypeAdapters.ListTypeAdapter<>(TypeAdapters.STRING,
+                                                        new KnownTypeAdapters.ArrayListInstantiator<String>());
 
         StringWriter stringWriter = new StringWriter();
         listTypeAdapter.write(new JsonWriter(stringWriter), dummyList);
@@ -671,8 +674,10 @@ public void testForMapTypeAdapter() throws Exception {
         // for string arrays
         HashMap<String, String> dummyMap = Utils.createStringDummyMap();
 
-        TypeAdapter<HashMap<String, String>> mapTypeAdapter = new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING, TypeAdapters.STRING,
-                                                                                                     new KnownTypeAdapters.HashMapInstantiator<String, String>());
+        TypeAdapter<HashMap<String, String>> mapTypeAdapter =
+                new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING,
+                                                       TypeAdapters.STRING,
+                                                       new KnownTypeAdapters.HashMapInstantiator<String, String>());
 
         StringWriter stringWriter = new StringWriter();
         mapTypeAdapter.write(new JsonWriter(stringWriter), dummyMap);
@@ -688,8 +693,10 @@ public void testForMapTypeAdapter() throws Exception {
         // for integer arrays
         HashMap<Integer, Integer> intDummyMap = Utils.createIntegerDummyMap();
 
-        TypeAdapter<HashMap<Integer, Integer>> mapTypeAdapter1 = new KnownTypeAdapters.MapTypeAdapter<>(KnownTypeAdapters.INTEGER, KnownTypeAdapters.INTEGER,
-                                                                                                        new KnownTypeAdapters.HashMapInstantiator<Integer, Integer>());
+        TypeAdapter<HashMap<Integer, Integer>> mapTypeAdapter1 =
+                new KnownTypeAdapters.MapTypeAdapter<>(KnownTypeAdapters.INTEGER,
+                                                       KnownTypeAdapters.INTEGER,
+                                                       new KnownTypeAdapters.HashMapInstantiator<Integer, Integer>());
         stringWriter = new StringWriter();
         mapTypeAdapter1.write(new JsonWriter(stringWriter), intDummyMap);
         jsonString = stringWriter.toString();
@@ -706,8 +713,10 @@ public void testForMapTypeAdapter() throws Exception {
     public void mapTypeAdapterHandlesNullsCorrectly() throws Exception {
         final HashMap<String, String> dummyMap = null;
 
-        TypeAdapter<HashMap<String, String>> mapTypeAdapter = new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING, TypeAdapters.STRING,
-                                                                                                     new KnownTypeAdapters.HashMapInstantiator<String, String>());
+        TypeAdapter<HashMap<String, String>> mapTypeAdapter =
+                new KnownTypeAdapters.MapTypeAdapter<>(TypeAdapters.STRING,
+                                                       TypeAdapters.STRING,
+                                                       new KnownTypeAdapters.HashMapInstantiator<String, String>());
 
         StringWriter stringWriter = new StringWriter();
         mapTypeAdapter.write(new JsonWriter(stringWriter), dummyMap);

From 1335334cb072052e64454f5723bb9540b50ef9c4 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 10:42:48 -0400
Subject: [PATCH 47/84] Adding more tests for isAbstract

---
 .../vimeo/stag/processor/TypeUtilsUnitTest.kt | 148 ++++++++++--------
 1 file changed, 84 insertions(+), 64 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index ca00c1d6..e5b87a3b 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -27,11 +27,11 @@ import com.vimeo.stag.processor.dummy.*
 import com.vimeo.stag.processor.generators.model.accessor.DirectFieldAccessor
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor
 import com.vimeo.stag.processor.utils.TypeUtils
-import org.junit.Assert
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 import java.util.*
+import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
 import javax.lang.model.element.VariableElement
 import javax.lang.model.type.TypeKind
@@ -245,23 +245,43 @@ class TypeUtilsUnitTest : BaseUnitTest() {
     }
 
     @Test
-    @Throws(Exception::class)
-    fun isAbstract_isCorrect() {
+    fun `isAbstract (Element) is correct`() {
+        assertFalse(TypeUtils.isAbstract(null as Element?))
+
         val abstractElement = Utils.getElementFromClass(DummyAbstractClass::class.java)
-        Assert.assertTrue(TypeUtils.isAbstract(abstractElement))
+        assertTrue(TypeUtils.isAbstract(abstractElement))
 
         val concreteElement = Utils.getElementFromClass(DummyConcreteClass::class.java)
-        Assert.assertFalse(TypeUtils.isAbstract(concreteElement))
+        assertFalse(TypeUtils.isAbstract(concreteElement))
 
         val genericElement = Utils.getElementFromClass(DummyGenericClass::class.java)
-        Assert.assertFalse(TypeUtils.isAbstract(genericElement))
+        assertFalse(TypeUtils.isAbstract(genericElement))
 
         val enumElement = Utils.getElementFromClass(DummyEnumClass::class.java)
-        Assert.assertFalse(TypeUtils.isAbstract(enumElement))
+        assertFalse(TypeUtils.isAbstract(enumElement))
 
         val inheritedElement = Utils.getElementFromClass(DummyInheritedClass::class.java)
-        Assert.assertFalse(TypeUtils.isAbstract(inheritedElement))
+        assertFalse(TypeUtils.isAbstract(inheritedElement))
+    }
+
+    @Test
+    fun `isAbstract (TypeMirror) is correct`() {
+        assertFalse(TypeUtils.isAbstract(null as TypeMirror?))
+
+        val abstractElement = Utils.getTypeMirrorFromClass(DummyAbstractClass::class.java)
+        assertTrue(TypeUtils.isAbstract(abstractElement))
+
+        val concreteElement = Utils.getTypeMirrorFromClass(DummyConcreteClass::class.java)
+        assertFalse(TypeUtils.isAbstract(concreteElement))
+
+        val genericElement = Utils.getTypeMirrorFromClass(DummyGenericClass::class.java)
+        assertFalse(TypeUtils.isAbstract(genericElement))
+
+        val enumElement = Utils.getTypeMirrorFromClass(DummyEnumClass::class.java)
+        assertFalse(TypeUtils.isAbstract(enumElement))
 
+        val inheritedElement = Utils.getTypeMirrorFromClass(DummyInheritedClass::class.java)
+        assertFalse(TypeUtils.isAbstract(inheritedElement))
     }
 
     @Test
@@ -285,72 +305,72 @@ class TypeUtilsUnitTest : BaseUnitTest() {
     fun testIsSupportedPrimitive_supportsTypes() {
 
         // Check supported primitives
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Long::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Int::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Boolean::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Float::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Double::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Byte::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Char::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedPrimitive(Short::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Long::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Int::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Boolean::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Float::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Double::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Byte::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Char::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedPrimitive(Short::class.javaPrimitiveType!!.name))
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(Void.TYPE.name))
+        assertFalse(TypeUtils.isSupportedPrimitive(Void.TYPE.name))
 
         // Check non-primitives
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(String::class.java.name))
-        Assert.assertFalse(TypeUtils.isSupportedPrimitive(Any::class.java.name))
+        assertFalse(TypeUtils.isSupportedPrimitive(String::class.java.name))
+        assertFalse(TypeUtils.isSupportedPrimitive(Any::class.java.name))
     }
 
     @Test
     @Throws(Exception::class)
     fun testIsSupportedCollection_supportsTypes() {
         // Check supported list types
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
 
         // Check unsupported list types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
 
-        Assert.assertFalse(TypeUtils.isSupportedCollection(null))
+        assertFalse(TypeUtils.isSupportedCollection(null))
 
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
 
         // 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.java))))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String::class.java))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
     }
 
     @Test
     @Throws(Exception::class)
     fun testIsSupportedList_supportsTypes() {
         // Check supported types
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
+        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
 
         // Check unsupported list types
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
 
 
-        Assert.assertFalse(TypeUtils.isSupportedCollection(null))
+        assertFalse(TypeUtils.isSupportedCollection(null))
 
-        Assert.assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
+        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
 
         // 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.java))))
-        Assert.assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String::class.java))))
+        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
 
     }
 
@@ -358,40 +378,40 @@ class TypeUtilsUnitTest : BaseUnitTest() {
     @Throws(Exception::class)
     fun testIsSupportedNative_supportsCorrectTypes() {
         // Check supported primitives
-        Assert.assertTrue(TypeUtils.isSupportedNative(Long::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Int::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Boolean::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Float::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Double::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(String::class.java.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Byte::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Char::class.javaPrimitiveType!!.name))
-        Assert.assertTrue(TypeUtils.isSupportedNative(Short::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Long::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Int::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Boolean::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Float::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Double::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(String::class.java.name))
+        assertTrue(TypeUtils.isSupportedNative(Byte::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Char::class.javaPrimitiveType!!.name))
+        assertTrue(TypeUtils.isSupportedNative(Short::class.javaPrimitiveType!!.name))
 
         // Check unsupported primitives
-        Assert.assertFalse(TypeUtils.isSupportedNative(Void.TYPE.name))
+        assertFalse(TypeUtils.isSupportedNative(Void.TYPE.name))
 
         // Check non-primitives
-        Assert.assertFalse(TypeUtils.isSupportedNative(Any::class.java.name))
+        assertFalse(TypeUtils.isSupportedNative(Any::class.java.name))
     }
 
     @Test
     @Throws(Exception::class)
     fun testIsMap_supportsCorrectTypes() {
         // Check null
-        Assert.assertFalse(TypeUtils.isSupportedMap(null))
+        assertFalse(TypeUtils.isSupportedMap(null))
 
         // Check supported types
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Map::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(HashMap::class.java)))
-        Assert.assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(LinkedHashMap::class.java)))
+        assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Map::class.java)))
+        assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(HashMap::class.java)))
+        assertTrue(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(LinkedHashMap::class.java)))
 
         // Check type that implements map
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyMapClass::class.java)))
+        assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyMapClass::class.java)))
 
         // Check other types
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Any::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass::class.java)))
-        Assert.assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String::class.java)))
+        assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(Any::class.java)))
+        assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(DummyConcreteClass::class.java)))
+        assertFalse(TypeUtils.isSupportedMap(Utils.getTypeMirrorFromClass(String::class.java)))
     }
 }

From b8e97ca42cc26120cbd732c91f0ef17f5afb647f Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 10:54:04 -0400
Subject: [PATCH 48/84] Adding test case for isParameterizedType

---
 .../test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index e5b87a3b..e09011c2 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -285,8 +285,9 @@ class TypeUtilsUnitTest : BaseUnitTest() {
     }
 
     @Test
-    @Throws(Exception::class)
-    fun isParameterizedType_Element_isCorrect() {
+    fun `isParameterizedType (TypeElement) is correct`() {
+        assertFalse(TypeUtils.isParameterizedType(null as TypeElement?))
+
         val testMap = HashMap<String, List<Any>>()
         assertTrue(TypeUtils.isParameterizedType(Utils.getElementFromObject(testMap)))
 

From b1698ea769f0d1af70fceb669afc88ffb1c7ef3d Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 11:00:03 -0400
Subject: [PATCH 49/84] Removing unused function

---
 .../vimeo/stag/processor/utils/TypeUtils.java | 13 ------------
 .../vimeo/stag/processor/TypeUtilsUnitTest.kt | 21 -------------------
 2 files changed, 34 deletions(-)

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 72bbf03b..763ea0ea 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
@@ -501,19 +501,6 @@ 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()) ||
-               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());
-    }
-
     /**
      * Returns the inner {@link TypeMirror} for a given {@link TypeMirror}
      */
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index e09011c2..255b1553 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -375,27 +375,6 @@ class TypeUtilsUnitTest : BaseUnitTest() {
 
     }
 
-    @Test
-    @Throws(Exception::class)
-    fun testIsSupportedNative_supportsCorrectTypes() {
-        // Check supported primitives
-        assertTrue(TypeUtils.isSupportedNative(Long::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Int::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Boolean::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Float::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Double::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(String::class.java.name))
-        assertTrue(TypeUtils.isSupportedNative(Byte::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Char::class.javaPrimitiveType!!.name))
-        assertTrue(TypeUtils.isSupportedNative(Short::class.javaPrimitiveType!!.name))
-
-        // Check unsupported primitives
-        assertFalse(TypeUtils.isSupportedNative(Void.TYPE.name))
-
-        // Check non-primitives
-        assertFalse(TypeUtils.isSupportedNative(Any::class.java.name))
-    }
-
     @Test
     @Throws(Exception::class)
     fun testIsMap_supportsCorrectTypes() {

From 33e620e976762863c6fca607b787cebb6d2137dc Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 11:04:32 -0400
Subject: [PATCH 50/84] Documenting and testing MessagerUtils

---
 .../stag/processor/utils/MessagerUtils.java     | 15 +++++++++++----
 .../stag/processor/utils/MessagerUtilsTest.kt   | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/MessagerUtilsTest.kt

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
index 975d9a66..76c0d9b6 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/MessagerUtils.java
@@ -39,6 +39,11 @@ private MessagerUtils() {
         throw new UnsupportedOperationException("This class is not instantiable");
     }
 
+    /**
+     * Initialize the Messager. Must be done before the messager can be used.
+     *
+     * @param messager the messager instance.
+     */
     public static void initialize(@NotNull Messager messager) {
         sMessager = messager;
     }
@@ -49,12 +54,14 @@ private static Messager getMessager() {
         return sMessager;
     }
 
+    /**
+     * Report a fatal error to the compiler. Will halt compilation.
+     *
+     * @param message the message to display in the compilation output.
+     * @param element the offending element.
+     */
     public static void reportError(@NotNull String message, @NotNull Element element) {
         getMessager().printMessage(Kind.ERROR, message, element);
     }
 
-    public static void reportWarning(@NotNull String message) {
-        getMessager().printMessage(Kind.MANDATORY_WARNING, message);
-    }
-
 }
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/MessagerUtilsTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/MessagerUtilsTest.kt
new file mode 100644
index 00000000..62a8eef6
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/MessagerUtilsTest.kt
@@ -0,0 +1,17 @@
+package com.vimeo.stag.processor.utils
+
+import com.vimeo.stag.processor.Utils
+import org.junit.Test
+
+/**
+ * Unit tests for [MessagerUtils].
+ *
+ * Created by restainoa on 6/15/18.
+ */
+class MessagerUtilsTest {
+
+    @Test
+    fun `MessagerUtils is not instantiable`() {
+        Utils.testZeroArgumentConstructorFinalClass(MessagerUtils::class.java)
+    }
+}

From e6a87441c5d945baa478707ced392913d30d8aca Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 11:13:46 -0400
Subject: [PATCH 51/84] ElementUtils tests

---
 .../stag/processor/utils/ElementUtils.java    |  4 ++--
 .../stag/processor/ElementUtilsUnitTest.kt    | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

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 cb00be16..4d38fed2 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
@@ -91,8 +91,8 @@ public static String getPackage(@NotNull TypeMirror type) {
      * @return {@code true} if the element is annotated, {@code false} otherwise
      */
     private static <T extends Annotation> boolean isAnnotatedWith(@NotNull Class<T> annotationClass,
-                                                                  @Nullable Element element) {
-        return element != null && element.getAnnotation(annotationClass) != null;
+                                                                  @NotNull Element element) {
+        return element.getAnnotation(annotationClass) != null;
     }
 
     /**
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
index 6eb4ca32..9362b4d9 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
@@ -29,8 +29,7 @@ import com.vimeo.stag.processor.dummy.DummyGenericClass
 import com.vimeo.stag.processor.dummy.DummyInheritedClass
 import com.vimeo.stag.processor.utils.ElementUtils
 import com.vimeo.stag.processor.utils.TypeUtils
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
+import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 import java.util.ArrayList
@@ -48,6 +47,16 @@ class ElementUtilsUnitTest : BaseUnitTest() {
 
     @Test
     fun testGetTypeFromQualifiedName() {
+        fun <T> testTypeMirrorCreationAndEquality(clazz: Class<T>) {
+            assertEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(clazz.name))
+        }
+
+        fun <T, R> testTypeMirrorCreationAndInequality(clazz: Class<T>, otherClass: Class<R>) {
+            assertNotEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(otherClass.name))
+        }
+
+        assertNull(ElementUtils.getTypeElementFromQualifiedName(""))
+
         testTypeMirrorCreationAndEquality(String::class.java)
         testTypeMirrorCreationAndEquality(Any::class.java)
         testTypeMirrorCreationAndEquality(ArrayList::class.java)
@@ -60,12 +69,14 @@ class ElementUtilsUnitTest : BaseUnitTest() {
         testTypeMirrorCreationAndInequality(DummyInheritedClass::class.java, DummyGenericClass::class.java)
     }
 
-    private fun <T> testTypeMirrorCreationAndEquality(clazz: Class<T>) {
-        assertEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(clazz.name))
+    @Test
+    fun `isSupportedElementKind returns false for null Element`() {
+        assertFalse(ElementUtils.isSupportedElementKind(null))
     }
 
-    private fun <T, R> testTypeMirrorCreationAndInequality(clazz: Class<T>, otherClass: Class<R>) {
-        assertNotEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(otherClass.name))
+    @Test
+    fun `isSupportedElementKind returns false for non annotated element`() {
+        assertFalse(ElementUtils.isSupportedElementKind(Utils.getElementFromClass(String::class.java)))
     }
 
     @Test

From e5192a494d7b38137abbdf28b552ebbe0dc314e6 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 11:51:08 -0400
Subject: [PATCH 52/84] Test for DebugLog

---
 .../stag/processor/utils/DebugLogTest.kt      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
new file mode 100644
index 00000000..1d4d1329
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
@@ -0,0 +1,30 @@
+package com.vimeo.stag.processor.utils
+
+import com.vimeo.stag.processor.StagProcessor
+import com.vimeo.stag.processor.Utils
+import org.junit.Test
+
+/**
+ * Unit tests for [DebugLog].
+ *
+ * Created by restainoa on 6/15/18.
+ */
+class DebugLogTest {
+
+    @Test
+    fun `DebugLog is not instantiable`() {
+        Utils.testZeroArgumentConstructorFinalClass(DebugLog::class.java)
+    }
+
+    @Test
+    fun `log message works`() {
+        StagProcessor.DEBUG = true
+        DebugLog.log("test message")
+    }
+
+    @Test
+    fun `log with tag and message works`() {
+        StagProcessor.DEBUG = true
+        DebugLog.log("test tag", "test message")
+    }
+}

From c4ec29db9f2c0257a15a1d5ad027961dd57dbb25 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 11:54:32 -0400
Subject: [PATCH 53/84] Cleaning up Types class

---
 .../src/main/java/com/vimeo/stag/Types.java        | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/stag-library/src/main/java/com/vimeo/stag/Types.java b/stag-library/src/main/java/com/vimeo/stag/Types.java
index 6200692d..323d3e5b 100644
--- a/stag-library/src/main/java/com/vimeo/stag/Types.java
+++ b/stag-library/src/main/java/com/vimeo/stag/Types.java
@@ -1,35 +1,41 @@
 package com.vimeo.stag;
 
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 
+@SuppressWarnings("unused")
 public final class Types {
 
     private Types() {}
 
-    public static WildcardType getWildcardType(Type[] upperBounds, Type[] lowerBounds) {
+    @NotNull
+    public static WildcardType getWildcardType(@NotNull Type[] upperBounds, @NotNull Type[] lowerBounds) {
         return new WildcardTypeImpl(upperBounds, lowerBounds);
     }
 
     private static final class WildcardTypeImpl implements WildcardType {
 
+        @NotNull
         private final Type[] upperBounds;
+        @NotNull
         private final Type[] lowerBounds;
 
-        public WildcardTypeImpl(Type[] upperBounds, Type[] lowerBounds) {
+        public WildcardTypeImpl(@NotNull Type[] upperBounds, @NotNull Type[] lowerBounds) {
             this.upperBounds = upperBounds;
             this.lowerBounds = lowerBounds;
         }
 
         @Override
         public Type[] getUpperBounds() {
-            return upperBounds;
+            return upperBounds.clone();
         }
 
         @Override
         public Type[] getLowerBounds() {
-            return lowerBounds;
+            return lowerBounds.clone();
         }
     }
 }

From 716da9e93b05f2710418ee4e52ca554c2ac1edfb Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 12:00:54 -0400
Subject: [PATCH 54/84] Lowering visibility

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

diff --git a/stag-library/src/main/java/com/vimeo/stag/Types.java b/stag-library/src/main/java/com/vimeo/stag/Types.java
index 323d3e5b..e38f344b 100644
--- a/stag-library/src/main/java/com/vimeo/stag/Types.java
+++ b/stag-library/src/main/java/com/vimeo/stag/Types.java
@@ -23,7 +23,7 @@ private static final class WildcardTypeImpl implements WildcardType {
         @NotNull
         private final Type[] lowerBounds;
 
-        public WildcardTypeImpl(@NotNull Type[] upperBounds, @NotNull Type[] lowerBounds) {
+        WildcardTypeImpl(@NotNull Type[] upperBounds, @NotNull Type[] lowerBounds) {
             this.upperBounds = upperBounds;
             this.lowerBounds = lowerBounds;
         }

From 312d1d83c1ac0a5a5fafa8edcaeefa376ea0be5a Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 16:32:24 -0400
Subject: [PATCH 55/84] Unit tests for MapTypeAdapter

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 96 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 3 deletions(-)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 82e47813..69f9fca8 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -1,9 +1,10 @@
 package com.vimeo.stag
 
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSyntaxException
+import com.google.gson.*
+import com.google.gson.internal.ObjectConstructor
 import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.io.StringReader
@@ -268,4 +269,93 @@ class KnownTypeAdaptersTestKt {
         assertThat(KnownTypeAdapters.JSON_PRIMITIVE.fromJson(json)).isEqualTo(value)
     }
 
+    data class KeyTest(val string: String)
+
+    @Test
+    fun `MapTypeAdapter serializes and deserializes object keys correctly`() {
+        val mapTypeAdapter = KnownTypeAdapters.MapTypeAdapter<KeyTest, String, Map<KeyTest, String>>(
+                object : TypeAdapter<KeyTest>() {
+                    override fun write(out: JsonWriter, value: KeyTest?) {
+                        out.beginObject()
+                        out.name("string")
+                        out.value(value?.string)
+                        out.endObject()
+                    }
+
+                    override fun read(input: JsonReader): KeyTest {
+                        input.beginObject()
+                        input.nextName()
+                        val string = input.nextString()
+                        input.endObject()
+                        return KeyTest(string ?: throw Exception("Null string"))
+                    }
+
+                },
+                KnownTypeAdapters.STRING_NULL_SAFE_TYPE_ADAPTER,
+                ObjectConstructor<Map<KeyTest, String>> { HashMap() }
+        )
+
+        val testMap = mapOf(
+                Pair(KeyTest("a"), "b"),
+                Pair(KeyTest("b"), "c")
+        )
+
+        val json = mapTypeAdapter.toJson(testMap)
+        assertThat(mapTypeAdapter.fromJson(json)).isEqualTo(testMap)
+    }
+
+    @Test
+    fun `MapTypeAdapter serializes and deserializes array keys correctly`() {
+        val mapTypeAdapter = KnownTypeAdapters.MapTypeAdapter<List<KeyTest>, String, Map<List<KeyTest>, String>>(
+                object : TypeAdapter<List<KeyTest>>() {
+                    override fun write(out: JsonWriter, value: List<KeyTest>?) {
+                        out.beginArray()
+                        value?.forEach {
+                            out.beginObject()
+                            out.name("string")
+                            out.value(it.string)
+                            out.endObject()
+                        }
+                        out.endArray()
+                    }
+
+                    override fun read(input: JsonReader): List<KeyTest> {
+                        val mutableList = mutableListOf<KeyTest>()
+                        input.beginArray()
+                        while (input.peek() == JsonToken.BEGIN_OBJECT) {
+                            input.beginObject()
+                            input.nextName()
+                            val string = input.nextString()
+                            input.endObject()
+                            mutableList.add(KeyTest(string ?: throw Exception("Null string")))
+                        }
+                        input.endArray()
+                        return mutableList
+                    }
+
+                },
+                KnownTypeAdapters.STRING_NULL_SAFE_TYPE_ADAPTER,
+                ObjectConstructor<Map<List<KeyTest>, String>> { HashMap() }
+        )
+
+        val testMap = mapOf(
+                Pair(
+                        listOf(
+                                KeyTest("a"),
+                                KeyTest("b")
+                        ),
+                        "b"
+                ),
+                Pair(
+                        listOf(
+                                KeyTest("c"),
+                                KeyTest("c")
+                        ),
+                        "c"
+                )
+        )
+
+        val json = mapTypeAdapter.toJson(testMap)
+        assertThat(mapTypeAdapter.fromJson(json)).isEqualTo(testMap)
+    }
 }

From ce3a1a6f3a75d01d7bf2ad57886e4b9f42a10cb4 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 16:52:09 -0400
Subject: [PATCH 56/84] Unit tests for ObjectTypeAdapter

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 69f9fca8..a777b64b 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -1,6 +1,9 @@
 package com.vimeo.stag
 
-import com.google.gson.*
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSyntaxException
+import com.google.gson.TypeAdapter
 import com.google.gson.internal.ObjectConstructor
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonToken
@@ -219,6 +222,34 @@ class KnownTypeAdaptersTestKt {
         assertSerializationEquality(null)
     }
 
+    @Test
+    fun `ObjectTypeAdapter serializes list correctly`() {
+        val list = listOf("a", "b", "c", "d")
+
+        val gson = GsonBuilder().create()
+        val objectTypeAdapter = KnownTypeAdapters.ObjectTypeAdapter(gson)
+
+        val json = objectTypeAdapter.toJson(list)
+
+        assertThat(objectTypeAdapter.fromJson(json)).isEqualTo(list)
+    }
+
+    @Test
+    fun `ObjectTypeAdapter serializes map correctly`() {
+        val map = mapOf(
+                "a" to "b",
+                "b" to "c",
+                "c" to "e"
+        )
+
+        val gson = GsonBuilder().create()
+        val objectTypeAdapter = KnownTypeAdapters.ObjectTypeAdapter(gson)
+
+        val json = objectTypeAdapter.toJson(map)
+
+        assertThat(objectTypeAdapter.fromJson(json)).isEqualTo(map)
+    }
+
     @Test
     fun `ArrayTypeAdapter serializes data correctly`() {
         val intTypeAdapter = KnownTypeAdapters.INTEGER
@@ -296,8 +327,8 @@ class KnownTypeAdaptersTestKt {
         )
 
         val testMap = mapOf(
-                Pair(KeyTest("a"), "b"),
-                Pair(KeyTest("b"), "c")
+                KeyTest("a") to "b",
+                KeyTest("b") to "c"
         )
 
         val json = mapTypeAdapter.toJson(testMap)
@@ -339,20 +370,8 @@ class KnownTypeAdaptersTestKt {
         )
 
         val testMap = mapOf(
-                Pair(
-                        listOf(
-                                KeyTest("a"),
-                                KeyTest("b")
-                        ),
-                        "b"
-                ),
-                Pair(
-                        listOf(
-                                KeyTest("c"),
-                                KeyTest("c")
-                        ),
-                        "c"
-                )
+                listOf(KeyTest("a"), KeyTest("b")) to "b",
+                listOf(KeyTest("c"), KeyTest("c")) to "c"
         )
 
         val json = mapTypeAdapter.toJson(testMap)

From 65739c5736edc10a35fd0b69f295270d98de8d53 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 17:10:15 -0400
Subject: [PATCH 57/84] Unit tests for FileGenUtils

---
 .../stag/processor/utils/FileGenUtils.java    | 15 ++------
 .../stag/processor/utils/FileGenUtilsTest.kt  | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt

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 acdc514d..3a55ed9e 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
@@ -77,12 +77,7 @@ public static void writeToFile(@NotNull JavaFile file, @NotNull Filer filer) thr
             }
             throw e;
         } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ignored) {
-                }
-            }
+            close(writer);
         }
     }
 
@@ -116,13 +111,7 @@ static void writeToResource(@NotNull Filer filer, @NotNull String generatedPacka
             }
             throw e;
         } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ignored) {
-
-                }
-            }
+            close(writer);
         }
     }
 
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
new file mode 100644
index 00000000..9b88576f
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
@@ -0,0 +1,34 @@
+package com.vimeo.stag.processor.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.io.Closeable
+import java.io.IOException
+
+/**
+ * Unit tests for [FileGenUtils].
+ *
+ * Created by restainoa on 6/15/18.
+ */
+class FileGenUtilsTest {
+
+    @Test
+    fun close() {
+        var counter = 0
+        val closeable = Closeable { counter++ }
+        FileGenUtils.close(closeable)
+        assertEquals(1, counter)
+
+        FileGenUtils.close(null)
+        assertEquals(1, counter)
+
+        val failureCloseable = Closeable { throw IOException("test") }
+        FileGenUtils.close(failureCloseable)
+    }
+
+    @Test(expected = Exception::class)
+    fun `close does not catch generic exceptions`() {
+        val failureCloseable = Closeable { throw Exception("test") }
+        FileGenUtils.close(failureCloseable)
+    }
+}

From 211576c8b4b5f3bf612a1e5400cf7e09034132af Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Fri, 15 Jun 2018 18:12:37 -0400
Subject: [PATCH 58/84] Constructor tests

---
 .../processor/utils/KnownTypeAdapterUtils.java |  3 ++-
 .../stag/processor/utils/FileGenUtilsTest.kt   |  6 ++++++
 .../utils/KnownTypeAdapterUtilsTest.kt         | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtilsTest.kt

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 38eee091..330df954 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,6 +132,7 @@ private static String fieldToString(@NotNull Class clazz, @NotNull Object object
     }
 
     private KnownTypeAdapterUtils() {
+        throw new UnsupportedOperationException("KnownTypeAdapterUtils cannot be instantiated");
     }
 
     @Nullable
@@ -240,4 +241,4 @@ public static String getNativePrimitiveTypeAdapter(@NotNull TypeMirror typeMirro
     public static boolean hasNativePrimitiveTypeAdapter(@NotNull TypeMirror typeMirror) {
         return KNOWN_PRIMITIVE_TYPE_ADAPTERS.containsKey(typeMirror.toString());
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
index 9b88576f..840df0c2 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
@@ -1,5 +1,6 @@
 package com.vimeo.stag.processor.utils
 
+import com.vimeo.stag.processor.Utils
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.Closeable
@@ -12,6 +13,11 @@ import java.io.IOException
  */
 class FileGenUtilsTest {
 
+    @Test
+    fun `FileGenUtils is not instantiable`() {
+        Utils.testZeroArgumentConstructorFinalClass(FileGenUtils::class.java)
+    }
+
     @Test
     fun close() {
         var counter = 0
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtilsTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtilsTest.kt
new file mode 100644
index 00000000..d6fa311d
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/KnownTypeAdapterUtilsTest.kt
@@ -0,0 +1,18 @@
+package com.vimeo.stag.processor.utils
+
+import com.vimeo.stag.processor.Utils
+import org.junit.Test
+
+/**
+ * Unit tests for [KnownTypeAdapterUtils].
+ *
+ * Created by restainoa on 6/15/18.
+ */
+class KnownTypeAdapterUtilsTest {
+
+    @Test
+    fun `KnownTypeAdapterUtils is not instantiable`() {
+        Utils.testZeroArgumentConstructorFinalClass(KnownTypeAdapterUtils::class.java)
+    }
+
+}

From 974476a56698419881f8ef831874fe3eaba5fa7e Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 18 Jun 2018 12:48:41 -0400
Subject: [PATCH 59/84] Removing unused function and cleaning up code

---
 .../stag/processor/utils/FileGenUtils.java    |  1 +
 .../vimeo/stag/processor/utils/TypeUtils.java | 11 +---
 .../vimeo/stag/processor/TypeUtilsUnitTest.kt | 57 ++-----------------
 .../java/com/vimeo/stag/processor/Utils.kt    |  8 +--
 .../com/vimeo/stag/KnownTypeAdapters.java     |  1 +
 5 files changed, 11 insertions(+), 67 deletions(-)

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 3a55ed9e..f8506306 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
@@ -81,6 +81,7 @@ public static void writeToFile(@NotNull JavaFile file, @NotNull Filer filer) thr
         }
     }
 
+    @Nullable
     static CharSequence readResource(@NotNull Filer filer, @NotNull String generatedPackageName,
                                      @NotNull String resourceName) throws IOException {
         try {
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 763ea0ea..5a822dd3 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
@@ -456,16 +456,6 @@ 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) {
-        return type != null && (isNativeArray(type) || isSupportedList(type));
-    }
-
     /**
      * Method to check if the {@link TypeMirror} is of {@link List} type
      *
@@ -493,6 +483,7 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
             return false;
         }
         String outerClassType = TypeUtils.getOuterClassType(type);
+        //noinspection LiteralAsArgToStringEquals
         return outerClassType.equals(Map.class.getName()) ||
                outerClassType.equals(HashMap.class.getName()) ||
                outerClassType.equals(ConcurrentHashMap.class.getName()) ||
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index 255b1553..8b668c25 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -30,7 +30,10 @@ import com.vimeo.stag.processor.utils.TypeUtils
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
-import java.util.*
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.HashSet
+import java.util.LinkedHashMap
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
 import javax.lang.model.element.VariableElement
@@ -323,58 +326,6 @@ class TypeUtilsUnitTest : BaseUnitTest() {
         assertFalse(TypeUtils.isSupportedPrimitive(Any::class.java.name))
     }
 
-    @Test
-    @Throws(Exception::class)
-    fun testIsSupportedCollection_supportsTypes() {
-        // Check supported list types
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
-
-        // Check unsupported list types
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
-
-        assertFalse(TypeUtils.isSupportedCollection(null))
-
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
-
-        // Check array types
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String::class.java))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun testIsSupportedList_supportsTypes() {
-        // Check supported types
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(List::class.java)))
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(ArrayList::class.java)))
-        assertTrue(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Collection::class.java)))
-
-        // Check unsupported list types
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(LinkedList::class.java)))
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Vector::class.java)))
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Stack::class.java)))
-
-
-        assertFalse(TypeUtils.isSupportedCollection(null))
-
-        assertFalse(TypeUtils.isSupportedCollection(Utils.getTypeMirrorFromClass(Any::class.java)))
-
-        // Check supported array types
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.INT))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.BOOLEAN))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(types.getPrimitiveType(TypeKind.CHAR))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(String::class.java))))
-        assertTrue(TypeUtils.isSupportedCollection(types.getArrayType(Utils.getTypeMirrorFromClass(Any::class.java))))
-
-    }
-
     @Test
     @Throws(Exception::class)
     fun testIsMap_supportsCorrectTypes() {
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
index d74eaee5..8f907638 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/Utils.kt
@@ -72,17 +72,17 @@ internal object Utils {
         return safeTypes().getDeclaredType(rootType, *params)
     }
 
-    fun getElementFromClass(clazz: Class<*>): TypeElement = elements.getTypeElement(clazz.name)
+    fun getElementFromClass(clazz: Class<*>): TypeElement = elements.getTypeElement(clazz.canonicalName)
 
     fun getTypeMirrorFromClass(clazz: Class<*>): TypeMirror {
         val element = getElementFromClass(clazz)
         return element.asType()
     }
 
-    fun getElementFromObject(`object`: Any): TypeElement = elements.getTypeElement(`object`.javaClass.name)
+    fun getElementFromObject(any: Any): TypeElement = elements.getTypeElement(any.javaClass.name)
 
-    fun getTypeMirrorFromObject(`object`: Any): TypeMirror {
-        val element = getElementFromObject(`object`)
+    fun getTypeMirrorFromObject(any: Any): TypeMirror {
+        val element = getElementFromObject(any)
         return element.asType()
     }
 
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 74eabf73..aa77f608 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("WeakerAccess")
 public final class KnownTypeAdapters {
 
     private KnownTypeAdapters() {

From 6776421933765d6c72d497d20786f7cf716622f8 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 18 Jun 2018 13:23:41 -0400
Subject: [PATCH 60/84] Update kotlin plugin

---
 build.gradle                         | 2 +-
 integration-test-kotlin/build.gradle | 2 +-
 stag-library-compiler/build.gradle   | 2 +-
 stag-library/build.gradle            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index ec111c56..d9039176 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlinVersion = '1.2.40'
+        kotlinVersion = '1.2.50'
         jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
         gsonVersion = '2.8.2'
         assertJ = '3.9.1'
diff --git a/integration-test-kotlin/build.gradle b/integration-test-kotlin/build.gradle
index c3c76f53..712f285e 100644
--- a/integration-test-kotlin/build.gradle
+++ b/integration-test-kotlin/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     implementation project(':stag-library')
     kapt project(':stag-library-compiler')
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     testImplementation 'junit:junit:4.12'
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 6162dc57..c9a64fc1 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     // Used by both auto-service and compile-testing, we need to resolve the version for them.
     implementation 'com.google.guava:guava:23.5-jre'
 
-    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 }
 
 test {
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 2c5b340b..d8cd8383 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation 'com.intellij:annotations:12.0@jar'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.assertj:assertj-core:$assertJ"
-    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 }
 
 tasks.withType(Javadoc).all { enabled = true }

From 4bbe360283aa790165d49b0e40e5f7ae369423b7 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 18 Jun 2018 13:46:03 -0400
Subject: [PATCH 61/84] Simplifying implementations by removing nullability

---
 .../generators/TypeAdapterGenerator.java          |  5 +++--
 .../com/vimeo/stag/processor/utils/TypeUtils.java | 15 ++++++---------
 2 files changed, 9 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 00e7d8ee..b4d83ad3 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
@@ -425,8 +425,9 @@ private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
     /**
      * Returns the adapter code for the known types.
      */
-    private static String getAdapterAccessor(@NotNull TypeMirror fieldType
-            , @NotNull StagGenerator stagGenerator, @NotNull Map<TypeMirror, String> typeVarsMap,
+    private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
+                                             @NotNull StagGenerator stagGenerator,
+                                             @NotNull Map<TypeMirror, String> typeVarsMap,
                                              @NotNull AdapterFieldInfo adapterFieldInfo) {
 
         String knownTypeAdapter = KnownTypeAdapterUtils.getKnownTypeAdapterForType(fieldType);
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 5a822dd3..8d70daf8 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
@@ -273,8 +273,8 @@ public static boolean containsTypeVarParams(@NotNull TypeMirror typeMirror) {
      * inherits from Object or Enum.
      */
     @Nullable
-    public static TypeMirror getInheritedType(@Nullable TypeElement element) {
-        TypeMirror typeMirror = element != null ? element.getSuperclass() : null;
+    public static TypeMirror getInheritedType(@NotNull TypeElement element) {
+        TypeMirror typeMirror = element.getSuperclass();
         String className = typeMirror != null ? getClassNameFromTypeMirror(typeMirror) : null;
         if (!Object.class.getName().equals(className) && !Enum.class.getName().equals(className)) {
             return typeMirror;
@@ -288,8 +288,8 @@ public static TypeMirror getInheritedType(@Nullable TypeElement element) {
      * @param element the element to check.
      * @return true if the element inherits from an enum, false otherwise.
      */
-    public static boolean isEnum(@Nullable TypeElement element) {
-        TypeMirror typeMirror = element != null ? element.getSuperclass() : null;
+    public static boolean isEnum(@NotNull TypeElement element) {
+        TypeMirror typeMirror = element.getSuperclass();
         String className = typeMirror != null ? getClassNameFromTypeMirror(typeMirror) : null;
 
         return Enum.class.getName().equals(className);
@@ -459,13 +459,10 @@ public static boolean isNativeArray(@NotNull TypeMirror type) {
     /**
      * Method to check if the {@link TypeMirror} is of {@link List} type
      *
-     * @param type :TypeMirror type
+     * @param type TypeMirror type
      * @return boolean
      */
-    public static boolean isSupportedList(@Nullable TypeMirror type) {
-        if (type == null) {
-            return false;
-        }
+    public static boolean isSupportedList(@NotNull TypeMirror type) {
         String outerClassType = TypeUtils.getOuterClassType(type);
         return outerClassType.equals(ArrayList.class.getName()) ||
                outerClassType.equals(List.class.getName()) ||

From 3972d6cfb5bed8dddae0b4b321b97ac1af3b4621 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 14:39:21 -0400
Subject: [PATCH 62/84] Cleaning up code

---
 .../SwappableParserExampleModelTest.java              | 11 +++++++----
 .../stag/processor/utils/KnownTypeAdapterUtils.java   |  8 ++++----
 stag-library/src/main/java/com/vimeo/stag/Types.java  |  1 -
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
index 2ed24670..4dea5de9 100644
--- a/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
+++ b/integration-test-java/src/test/java/com/vimeo/sample_java_model/SwappableParserExampleModelTest.java
@@ -37,6 +37,9 @@
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Unit tests for {@link SwappableParserExampleModel}.
  */
@@ -67,7 +70,7 @@ public void test_SwappingTypeAdapters() {
                 .registerTypeAdapter(TestObject.class, new TestObjectAdapter1())
                 .create();
         final SwappableParserExampleModel model1 = gson1.fromJson(typeAdapter1Json, SwappableParserExampleModel.class);
-        Assert.assertEquals(model1.testField2.testField, "test");
+        assertEquals(model1.testField2.testField, "test");
 
         // TypeAdapter2 assumes a reversed string
         final String typeAdapter2Json = swappableParserExampleJsonWithTestObjectField("tset");
@@ -76,7 +79,7 @@ public void test_SwappingTypeAdapters() {
                 .registerTypeAdapter(TestObject.class, new TestObjectAdapter2())
                 .create();
         final SwappableParserExampleModel model2 = gson2.fromJson(typeAdapter2Json, SwappableParserExampleModel.class);
-        Assert.assertEquals(model2.testField2.testField, "test");
+        assertEquals(model2.testField2.testField, "test");
     }
 
     /**
@@ -112,7 +115,7 @@ public TestObject read(JsonReader in) throws IOException {
             TestObject object = new TestObject();
 
             in.beginObject();
-            Assert.assertTrue("testField".equals(in.nextName()));
+            assertTrue("testField".equals(in.nextName()));
             object.testField = in.nextString();
             in.endObject();
 
@@ -140,7 +143,7 @@ public TestObject read(JsonReader in) throws IOException {
             TestObject object = new TestObject();
 
             in.beginObject();
-            Assert.assertTrue("testField".equals(in.nextName()));
+            assertTrue("testField".equals(in.nextName()));
             object.testField = new StringBuilder(in.nextString()).reverse().toString();
             in.endObject();
 
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 330df954..9b48e9d8 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,6 +38,10 @@
  */
 public final class KnownTypeAdapterUtils {
 
+    private KnownTypeAdapterUtils() {
+        throw new UnsupportedOperationException("KnownTypeAdapterUtils cannot be instantiated");
+    }
+
     @NotNull private static final HashMap<String, String> KNOWN_TYPE_ADAPTERS = new HashMap<>();
     @NotNull private static final HashMap<String, String> SUPPORTED_COLLECTION_INSTANTIATORS = new HashMap<>();
     @NotNull private static final HashMap<String, String> SUPPORTED_MAP_INSTANTIATORS = new HashMap<>();
@@ -131,10 +135,6 @@ private static String fieldToString(@NotNull Class clazz, @NotNull Object object
         throw new IllegalStateException("Unable to find field: " + clazz.getName());
     }
 
-    private KnownTypeAdapterUtils() {
-        throw new UnsupportedOperationException("KnownTypeAdapterUtils cannot be instantiated");
-    }
-
     @Nullable
     public static String getKnownTypeAdapterForType(@NotNull TypeMirror typeMirror) {
         return KNOWN_TYPE_ADAPTERS.get(typeMirror.toString());
diff --git a/stag-library/src/main/java/com/vimeo/stag/Types.java b/stag-library/src/main/java/com/vimeo/stag/Types.java
index e38f344b..e0dc98d5 100644
--- a/stag-library/src/main/java/com/vimeo/stag/Types.java
+++ b/stag-library/src/main/java/com/vimeo/stag/Types.java
@@ -1,6 +1,5 @@
 package com.vimeo.stag;
 
-
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Type;

From cfc8b0bb436a2b3905d2172ead3f3f061f926932 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 14:45:23 -0400
Subject: [PATCH 63/84] Cleaning up documentation

---
 .../vimeo/stag/processor/utils/TypeUtils.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 8d70daf8..1d23aac8 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
@@ -439,8 +439,9 @@ private static List<? extends TypeMirror> getParameterizedTypes(@NotNull TypeMir
     /**
      * Method to check if the {@link TypeMirror} is of primitive type
      *
-     * @param type :TypeMirror type
-     * @return boolean
+     * @param type TypeMirror type
+     * @return true if the type represented as a string is a primitive type that's supported, false
+     * otherwise.
      */
     public static boolean isSupportedPrimitive(@NotNull String type) {
         return PRIMITIVE_TO_OBJECT_MAP.containsKey(type);
@@ -449,8 +450,8 @@ public static boolean isSupportedPrimitive(@NotNull String type) {
     /**
      * Method to check if the {@link TypeMirror} is of {@link ArrayType}
      *
-     * @param type :TypeMirror type
-     * @return boolean
+     * @param type TypeMirror type
+     * @return true if the type is a native array type, false otherwise.
      */
     public static boolean isNativeArray(@NotNull TypeMirror type) {
         return (type instanceof ArrayType);
@@ -460,7 +461,8 @@ public static boolean isNativeArray(@NotNull TypeMirror type) {
      * Method to check if the {@link TypeMirror} is of {@link List} type
      *
      * @param type TypeMirror type
-     * @return boolean
+     * @return true if the type is a {@link List}, {@link ArrayList}, or {@link Collection},
+     * false otherwise.
      */
     public static boolean isSupportedList(@NotNull TypeMirror type) {
         String outerClassType = TypeUtils.getOuterClassType(type);
@@ -472,8 +474,8 @@ public static boolean isSupportedList(@NotNull TypeMirror type) {
     /**
      * Method to check if the {@link TypeMirror} is of {@link Map} type
      *
-     * @param type :TypeMirror type
-     * @return boolean
+     * @param type TypeMirror type
+     * @return true if the type is a supported map type, false otherwise.
      */
     public static boolean isSupportedMap(@Nullable TypeMirror type) {
         if (type == null) {
@@ -555,7 +557,7 @@ public enum JsonAdapterType {
     /**
      * Return the type of JsonAdapter {@link TypeMirror}
      *
-     * @param type :TypeMirror type
+     * @param type TypeMirror type
      * @return {@link JsonAdapterType}
      */
     @NotNull

From 38eb35bcaf4e03d6b404226bf2c340672bcd59a5 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 15:03:38 -0400
Subject: [PATCH 64/84] Improving ElementUtils tests

---
 .../stag/processor/ElementUtilsUnitTest.kt    | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
index 9362b4d9..51233100 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ElementUtilsUnitTest.kt
@@ -32,7 +32,7 @@ import com.vimeo.stag.processor.utils.TypeUtils
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
-import java.util.ArrayList
+import java.util.*
 
 class ElementUtilsUnitTest : BaseUnitTest() {
 
@@ -43,30 +43,31 @@ class ElementUtilsUnitTest : BaseUnitTest() {
     }
 
     @Test
-    fun testConstructor() = Utils.testZeroArgumentConstructorFinalClass(ElementUtils::class.java)
+    fun `test constructor`() = Utils.testZeroArgumentConstructorFinalClass(ElementUtils::class.java)
 
     @Test
-    fun testGetTypeFromQualifiedName() {
-        fun <T> testTypeMirrorCreationAndEquality(clazz: Class<T>) {
-            assertEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(clazz.name))
+    fun `getTypeFromQualifiedName equality test`() {
+        listOf(
+                String::class.java,
+                Any::class.java,
+                ArrayList::class.java,
+                DummyConcreteClass::class.java,
+                DummyGenericClass::class.java,
+                DummyInheritedClass::class.java
+        ).forEach {
+            assertEquals(Utils.getTypeMirrorFromClass(it), ElementUtils.getTypeFromQualifiedName(it.name))
         }
+    }
 
-        fun <T, R> testTypeMirrorCreationAndInequality(clazz: Class<T>, otherClass: Class<R>) {
-            assertNotEquals(Utils.getTypeMirrorFromClass(clazz), ElementUtils.getTypeFromQualifiedName(otherClass.name))
+    @Test
+    fun `getTypeFromQualifiedName inequality test`() {
+        listOf(
+                DummyConcreteClass::class.java to DummyInheritedClass::class.java,
+                DummyGenericClass::class.java to DummyConcreteClass::class.java,
+                DummyInheritedClass::class.java to DummyGenericClass::class.java
+        ).forEach { (one, theOther) ->
+            assertNotEquals(Utils.getTypeMirrorFromClass(one), ElementUtils.getTypeFromQualifiedName(theOther.name))
         }
-
-        assertNull(ElementUtils.getTypeElementFromQualifiedName(""))
-
-        testTypeMirrorCreationAndEquality(String::class.java)
-        testTypeMirrorCreationAndEquality(Any::class.java)
-        testTypeMirrorCreationAndEquality(ArrayList::class.java)
-        testTypeMirrorCreationAndEquality(DummyConcreteClass::class.java)
-        testTypeMirrorCreationAndEquality(DummyGenericClass::class.java)
-        testTypeMirrorCreationAndEquality(DummyInheritedClass::class.java)
-
-        testTypeMirrorCreationAndInequality(DummyConcreteClass::class.java, DummyInheritedClass::class.java)
-        testTypeMirrorCreationAndInequality(DummyGenericClass::class.java, DummyConcreteClass::class.java)
-        testTypeMirrorCreationAndInequality(DummyInheritedClass::class.java, DummyGenericClass::class.java)
     }
 
     @Test
@@ -80,7 +81,7 @@ class ElementUtilsUnitTest : BaseUnitTest() {
     }
 
     @Test
-    fun testGetPackage() {
+    fun `test getPackage`() {
         testPackageEquality(String::class.java)
         testPackageEquality(ArrayList::class.java)
         testPackageEquality(Any::class.java)
@@ -105,7 +106,7 @@ class ElementUtilsUnitTest : BaseUnitTest() {
     }
 
     @Test
-    fun testGetConstructor() {
+    fun `test getConstructor`() {
         var executableElement = ElementUtils.getFirstConstructor(Utils.getTypeMirrorFromClass(String::class.java))!!
         assertEquals(executableElement.enclosingElement.toString(), Utils.getElementFromClass(String::class.java).toString())
         assertEquals(executableElement.parameters.size.toLong(), 0)

From eaab85dfef8dad850d23a16c479d8e2e265e1c66 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 16:13:42 -0400
Subject: [PATCH 65/84] Refactoring DebugLog to better support testing

---
 stag-library-compiler/build.gradle            |  3 ++
 .../vimeo/stag/processor/StagProcessor.java   | 15 ++++++--
 .../generators/model/AnnotatedClass.java      |  2 +-
 .../model/accessor/MethodFieldAccessor.java   |  2 +-
 .../stag/processor/utils/FileGenUtils.java    |  1 +
 .../utils/KnownTypeAdapterUtils.java          |  1 +
 .../vimeo/stag/processor/utils/TypeUtils.java |  1 +
 .../utils/logging/ConsoleLogger.java          | 16 +++++++++
 .../utils/{ => logging}/DebugLog.java         | 35 ++++++++++++-------
 .../stag/processor/utils/logging/Logger.java  | 17 +++++++++
 .../processor/utils/logging/NoOpLogger.java   | 14 ++++++++
 .../stag/processor/utils/DebugLogTest.kt      | 34 ++++++++++++++++--
 .../utils/logging/ConsoleLoggerTest.kt        | 23 ++++++++++++
 .../processor/utils/logging/NoOpLoggerTest.kt | 24 +++++++++++++
 14 files changed, 168 insertions(+), 20 deletions(-)
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/ConsoleLogger.java
 rename stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/{ => logging}/DebugLog.java (73%)
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/Logger.java
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/NoOpLogger.java
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/ConsoleLoggerTest.kt
 create mode 100644 stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/NoOpLoggerTest.kt

diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index c9a64fc1..efe524bf 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -43,6 +43,9 @@ dependencies {
     implementation 'com.google.guava:guava:23.5-jre'
 
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+
+    testImplementation 'org.mockito:mockito-core:2.18.0'
+    testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0", { exclude group: 'org.jetbrains.kotlin' }
 }
 
 test {
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 fac7687a..fef5cff3 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
@@ -37,12 +37,15 @@
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.generators.model.accessor.MethodFieldAccessor.Notation;
-import com.vimeo.stag.processor.utils.DebugLog;
 import com.vimeo.stag.processor.utils.ElementUtils;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.KnownTypeAdapterFactoriesUtils;
 import com.vimeo.stag.processor.utils.MessagerUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
+import com.vimeo.stag.processor.utils.logging.ConsoleLogger;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
+import com.vimeo.stag.processor.utils.logging.Logger;
+import com.vimeo.stag.processor.utils.logging.NoOpLogger;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -77,7 +80,6 @@ public final class StagProcessor extends AbstractProcessor {
     static final String OPTION_PACKAGE_NAME = "stagGeneratedPackageName";
     static final String OPTION_HUNGARIAN_NOTATION = "stagAssumeHungarianNotation";
     private static final String DEFAULT_GENERATED_PACKAGE_NAME = "com.vimeo.stag.generated";
-    public static volatile boolean DEBUG;
     private boolean mHasBeenProcessed;
 
     private static boolean getDebugBoolean(@NotNull ProcessingEnvironment processingEnvironment) {
@@ -145,7 +147,14 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
         mHasBeenProcessed = true;
 
-        DEBUG = getDebugBoolean(processingEnv);
+        final Logger logger;
+        if (getDebugBoolean(processingEnv)) {
+            logger = new ConsoleLogger();
+        } else {
+            logger = new NoOpLogger();
+        }
+
+        DebugLog.initialize(logger);
 
         String packageName = getOptionalPackageName(processingEnv);
 
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 59b3e733..9fddc65f 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
@@ -30,7 +30,7 @@
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
 import com.vimeo.stag.processor.generators.model.accessor.MethodFieldAccessor;
 import com.vimeo.stag.processor.generators.model.accessor.MethodFieldAccessor.Notation;
-import com.vimeo.stag.processor.utils.DebugLog;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 import com.vimeo.stag.processor.utils.MessagerUtils;
 import com.vimeo.stag.processor.utils.Preconditions;
 import com.vimeo.stag.processor.utils.TypeUtils;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
index 1ce69439..446e2dab 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/model/accessor/MethodFieldAccessor.java
@@ -1,6 +1,6 @@
 package com.vimeo.stag.processor.generators.model.accessor;
 
-import com.vimeo.stag.processor.utils.DebugLog;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 import com.vimeo.stag.processor.utils.ElementUtils;
 import com.vimeo.stag.processor.utils.StringUtils;
 import com.vimeo.stag.processor.utils.TypeUtils;
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 f8506306..1afb61fd 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
@@ -25,6 +25,7 @@
 
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.JavaFile;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
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 9b48e9d8..68245c96 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
@@ -7,6 +7,7 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.internal.bind.TypeAdapters;
 import com.vimeo.stag.KnownTypeAdapters;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
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 1d23aac8..14fc6a15 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
@@ -28,6 +28,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/ConsoleLogger.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/ConsoleLogger.java
new file mode 100644
index 00000000..605b09f3
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/ConsoleLogger.java
@@ -0,0 +1,16 @@
+package com.vimeo.stag.processor.utils.logging;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An implementation of {@link Logger} that prints to the console.
+ */
+@SuppressWarnings("UseOfSystemOutOrSystemErr")
+public class ConsoleLogger implements Logger {
+
+    @Override
+    public void log(@NotNull String message) {
+        System.out.println(message);
+    }
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/DebugLog.java
similarity index 73%
rename from stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java
rename to stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/DebugLog.java
index cb7a2375..4c96392f 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/DebugLog.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/DebugLog.java
@@ -21,34 +21,48 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.vimeo.stag.processor.utils;
-
-import com.vimeo.stag.processor.StagProcessor;
+package com.vimeo.stag.processor.utils.logging;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * A logging utility that only logs to the console if {@link StagProcessor#DEBUG} is true.
+ * A logging utility.
  */
 public final class DebugLog {
 
     private static final String TAG = "Stag";
+    @Nullable
+    private static Logger sLogger;
 
     private DebugLog() {
         throw new UnsupportedOperationException("This class is not instantiable");
     }
 
+    /**
+     * Initialize the log utils with the logging instance.
+     *
+     * @param logger the logging instance, if null is provided, logging will result in a crash.
+     */
+    public static void initialize(@Nullable Logger logger) {
+        sLogger = logger;
+    }
+
+    @NotNull
+    private static Logger safeLogger() {
+        if (sLogger == null) {
+            throw new IllegalStateException("initialize must be called first");
+        }
+        return sLogger;
+    }
+
     /**
      * Log the provided message with the default log tag "Stag"
      *
      * @param message the message to log.
      */
     public static void log(@Nullable CharSequence message) {
-        if (StagProcessor.DEBUG) {
-            //noinspection UseOfSystemOutOrSystemErr
-            System.out.println(TAG + ": " + message);
-        }
+        safeLogger().log(TAG + ": " + message);
     }
 
     /**
@@ -58,10 +72,7 @@ public static void log(@Nullable CharSequence message) {
      * @param message the message to log.
      */
     public static void log(@NotNull CharSequence tag, @Nullable CharSequence message) {
-        if (StagProcessor.DEBUG) {
-            //noinspection UseOfSystemOutOrSystemErr
-            System.out.println(TAG + ":" + tag + ": " + message);
-        }
+        safeLogger().log(TAG + ":" + tag + ": " + message);
     }
 
 }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/Logger.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/Logger.java
new file mode 100644
index 00000000..7097b08e
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/Logger.java
@@ -0,0 +1,17 @@
+package com.vimeo.stag.processor.utils.logging;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An interface defining a logging utility.
+ */
+public interface Logger {
+
+    /**
+     * Log the message to the output.
+     *
+     * @param message the message to log to the output.
+     */
+    void log(@NotNull String message);
+
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/NoOpLogger.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/NoOpLogger.java
new file mode 100644
index 00000000..ca2129a1
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/utils/logging/NoOpLogger.java
@@ -0,0 +1,14 @@
+package com.vimeo.stag.processor.utils.logging;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An implementation of {@link Logger} that does nothing.
+ */
+public class NoOpLogger implements Logger {
+
+    @Override
+    public void log(@NotNull String message) {
+    }
+
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
index 1d4d1329..7af8fcf0 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
@@ -1,7 +1,12 @@
 package com.vimeo.stag.processor.utils
 
-import com.vimeo.stag.processor.StagProcessor
+import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockito_kotlin.verify
+import com.nhaarman.mockito_kotlin.verifyNoMoreInteractions
 import com.vimeo.stag.processor.Utils
+import com.vimeo.stag.processor.utils.logging.DebugLog
+import com.vimeo.stag.processor.utils.logging.Logger
+import org.junit.Before
 import org.junit.Test
 
 /**
@@ -11,20 +16,43 @@ import org.junit.Test
  */
 class DebugLogTest {
 
+    private val logger = mock<Logger>()
+
+    @Before
+    fun setUp() {
+        DebugLog.initialize(null)
+    }
+
     @Test
     fun `DebugLog is not instantiable`() {
         Utils.testZeroArgumentConstructorFinalClass(DebugLog::class.java)
     }
 
+    @Test(expected = IllegalStateException::class)
+    fun `log without initialization crashes`() {
+        DebugLog.log("test")
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun `log with tag without initialization crashes`() {
+        DebugLog.log("test", "test")
+    }
+
     @Test
     fun `log message works`() {
-        StagProcessor.DEBUG = true
+        DebugLog.initialize(logger)
         DebugLog.log("test message")
+
+        verify(logger).log("Stag: test message")
+        verifyNoMoreInteractions(logger)
     }
 
     @Test
     fun `log with tag and message works`() {
-        StagProcessor.DEBUG = true
+        DebugLog.initialize(logger)
         DebugLog.log("test tag", "test message")
+
+        verify(logger).log("Stag:test tag: test message")
+        verifyNoMoreInteractions(logger)
     }
 }
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/ConsoleLoggerTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/ConsoleLoggerTest.kt
new file mode 100644
index 00000000..81dffee4
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/ConsoleLoggerTest.kt
@@ -0,0 +1,23 @@
+package com.vimeo.stag.processor.utils.logging
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
+
+/**
+ * Unit tests for [ConsoleLogger].
+ */
+class ConsoleLoggerTest {
+
+    @Test
+    fun `log prints to System out`() {
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        System.setOut(PrintStream(byteArrayOutputStream))
+
+        val consoleLogger = ConsoleLogger()
+        consoleLogger.log("test")
+
+        assertThat(byteArrayOutputStream.toString()).isEqualTo("test\n")
+    }
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/NoOpLoggerTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/NoOpLoggerTest.kt
new file mode 100644
index 00000000..aa7e7757
--- /dev/null
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/logging/NoOpLoggerTest.kt
@@ -0,0 +1,24 @@
+package com.vimeo.stag.processor.utils.logging
+
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
+
+/**
+ * Unit tests for [NoOpLogger].
+ */
+class NoOpLoggerTest {
+
+    @Test
+    fun `log does not print to System out`() {
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        System.setOut(PrintStream(byteArrayOutputStream))
+
+        val noOpLogger = NoOpLogger()
+        noOpLogger.log("test")
+
+        Assertions.assertThat(byteArrayOutputStream.toString()).isEqualTo("")
+    }
+
+}

From 4608185f49700810ad733e59b6075224ec9352b9 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 16:17:59 -0400
Subject: [PATCH 66/84] Cleaning up FileGenUtils tests

---
 .../stag/processor/utils/DebugLogTest.kt      |  4 ++--
 .../stag/processor/utils/FileGenUtilsTest.kt  | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
index 7af8fcf0..e446dba2 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/DebugLogTest.kt
@@ -16,8 +16,6 @@ import org.junit.Test
  */
 class DebugLogTest {
 
-    private val logger = mock<Logger>()
-
     @Before
     fun setUp() {
         DebugLog.initialize(null)
@@ -40,6 +38,7 @@ class DebugLogTest {
 
     @Test
     fun `log message works`() {
+        val logger = mock<Logger>()
         DebugLog.initialize(logger)
         DebugLog.log("test message")
 
@@ -49,6 +48,7 @@ class DebugLogTest {
 
     @Test
     fun `log with tag and message works`() {
+        val logger = mock<Logger>()
         DebugLog.initialize(logger)
         DebugLog.log("test tag", "test message")
 
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
index 840df0c2..9dc964db 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/utils/FileGenUtilsTest.kt
@@ -1,7 +1,9 @@
 package com.vimeo.stag.processor.utils
 
+import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockito_kotlin.verify
+import com.nhaarman.mockito_kotlin.verifyNoMoreInteractions
 import com.vimeo.stag.processor.Utils
-import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.Closeable
 import java.io.IOException
@@ -19,15 +21,21 @@ class FileGenUtilsTest {
     }
 
     @Test
-    fun close() {
-        var counter = 0
-        val closeable = Closeable { counter++ }
+    fun `close calls close on closeable once`() {
+        val closeable = mock<Closeable>()
         FileGenUtils.close(closeable)
-        assertEquals(1, counter)
 
+        verify(closeable).close()
+        verifyNoMoreInteractions(closeable)
+    }
+
+    @Test
+    fun `close accepts null closeable`() {
         FileGenUtils.close(null)
-        assertEquals(1, counter)
+    }
 
+    @Test
+    fun `close safely catches IO exceptions`() {
         val failureCloseable = Closeable { throw IOException("test") }
         FileGenUtils.close(failureCloseable)
     }

From 38a9f271021e9700d930ba52a1edbc969c92674b Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 16:23:25 -0400
Subject: [PATCH 67/84] Breaking out the keyTypeAdapter into its own variable
 for clarity

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index a777b64b..8d489977 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -304,24 +304,26 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `MapTypeAdapter serializes and deserializes object keys correctly`() {
+        val keyTypeAdapter = object : TypeAdapter<KeyTest>() {
+            override fun write(out: JsonWriter, value: KeyTest?) {
+                out.beginObject()
+                out.name("string")
+                out.value(value?.string)
+                out.endObject()
+            }
+
+            override fun read(input: JsonReader): KeyTest {
+                input.beginObject()
+                input.nextName()
+                val string = input.nextString()
+                input.endObject()
+                return KeyTest(string ?: throw Exception("Null string"))
+            }
+
+        }
+
         val mapTypeAdapter = KnownTypeAdapters.MapTypeAdapter<KeyTest, String, Map<KeyTest, String>>(
-                object : TypeAdapter<KeyTest>() {
-                    override fun write(out: JsonWriter, value: KeyTest?) {
-                        out.beginObject()
-                        out.name("string")
-                        out.value(value?.string)
-                        out.endObject()
-                    }
-
-                    override fun read(input: JsonReader): KeyTest {
-                        input.beginObject()
-                        input.nextName()
-                        val string = input.nextString()
-                        input.endObject()
-                        return KeyTest(string ?: throw Exception("Null string"))
-                    }
-
-                },
+                keyTypeAdapter,
                 KnownTypeAdapters.STRING_NULL_SAFE_TYPE_ADAPTER,
                 ObjectConstructor<Map<KeyTest, String>> { HashMap() }
         )
@@ -337,34 +339,34 @@ class KnownTypeAdaptersTestKt {
 
     @Test
     fun `MapTypeAdapter serializes and deserializes array keys correctly`() {
-        val mapTypeAdapter = KnownTypeAdapters.MapTypeAdapter<List<KeyTest>, String, Map<List<KeyTest>, String>>(
-                object : TypeAdapter<List<KeyTest>>() {
-                    override fun write(out: JsonWriter, value: List<KeyTest>?) {
-                        out.beginArray()
-                        value?.forEach {
-                            out.beginObject()
-                            out.name("string")
-                            out.value(it.string)
-                            out.endObject()
-                        }
-                        out.endArray()
-                    }
-
-                    override fun read(input: JsonReader): List<KeyTest> {
-                        val mutableList = mutableListOf<KeyTest>()
-                        input.beginArray()
-                        while (input.peek() == JsonToken.BEGIN_OBJECT) {
-                            input.beginObject()
-                            input.nextName()
-                            val string = input.nextString()
-                            input.endObject()
-                            mutableList.add(KeyTest(string ?: throw Exception("Null string")))
-                        }
-                        input.endArray()
-                        return mutableList
-                    }
-
-                },
+        val keyTypeAdapter = object : TypeAdapter<List<KeyTest>>() {
+            override fun write(out: JsonWriter, value: List<KeyTest>?) {
+                out.beginArray()
+                value?.forEach {
+                    out.beginObject()
+                    out.name("string")
+                    out.value(it.string)
+                    out.endObject()
+                }
+                out.endArray()
+            }
+            override fun read(input: JsonReader): List<KeyTest> {
+                val mutableList = mutableListOf<KeyTest>()
+                input.beginArray()
+                while (input.peek() == JsonToken.BEGIN_OBJECT) {
+                    input.beginObject()
+                    input.nextName()
+                    val string = input.nextString()
+                    input.endObject()
+                    mutableList.add(KeyTest(string ?: throw Exception("Null string")))
+                }
+                input.endArray()
+                return mutableList
+            }
+        }
+
+            val mapTypeAdapter = KnownTypeAdapters.MapTypeAdapter<List<KeyTest>, String, Map<List<KeyTest>, String>>(
+                keyTypeAdapter,
                 KnownTypeAdapters.STRING_NULL_SAFE_TYPE_ADAPTER,
                 ObjectConstructor<Map<List<KeyTest>, String>> { HashMap() }
         )

From 6949ea3536fcdd1e9535e9c9a591bd547b585fa7 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 25 Jun 2018 16:26:22 -0400
Subject: [PATCH 68/84] Initializing debuglog

---
 .../com/vimeo/stag/processor/TypeUtilsUnitTest.kt    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
index 8b668c25..ad1d0848 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/TypeUtilsUnitTest.kt
@@ -27,13 +27,12 @@ import com.vimeo.stag.processor.dummy.*
 import com.vimeo.stag.processor.generators.model.accessor.DirectFieldAccessor
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor
 import com.vimeo.stag.processor.utils.TypeUtils
+import com.vimeo.stag.processor.utils.logging.DebugLog
+import com.vimeo.stag.processor.utils.logging.NoOpLogger
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.HashSet
-import java.util.LinkedHashMap
+import java.util.*
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
 import javax.lang.model.element.VariableElement
@@ -47,7 +46,10 @@ import javax.lang.model.type.TypeMirror
 class TypeUtilsUnitTest : BaseUnitTest() {
 
     @Before
-    fun setup() = TypeUtils.initialize(types)
+    fun setup() {
+        TypeUtils.initialize(types)
+        DebugLog.initialize(NoOpLogger())
+    }
 
     @Test
     @Throws(Exception::class)

From 4beef6e398a78a84abab0c01dd9b0c0f7139c47a Mon Sep 17 00:00:00 2001
From: anirudhramanan <anirudh.r@flipkart.com>
Date: Mon, 3 Sep 2018 15:21:03 +0530
Subject: [PATCH 69/84] option to pass in serializeNulls flag via compiler
 arguments

---
 .../com/vimeo/stag/processor/StagProcessor.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 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 fef5cff3..4db7a6d4 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,6 +79,7 @@ public final class StagProcessor extends AbstractProcessor {
     static final String OPTION_DEBUG = "stagDebug";
     static final String OPTION_PACKAGE_NAME = "stagGeneratedPackageName";
     static final String OPTION_HUNGARIAN_NOTATION = "stagAssumeHungarianNotation";
+    static final String OPTION_SERIALIZE_NULLS = "serializeNulls";
     private static final String DEFAULT_GENERATED_PACKAGE_NAME = "com.vimeo.stag.generated";
     private boolean mHasBeenProcessed;
 
@@ -98,6 +99,14 @@ private static boolean getAssumeHungarianNotation(@NotNull ProcessingEnvironment
         return false;
     }
 
+    private static boolean isSerializeNullsEnabled(@NotNull ProcessingEnvironment processingEnvironment) {
+        String debugString = processingEnvironment.getOptions().get(OPTION_SERIALIZE_NULLS);
+        if (debugString != null) {
+            return Boolean.valueOf(debugString);
+        }
+        return false;
+    }
+
     @NotNull
     private static String getOptionalPackageName(@NotNull ProcessingEnvironment processingEnvironment) {
         String packageName = processingEnvironment.getOptions().get(OPTION_PACKAGE_NAME);
@@ -159,6 +168,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         String packageName = getOptionalPackageName(processingEnv);
 
         boolean assumeHungarianNotation = getAssumeHungarianNotation(processingEnv);
+        boolean enableSerializeNulls = isSerializeNullsEnabled(processingEnv);
 
         TypeUtils.initialize(processingEnv.getTypeUtils());
         ElementUtils.initialize(processingEnv.getElementUtils());
@@ -190,7 +200,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             for (AnnotatedClass annotatedClass : supportedTypesModel.getSupportedTypes()) {
                 TypeElement element = annotatedClass.getElement();
                 if ((TypeUtils.isConcreteType(element) || TypeUtils.isParameterizedType(element)) && !TypeUtils.isAbstract(element)) {
-                    generateTypeAdapter(supportedTypesModel, element, stagFactoryGenerator);
+                    generateTypeAdapter(supportedTypesModel, element, stagFactoryGenerator, enableSerializeNulls);
 
                     ClassInfo classInfo = new ClassInfo(element.asType());
                     ArrayList<ClassInfo> result = new ArrayList<>();
@@ -242,13 +252,13 @@ private void generateStagFactory(@NotNull String packageName, List<SubFactoriesI
 
     private void generateTypeAdapter(@NotNull SupportedTypesModel supportedTypesModel,
                                      @NotNull TypeElement element,
-                                     @NotNull StagGenerator stagGenerator) throws IOException {
+                                     @NotNull StagGenerator stagGenerator, boolean enableSerializeNulls) throws IOException {
 
         ClassInfo classInfo = new ClassInfo(element.asType());
 
         AdapterGenerator independentAdapter = element.getKind() == ElementKind.ENUM ?
                 new EnumTypeAdapterGenerator(classInfo, element) :
-                new TypeAdapterGenerator(supportedTypesModel, classInfo);
+                new TypeAdapterGenerator(supportedTypesModel, classInfo, enableSerializeNulls);
 
         // Create the type spec
         TypeSpec typeAdapterSpec = independentAdapter.createTypeAdapterSpec(stagGenerator);

From 697ba9aa52dffb24bfcc222fb6d3bf2c225713ec Mon Sep 17 00:00:00 2001
From: anirudhramanan <anirudh.r@flipkart.com>
Date: Mon, 3 Sep 2018 15:21:40 +0530
Subject: [PATCH 70/84] moved read/write spec generator to separate class, and
 added support for serializeNull while generating type adapters

---
 .../generators/TypeAdapterGenerator.java      | 249 ++++--------------
 .../typeadapter/ReadSpecGenerator.java        | 110 ++++++++
 .../typeadapter/WriteSpecGenerator.java       | 115 ++++++++
 3 files changed, 275 insertions(+), 199 deletions(-)
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/ReadSpecGenerator.java
 create mode 100644 stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java

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 b4d83ad3..69bc820c 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
@@ -27,8 +27,6 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.bind.TreeTypeAdapter;
 import com.google.gson.reflect.TypeToken;
-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;
@@ -42,6 +40,8 @@
 import com.vimeo.stag.processor.generators.model.ClassInfo;
 import com.vimeo.stag.processor.generators.model.SupportedTypesModel;
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
+import com.vimeo.stag.processor.generators.typeadapter.ReadSpecGenerator;
+import com.vimeo.stag.processor.generators.typeadapter.WriteSpecGenerator;
 import com.vimeo.stag.processor.utils.ElementUtils;
 import com.vimeo.stag.processor.utils.FileGenUtils;
 import com.vimeo.stag.processor.utils.KnownTypeAdapterUtils;
@@ -50,7 +50,6 @@
 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;
@@ -74,10 +73,12 @@ public class TypeAdapterGenerator extends AdapterGenerator {
     private final ClassInfo mInfo;
     @NotNull
     private final SupportedTypesModel mSupportedTypesModel;
+    private boolean mEnableSerializeNulls;
 
-    public TypeAdapterGenerator(@NotNull SupportedTypesModel supportedTypesModel, @NotNull ClassInfo info) {
+    public TypeAdapterGenerator(@NotNull SupportedTypesModel supportedTypesModel, @NotNull ClassInfo info, boolean enableSerializeNulls) {
         mSupportedTypesModel = supportedTypesModel;
         mInfo = info;
+        mEnableSerializeNulls = enableSerializeNulls;
     }
 
     @NotNull
@@ -116,14 +117,14 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
                 return adapterFieldInfo.updateAndGetTypeTokenFieldName(fieldType, "com.google.gson.reflect.TypeToken.get(" + fieldType.toString() + ".class)");
             }
         } 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.
-                 */
+            /*
+             * 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();
             StringBuilder result = new StringBuilder("(com.google.gson.reflect.TypeToken<" + fieldType.toString() + ">)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
@@ -182,96 +183,6 @@ private static TypeName getTypeTokenFieldTypeName(@NotNull TypeMirror type) {
         return ParameterizedTypeName.get(ClassName.get(TypeToken.class), typeName);
     }
 
-    @NotNull
-    private static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
-                                                @NotNull Map<FieldAccessor, TypeMirror> elements,
-                                                @NotNull AdapterFieldInfo adapterFieldInfo) {
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
-                .addParameter(JsonReader.class, "reader")
-                .returns(typeName)
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(Override.class)
-                .addException(IOException.class);
-
-        builder.addStatement("com.google.gson.stream.JsonToken peek = reader.peek()");
-
-        builder.beginControlFlow("if (com.google.gson.stream.JsonToken.NULL == peek)");
-        builder.addStatement("reader.nextNull()");
-        builder.addStatement("return null");
-        builder.endControlFlow();
-
-
-        builder.beginControlFlow("if (com.google.gson.stream.JsonToken.BEGIN_OBJECT != peek)");
-        builder.addStatement("reader.skipValue()");
-        builder.addStatement("return null");
-        builder.endControlFlow();
-
-        builder.addStatement("reader.beginObject()");
-        builder.addStatement(typeName + " object = new " + typeName + "()");
-
-        builder.beginControlFlow("while (reader.hasNext())");
-        builder.addStatement("String name = reader.nextName()");
-        builder.beginControlFlow("switch (name)");
-
-
-        final List<FieldAccessor> nonNullFields = new ArrayList<>();
-
-        for (Map.Entry<FieldAccessor, TypeMirror> element : elements.entrySet()) {
-            final FieldAccessor fieldAccessor = element.getKey();
-            String name = fieldAccessor.getJsonName();
-
-            final TypeMirror elementValue = element.getValue();
-
-            builder.addCode("case \"" + name + "\":\n");
-
-            String[] alternateJsonNames = fieldAccessor.getAlternateJsonNames();
-            if (alternateJsonNames != null && alternateJsonNames.length > 0) {
-                for (String alternateJsonName : alternateJsonNames) {
-                    builder.addCode("case \"" + alternateJsonName + "\":\n");
-                }
-            }
-
-            String variableType = element.getValue().toString();
-            boolean isPrimitive = TypeUtils.isSupportedPrimitive(variableType);
-
-            if (isPrimitive) {
-                builder.addStatement("\tobject." +
-                                     fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
-                                                                    ".read(reader, object." + fieldAccessor.createGetterCode() + ")"));
-
-            } else {
-                builder.addStatement("\tobject." + fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
-                                                                                  ".read(reader)"));
-            }
-
-
-            builder.addStatement("\tbreak");
-            if (fieldAccessor.doesRequireNotNull()) {
-                if (!TypeUtils.isSupportedPrimitive(elementValue.toString())) {
-                    nonNullFields.add(fieldAccessor);
-                }
-            }
-        }
-
-        builder.addCode("default:\n");
-        builder.addStatement("reader.skipValue()");
-        builder.addStatement("break");
-        builder.endControlFlow();
-        builder.endControlFlow();
-
-        builder.addStatement("reader.endObject()");
-
-        for (FieldAccessor nonNullField : nonNullFields) {
-            builder.beginControlFlow("if (object." + nonNullField.createGetterCode() + " == null)");
-            builder.addStatement("throw new java.io.IOException(\"" + nonNullField.createGetterCode() + " cannot be null\")");
-            builder.endControlFlow();
-        }
-
-        builder.addStatement("return object");
-
-        return builder.build();
-    }
-
     @NotNull
     private static String getInitializationCodeForKnownJsonAdapterType(@NotNull ExecutableElement adapterType,
                                                                        @NotNull StagGenerator stagGenerator,
@@ -309,14 +220,14 @@ private static String getInitializationCodeForKnownJsonAdapterType(@NotNull Exec
             String typeTokenAccessorCode = getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo);
             fieldAdapterAccessor += "().create(gson, " + typeTokenAccessorCode + ")";
         } else if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER
-                   || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_DESERIALIZER
-                   || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
+                || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_DESERIALIZER
+                || jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
             String serializer = null, deserializer = null;
 
             if (jsonAdapterType == TypeUtils.JsonAdapterType.JSON_SERIALIZER_DESERIALIZER) {
                 String varName = keyFieldName + "SerializerDeserializer";
                 String initializer = adapterType.getEnclosingElement().toString() + " " + varName + " = " +
-                                     "new " + adapterType;
+                        "new " + adapterType;
                 constructorBuilder.addStatement(initializer);
                 serializer = varName;
                 deserializer = varName;
@@ -330,7 +241,7 @@ private static String getInitializationCodeForKnownJsonAdapterType(@NotNull Exec
         } else {
             throw new IllegalArgumentException(
                     "@JsonAdapter value must be TypeAdapter, TypeAdapterFactory, "
-                    + "JsonSerializer or JsonDeserializer reference.");
+                            + "JsonSerializer or JsonDeserializer reference.");
         }
         String adapterCode = getCleanedFieldInitializer(fieldAdapterAccessor);
         if (isNullSafe) {
@@ -355,73 +266,12 @@ private static String getAdapterForUnknownGenericType(@NotNull TypeMirror fieldT
         if (fieldName == null) {
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             String fieldInitializationCode = "gson.getAdapter(" +
-                                             getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo) + ")";
+                    getTypeTokenCode(fieldType, stagGenerator, typeVarsMap, adapterFieldInfo) + ")";
             adapterFieldInfo.addField(fieldType, fieldName, fieldInitializationCode);
         }
         return fieldName;
     }
 
-    @NotNull
-    private static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName,
-                                                 @NotNull Map<FieldAccessor, 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.beginControlFlow("if (object == null)");
-        builder.addStatement("writer.nullValue()");
-        builder.addStatement("return");
-        builder.endControlFlow();
-        builder.addStatement("writer.beginObject()");
-
-        for (Map.Entry<FieldAccessor, TypeMirror> element : memberVariables.entrySet()) {
-            FieldAccessor fieldAccessor = element.getKey();
-            final String getterCode = fieldAccessor.createGetterCode();
-
-            String name = fieldAccessor.getJsonName();
-            String variableType = element.getValue().toString();
-
-            boolean isPrimitive = TypeUtils.isSupportedPrimitive(variableType);
-
-            builder.addCode("\n");
-            builder.addStatement("writer.name(\"" + name + "\")");
-
-            if (!isPrimitive) {
-                builder.beginControlFlow("if (object." + getterCode + " != null) ");
-            }
-
-            if (!isPrimitive) {
-                builder.addStatement(
-                        adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
-                        getterCode + ")");
-                /*
-                * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
-                */
-                builder.endControlFlow();
-                builder.beginControlFlow("else");
-                if (fieldAccessor.doesRequireNotNull()) {
-                    //throw exception in case the field is annotated as NonNull
-                    builder.addStatement("throw new java.io.IOException(\"" + getterCode + " cannot be null\")");
-                } else {
-                    //write null value to the writer if the field is null
-                    builder.addStatement("writer.nullValue()");
-                }
-                builder.endControlFlow();
-            } else {
-                builder.addStatement("writer.value(object." + getterCode + ")");
-            }
-        }
-
-        builder.addCode("\n");
-        builder.addStatement("writer.endObject()");
-        return builder.build();
-    }
-
     /**
      * Returns the adapter code for the known types.
      */
@@ -442,20 +292,20 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
         }
 
         if (TypeUtils.isNativeArray(fieldType)) {
-                /*
-                 * If the fieldType is of type native arrays such as String[] or int[]
-                 */
+            /*
+             * If the fieldType is of type native arrays such as String[] or int[]
+             */
             TypeMirror arrayInnerType = TypeUtils.getArrayInnerType(fieldType);
             if (TypeUtils.isSupportedPrimitive(arrayInnerType.toString())) {
                 return KnownTypeAdapterUtils.getNativePrimitiveArrayTypeAdapter(fieldType);
             } else {
                 String adapterAccessor = getAdapterAccessor(arrayInnerType, stagGenerator, typeVarsMap,
-                                                            adapterFieldInfo);
+                        adapterFieldInfo);
                 String nativeArrayInstantiator =
                         KnownTypeAdapterUtils.getNativeArrayInstantiator(arrayInnerType);
                 return "new " + TypeUtils.className(ArrayTypeAdapter.class) + "<" +
-                       arrayInnerType.toString() + ">" +
-                       "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
+                        arrayInnerType.toString() + ">" +
+                        "(" + adapterAccessor + ", " + nativeArrayInstantiator + ")";
             }
         } else if (TypeUtils.isSupportedList(fieldType)) {
             DeclaredType declaredType = (DeclaredType) fieldType;
@@ -465,8 +315,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
             String listInstantiator = KnownTypeAdapterUtils.getListInstantiator(fieldType);
             String adapterCode =
                     "new " + TypeUtils.className(KnownTypeAdapters.ListTypeAdapter.class) + "<" + param.toString() + "," +
-                    fieldType.toString() + ">" +
-                    "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
+                            fieldType.toString() + ">" +
+                            "(" + paramAdapterAccessor + ", " + listInstantiator + ")";
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             adapterFieldInfo.addField(fieldType, fieldName, adapterCode);
             return fieldName;
@@ -484,7 +334,7 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
                 keyAdapterAccessor = getAdapterAccessor(keyType, stagGenerator, typeVarsMap, adapterFieldInfo);
                 valueAdapterAccessor = getAdapterAccessor(valueType, stagGenerator, typeVarsMap, adapterFieldInfo);
                 arguments = "<" + keyType.toString() + ", " + valueType.toString() + ", " +
-                            fieldType.toString() + ">";
+                        fieldType.toString() + ">";
             } else {
                 // 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)";
@@ -492,8 +342,8 @@ private static String getAdapterAccessor(@NotNull TypeMirror fieldType,
             }
 
             String adapterCode = "new " + TypeUtils.className(KnownTypeAdapters.MapTypeAdapter.class) + arguments +
-                                 "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " +
-                                 mapInstantiator + ")";
+                    "(" + keyAdapterAccessor + ", " + valueAdapterAccessor + ", " +
+                    mapInstantiator + ")";
             fieldName = TYPE_ADAPTER_FIELD_PREFIX + adapterFieldInfo.size();
             adapterFieldInfo.addField(fieldType, fieldName, adapterCode);
             return fieldName;
@@ -520,8 +370,8 @@ private static AdapterFieldInfo addAdapterFields(@NotNull StagGenerator stagGene
                 if (constructor != null) {
                     TypeUtils.JsonAdapterType jsonAdapterType1 = TypeUtils.getJsonAdapterType(optionalJsonAdapter);
                     String initiazationCode = getInitializationCodeForKnownJsonAdapterType(constructor, stagGenerator,
-                                                                                           typeVarsMap, constructorBuilder, fieldType,
-                                                                                           jsonAdapterType1, result, fieldAccessor.isJsonAdapterNullSafe(), fieldAccessor.getJsonName());
+                            typeVarsMap, constructorBuilder, fieldType,
+                            jsonAdapterType1, result, fieldAccessor.isJsonAdapterNullSafe(), fieldAccessor.getJsonName());
 
                     String fieldName = TYPE_ADAPTER_FIELD_PREFIX + result.size();
                     result.addFieldToAccessor(fieldAccessor.getJsonName(), fieldName, fieldType, initiazationCode);
@@ -565,9 +415,9 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
         String className = FileGenUtils.unescapeEscapedString(mInfo.getTypeAdapterClassName());
         TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(className)
                 .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
-                                       .addMember("value", "\"unchecked\"")
-                                       .addMember("value", "\"rawtypes\"")
-                                       .build())
+                        .addMember("value", "\"unchecked\"")
+                        .addMember("value", "\"rawtypes\"")
+                        .build())
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
 
@@ -606,14 +456,12 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
         AdapterFieldInfo adapterFieldInfo =
                 addAdapterFields(stagGenerator, constructorBuilder, memberVariables, typeVarsMap);
 
-
-        MethodSpec writeMethod = getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
-        MethodSpec readMethod = getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
+        MethodSpec writeMethod = WriteSpecGenerator.getWriteMethodSpec(typeVariableName, memberVariables, adapterFieldInfo, mEnableSerializeNulls);
+        MethodSpec readMethod = ReadSpecGenerator.getReadMethodSpec(typeVariableName, memberVariables, adapterFieldInfo);
 
         adapterBuilder.addField(Gson.class, "mGson", Modifier.FINAL, Modifier.PRIVATE);
         constructorBuilder.addStatement("this.mGson = gson");
 
-
         for (Map.Entry<String, FieldInfo> fieldInfo : adapterFieldInfo.mTypeTokenAccessorFields.entrySet()) {
             String originalFieldName = FileGenUtils.unescapeEscapedString(fieldInfo.getValue().accessorVariable);
             TypeName typeName = getTypeTokenFieldTypeName(fieldInfo.getValue().type);
@@ -643,9 +491,12 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
 
     private static class FieldInfo {
 
-        @NotNull final TypeMirror type;
-        @NotNull final String initializationCode;
-        @NotNull final String accessorVariable;
+        @NotNull
+        final TypeMirror type;
+        @NotNull
+        final String initializationCode;
+        @NotNull
+        final String accessorVariable;
 
         FieldInfo(@NotNull TypeMirror type, @NotNull String initializationCode, @NotNull String accessorVariable) {
             this.type = type;
@@ -654,20 +505,20 @@ private static class FieldInfo {
         }
     }
 
-    private static class AdapterFieldInfo {
-
-        //Type.toString -> Accessor Map
-        @NotNull
-        private final Map<String, String> mAdapterAccessor;
+    public static class AdapterFieldInfo {
 
         //FieldName -> Accessor Map
-        @NotNull final Map<String, FieldInfo> mFieldAdapterAccessor;
-
+        @NotNull
+        final Map<String, FieldInfo> mFieldAdapterAccessor;
         //Type.toString -> Accessor Map
-        @NotNull final Map<String, FieldInfo> mAdapterFields;
-
+        @NotNull
+        final Map<String, FieldInfo> mAdapterFields;
         //Type.toString -> Type Token Accessor Map
-        @NotNull final Map<String, FieldInfo> mTypeTokenAccessorFields;
+        @NotNull
+        final Map<String, FieldInfo> mTypeTokenAccessorFields;
+        //Type.toString -> Accessor Map
+        @NotNull
+        private final Map<String, String> mAdapterAccessor;
 
         AdapterFieldInfo(int capacity) {
             mAdapterFields = new LinkedHashMap<>(capacity);
@@ -676,7 +527,7 @@ private static class AdapterFieldInfo {
             mTypeTokenAccessorFields = new LinkedHashMap<>();
         }
 
-        String getAdapterAccessor(@NotNull TypeMirror typeMirror, @NotNull String fieldName) {
+        public String getAdapterAccessor(@NotNull TypeMirror typeMirror, @NotNull String fieldName) {
             FieldInfo adapterAccessor = mFieldAdapterAccessor.get(fieldName);
             return adapterAccessor != null ? adapterAccessor.accessorVariable : mAdapterAccessor.get(typeMirror.toString());
         }
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/ReadSpecGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/ReadSpecGenerator.java
new file mode 100644
index 00000000..a35c74e2
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/ReadSpecGenerator.java
@@ -0,0 +1,110 @@
+package com.vimeo.stag.processor.generators.typeadapter;
+
+import com.google.gson.stream.JsonReader;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
+import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
+import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
+import com.vimeo.stag.processor.utils.TypeUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.type.TypeMirror;
+
+public class ReadSpecGenerator {
+    @NotNull
+    public static MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
+                                               @NotNull Map<FieldAccessor, TypeMirror> elements,
+                                               @NotNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("read")
+                .addParameter(JsonReader.class, "reader")
+                .returns(typeName)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        builder.addStatement("com.google.gson.stream.JsonToken peek = reader.peek()");
+
+        builder.beginControlFlow("if (com.google.gson.stream.JsonToken.NULL == peek)");
+        builder.addStatement("reader.nextNull()");
+        builder.addStatement("return null");
+        builder.endControlFlow();
+
+
+        builder.beginControlFlow("if (com.google.gson.stream.JsonToken.BEGIN_OBJECT != peek)");
+        builder.addStatement("reader.skipValue()");
+        builder.addStatement("return null");
+        builder.endControlFlow();
+
+        builder.addStatement("reader.beginObject()");
+        builder.addStatement(typeName + " object = new " + typeName + "()");
+
+        builder.beginControlFlow("while (reader.hasNext())");
+        builder.addStatement("String name = reader.nextName()");
+        builder.beginControlFlow("switch (name)");
+
+
+        final List<FieldAccessor> nonNullFields = new ArrayList<>();
+
+        for (Map.Entry<FieldAccessor, TypeMirror> element : elements.entrySet()) {
+            final FieldAccessor fieldAccessor = element.getKey();
+            String name = fieldAccessor.getJsonName();
+
+            final TypeMirror elementValue = element.getValue();
+
+            builder.addCode("case \"" + name + "\":\n");
+
+            String[] alternateJsonNames = fieldAccessor.getAlternateJsonNames();
+            if (alternateJsonNames != null && alternateJsonNames.length > 0) {
+                for (String alternateJsonName : alternateJsonNames) {
+                    builder.addCode("case \"" + alternateJsonName + "\":\n");
+                }
+            }
+
+            String variableType = element.getValue().toString();
+            boolean isPrimitive = TypeUtils.isSupportedPrimitive(variableType);
+
+            if (isPrimitive) {
+                builder.addStatement("\tobject." +
+                        fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
+                                ".read(reader, object." + fieldAccessor.createGetterCode() + ")"));
+
+            } else {
+                builder.addStatement("\tobject." + fieldAccessor.createSetterCode(adapterFieldInfo.getAdapterAccessor(elementValue, name) +
+                        ".read(reader)"));
+            }
+
+
+            builder.addStatement("\tbreak");
+            if (fieldAccessor.doesRequireNotNull()) {
+                if (!TypeUtils.isSupportedPrimitive(elementValue.toString())) {
+                    nonNullFields.add(fieldAccessor);
+                }
+            }
+        }
+
+        builder.addCode("default:\n");
+        builder.addStatement("reader.skipValue()");
+        builder.addStatement("break");
+        builder.endControlFlow();
+        builder.endControlFlow();
+
+        builder.addStatement("reader.endObject()");
+
+        for (FieldAccessor nonNullField : nonNullFields) {
+            builder.beginControlFlow("if (object." + nonNullField.createGetterCode() + " == null)");
+            builder.addStatement("throw new java.io.IOException(\"" + nonNullField.createGetterCode() + " cannot be null\")");
+            builder.endControlFlow();
+        }
+
+        builder.addStatement("return object");
+
+        return builder.build();
+    }
+}
diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java
new file mode 100644
index 00000000..d269e7f2
--- /dev/null
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java
@@ -0,0 +1,115 @@
+package com.vimeo.stag.processor.generators.typeadapter;
+
+import android.support.annotation.NonNull;
+
+import com.google.gson.stream.JsonWriter;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
+import com.vimeo.stag.processor.generators.TypeAdapterGenerator;
+import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
+import com.vimeo.stag.processor.utils.TypeUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.type.TypeMirror;
+
+public class WriteSpecGenerator {
+
+    @NotNull
+    public static MethodSpec getWriteMethodSpec(@NonNull TypeName typeName, @NonNull Map<FieldAccessor, TypeMirror> memberVariables,
+                                                @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, boolean serializeNulls) {
+        final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("write")
+                .addParameter(JsonWriter.class, "writer")
+                .addParameter(typeName, "object")
+                .returns(void.class)
+                .addModifiers(Modifier.PUBLIC)
+                .addAnnotation(Override.class)
+                .addException(IOException.class);
+
+        methodBuilder.beginControlFlow("if (object == null)");
+        methodBuilder.addStatement("writer.nullValue()");
+        methodBuilder.addStatement("return");
+        methodBuilder.endControlFlow();
+        methodBuilder.addStatement("writer.beginObject()");
+
+        for (Map.Entry<FieldAccessor, TypeMirror> element : memberVariables.entrySet()) {
+            FieldAccessor fieldAccessor = element.getKey();
+            final String getterCode = fieldAccessor.createGetterCode();
+
+            String name = fieldAccessor.getJsonName();
+            String variableType = element.getValue().toString();
+
+            boolean isPrimitive = TypeUtils.isSupportedPrimitive(variableType);
+            if (serializeNulls) {
+                specForSerializedNullsEnabled(methodBuilder, element, adapterFieldInfo, fieldAccessor, getterCode, name, isPrimitive);
+            } else {
+                specForSerializedNullsDisabled(methodBuilder, element, adapterFieldInfo, fieldAccessor, getterCode, name, isPrimitive);
+            }
+        }
+
+        methodBuilder.addCode("\n");
+        methodBuilder.addStatement("writer.endObject()");
+        return methodBuilder.build();
+    }
+
+    private static void specForSerializedNullsDisabled(@NonNull MethodSpec.Builder methodBuilder, @NonNull Map.Entry<FieldAccessor, TypeMirror> element,
+                                                       @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, @NonNull FieldAccessor fieldAccessor,
+                                                       @NonNull String getterCode, @NonNull String name, boolean isPrimitive) {
+        methodBuilder.addCode("\n");
+        if (!isPrimitive) {
+            methodBuilder.beginControlFlow("if (object." + getterCode + " != null) ");
+        }
+        methodBuilder.addStatement("writer.name(\"" + name + "\")");
+        if (!isPrimitive) {
+            methodBuilder.addStatement(
+                    adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
+                            getterCode + ")");
+            /*
+             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+             */
+            if (fieldAccessor.doesRequireNotNull()) {
+                methodBuilder.endControlFlow();
+                methodBuilder.beginControlFlow("else if (object." + getterCode + " == null)");
+                methodBuilder.addStatement("throw new java.io.IOException(\"" + getterCode +
+                        " cannot be null\")");
+            }
+            methodBuilder.endControlFlow();
+        } else {
+            methodBuilder.addStatement("writer.value(object." + getterCode + ")");
+        }
+    }
+
+    private static void specForSerializedNullsEnabled(@NonNull MethodSpec.Builder methodBuilder, @NonNull Map.Entry<FieldAccessor, TypeMirror> element,
+                                                      @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo,
+                                                      @NonNull FieldAccessor fieldAccessor, @NonNull String getterCode, @NonNull String name, boolean isPrimitive) {
+        methodBuilder.addCode("\n");
+        methodBuilder.addStatement("writer.name(\"" + name + "\")");
+        if (!isPrimitive) {
+            methodBuilder.beginControlFlow("if (object." + getterCode + " != null) ");
+        }
+        if (!isPrimitive) {
+            methodBuilder.addStatement(
+                    adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
+                            getterCode + ")");
+            /*
+             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+             */
+            methodBuilder.endControlFlow();
+            methodBuilder.beginControlFlow("else");
+            if (fieldAccessor.doesRequireNotNull()) {
+                //throw exception in case the field is annotated as NonNull
+                methodBuilder.addStatement("throw new java.io.IOException(\"" + getterCode + " cannot be null\")");
+            } else {
+                //write null value to the writer if the field is null
+                methodBuilder.addStatement("writer.nullValue()");
+            }
+            methodBuilder.endControlFlow();
+        } else {
+            methodBuilder.addStatement("writer.value(object." + getterCode + ")");
+        }
+    }
+}

From fd94e47284ca1e7844245c87fa14e355fc523f72 Mon Sep 17 00:00:00 2001
From: anirudhramanan <anirudh.r@flipkart.com>
Date: Mon, 3 Sep 2018 18:04:12 +0530
Subject: [PATCH 71/84] annotation change

---
 .../typeadapter/WriteSpecGenerator.java       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java
index d269e7f2..4edff787 100644
--- a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java
+++ b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/typeadapter/WriteSpecGenerator.java
@@ -1,7 +1,5 @@
 package com.vimeo.stag.processor.generators.typeadapter;
 
-import android.support.annotation.NonNull;
-
 import com.google.gson.stream.JsonWriter;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.TypeName;
@@ -20,8 +18,8 @@
 public class WriteSpecGenerator {
 
     @NotNull
-    public static MethodSpec getWriteMethodSpec(@NonNull TypeName typeName, @NonNull Map<FieldAccessor, TypeMirror> memberVariables,
-                                                @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, boolean serializeNulls) {
+    public static MethodSpec getWriteMethodSpec(@NotNull TypeName typeName, @NotNull Map<FieldAccessor, TypeMirror> memberVariables,
+                                                @NotNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, boolean serializeNulls) {
         final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("write")
                 .addParameter(JsonWriter.class, "writer")
                 .addParameter(typeName, "object")
@@ -56,9 +54,9 @@ public static MethodSpec getWriteMethodSpec(@NonNull TypeName typeName, @NonNull
         return methodBuilder.build();
     }
 
-    private static void specForSerializedNullsDisabled(@NonNull MethodSpec.Builder methodBuilder, @NonNull Map.Entry<FieldAccessor, TypeMirror> element,
-                                                       @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, @NonNull FieldAccessor fieldAccessor,
-                                                       @NonNull String getterCode, @NonNull String name, boolean isPrimitive) {
+    private static void specForSerializedNullsDisabled(@NotNull MethodSpec.Builder methodBuilder, @NotNull Map.Entry<FieldAccessor, TypeMirror> element,
+                                                       @NotNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo, @NotNull FieldAccessor fieldAccessor,
+                                                       @NotNull String getterCode, @NotNull String name, boolean isPrimitive) {
         methodBuilder.addCode("\n");
         if (!isPrimitive) {
             methodBuilder.beginControlFlow("if (object." + getterCode + " != null) ");
@@ -69,7 +67,7 @@ private static void specForSerializedNullsDisabled(@NonNull MethodSpec.Builder m
                     adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
                             getterCode + ")");
             /*
-             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+             * If the element is annotated with NotNull annotation, throw {@link IOException} if it is null.
              */
             if (fieldAccessor.doesRequireNotNull()) {
                 methodBuilder.endControlFlow();
@@ -83,9 +81,9 @@ private static void specForSerializedNullsDisabled(@NonNull MethodSpec.Builder m
         }
     }
 
-    private static void specForSerializedNullsEnabled(@NonNull MethodSpec.Builder methodBuilder, @NonNull Map.Entry<FieldAccessor, TypeMirror> element,
-                                                      @NonNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo,
-                                                      @NonNull FieldAccessor fieldAccessor, @NonNull String getterCode, @NonNull String name, boolean isPrimitive) {
+    private static void specForSerializedNullsEnabled(@NotNull MethodSpec.Builder methodBuilder, @NotNull Map.Entry<FieldAccessor, TypeMirror> element,
+                                                      @NotNull TypeAdapterGenerator.AdapterFieldInfo adapterFieldInfo,
+                                                      @NotNull FieldAccessor fieldAccessor, @NotNull String getterCode, @NotNull String name, boolean isPrimitive) {
         methodBuilder.addCode("\n");
         methodBuilder.addStatement("writer.name(\"" + name + "\")");
         if (!isPrimitive) {
@@ -96,12 +94,12 @@ private static void specForSerializedNullsEnabled(@NonNull MethodSpec.Builder me
                     adapterFieldInfo.getAdapterAccessor(element.getValue(), name) + ".write(writer, object." +
                             getterCode + ")");
             /*
-             * If the element is annotated with NonNull annotation, throw {@link IOException} if it is null.
+             * If the element is annotated with NotNull annotation, throw {@link IOException} if it is null.
              */
             methodBuilder.endControlFlow();
             methodBuilder.beginControlFlow("else");
             if (fieldAccessor.doesRequireNotNull()) {
-                //throw exception in case the field is annotated as NonNull
+                //throw exception in case the field is annotated as NotNull
                 methodBuilder.addStatement("throw new java.io.IOException(\"" + getterCode + " cannot be null\")");
             } else {
                 //write null value to the writer if the field is null

From 8dbe255227a902ed6cb3e7fe7a36105f48a46d39 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 10 Sep 2018 12:47:01 -0400
Subject: [PATCH 72/84] Switching to new jetbrains annotations library to avoid
 conflicts when compiling for consumers

---
 build.gradle                                    | 2 +-
 integration-test-android/build.gradle           | 2 +-
 integration-test-java-cross-module/build.gradle | 2 +-
 integration-test-java/build.gradle              | 2 +-
 stag-library-compiler/build.gradle              | 6 +++---
 stag-library/build.gradle                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index d9039176..40ae096e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlinVersion = '1.2.50'
+        kotlinVersion = '1.2.61'
         jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
         gsonVersion = '2.8.2'
         assertJ = '3.9.1'
diff --git a/integration-test-android/build.gradle b/integration-test-android/build.gradle
index aeef8d3f..89b09ce3 100644
--- a/integration-test-android/build.gradle
+++ b/integration-test-android/build.gradle
@@ -33,7 +33,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.intellij:annotations:12.0@jar'
+    implementation 'org.jetbrains:annotations:16.0.2@jar'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:support-annotations:27.1.1'
 
diff --git a/integration-test-java-cross-module/build.gradle b/integration-test-java-cross-module/build.gradle
index ee3010c8..2e6cc52f 100644
--- a/integration-test-java-cross-module/build.gradle
+++ b/integration-test-java-cross-module/build.gradle
@@ -3,7 +3,7 @@ apply plugin: "net.ltgt.apt"
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'com.intellij:annotations:12.0@jar'
+    implementation 'org.jetbrains:annotations:16.0.2@jar'
     implementation 'com.android.support:support-annotations:27.1.1'
 
     implementation project(':stag-library')
diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index 8fb5b001..c975d76b 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: "net.ltgt.apt"
 
 dependencies {
-    implementation 'com.intellij:annotations:12.0@jar'
+    implementation 'org.jetbrains:annotations:16.0.2@jar'
     implementation "com.google.code.gson:gson:$gsonVersion"
 
     implementation project(':stag-library')
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index efe524bf..307d2aa5 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -35,8 +35,8 @@ dependencies {
     implementation project(':stag-library')
 
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'com.squareup:javapoet:1.10.0'
-    implementation 'com.intellij:annotations:12.0@jar'
+    implementation 'com.squareup:javapoet:1.11.1'
+    implementation 'org.jetbrains:annotations:16.0.2@jar'
     implementation 'com.google.auto.service:auto-service:1.0-rc3'
 
     // Used by both auto-service and compile-testing, we need to resolve the version for them.
@@ -44,7 +44,7 @@ dependencies {
 
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-    testImplementation 'org.mockito:mockito-core:2.18.0'
+    testImplementation 'org.mockito:mockito-core:2.19.1'
     testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0", { exclude group: 'org.jetbrains.kotlin' }
 }
 
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index d8cd8383..66e1f14b 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -24,7 +24,7 @@ jacocoTestReport.dependsOn test
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'com.intellij:annotations:12.0@jar'
+    implementation 'org.jetbrains:annotations:16.0.2@jar'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.assertj:assertj-core:$assertJ"
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

From ba3fa7ad7081e29d6928362d01bb7e4d245671dd Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 10 Sep 2018 15:05:21 -0400
Subject: [PATCH 73/84] Using java5 version of the annotations instead due to
 not compiling against java8 currently

---
 integration-test-android/build.gradle           | 2 +-
 integration-test-java-cross-module/build.gradle | 2 +-
 integration-test-java/build.gradle              | 2 +-
 stag-library-compiler/build.gradle              | 2 +-
 stag-library/build.gradle                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration-test-android/build.gradle b/integration-test-android/build.gradle
index 89b09ce3..729f7c9e 100644
--- a/integration-test-android/build.gradle
+++ b/integration-test-android/build.gradle
@@ -33,7 +33,7 @@ android {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:16.0.2@jar'
+    implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:support-annotations:27.1.1'
 
diff --git a/integration-test-java-cross-module/build.gradle b/integration-test-java-cross-module/build.gradle
index 2e6cc52f..e4e23f6f 100644
--- a/integration-test-java-cross-module/build.gradle
+++ b/integration-test-java-cross-module/build.gradle
@@ -3,7 +3,7 @@ apply plugin: "net.ltgt.apt"
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'org.jetbrains:annotations:16.0.2@jar'
+    implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
     implementation 'com.android.support:support-annotations:27.1.1'
 
     implementation project(':stag-library')
diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index c975d76b..b74bb9cd 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: "net.ltgt.apt"
 
 dependencies {
-    implementation 'org.jetbrains:annotations:16.0.2@jar'
+    implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
     implementation "com.google.code.gson:gson:$gsonVersion"
 
     implementation project(':stag-library')
diff --git a/stag-library-compiler/build.gradle b/stag-library-compiler/build.gradle
index 307d2aa5..dfc8e8c7 100644
--- a/stag-library-compiler/build.gradle
+++ b/stag-library-compiler/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 
     implementation "com.google.code.gson:gson:$gsonVersion"
     implementation 'com.squareup:javapoet:1.11.1'
-    implementation 'org.jetbrains:annotations:16.0.2@jar'
+    implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
     implementation 'com.google.auto.service:auto-service:1.0-rc3'
 
     // Used by both auto-service and compile-testing, we need to resolve the version for them.
diff --git a/stag-library/build.gradle b/stag-library/build.gradle
index 66e1f14b..482e012e 100644
--- a/stag-library/build.gradle
+++ b/stag-library/build.gradle
@@ -24,7 +24,7 @@ jacocoTestReport.dependsOn test
 
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
-    implementation 'org.jetbrains:annotations:16.0.2@jar'
+    implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.assertj:assertj-core:$assertJ"
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

From 4813a8734f8e38982e2406afd4efc74f9fe89492 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 10 Sep 2018 17:22:36 -0400
Subject: [PATCH 74/84] Verify that output is the same across compilation

---
 .../vimeo/stag/processor/ProcessorTester.kt   |  6 +--
 ...vaIntegrationCrossModuleFunctionalTests.kt |  4 +-
 .../JavaIntegrationFunctionalTests.kt         | 47 +++++++++++++++++--
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ProcessorTester.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ProcessorTester.kt
index 95caae16..491b5353 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ProcessorTester.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/ProcessorTester.kt
@@ -3,7 +3,7 @@ package com.vimeo.stag.processor
 import com.google.testing.compile.Compilation
 import com.google.testing.compile.Compiler
 import java.io.File
-import java.util.Locale
+import java.util.*
 import javax.annotation.processing.Processor
 import javax.tools.DiagnosticCollector
 import javax.tools.ToolProvider
@@ -53,7 +53,7 @@ class ProcessorTester(private val processor: () -> Processor, private vararg val
      *
      * @param clazz the class(es) to compile.
      */
-    fun compileClassInModule(module: String, vararg clazz: KClass<*>): Compilation {
+    fun compileClassesInModule(module: String, vararg clazz: KClass<*>): Compilation {
         val modulePath = "${classpathRoot.parentFile.parentFile.parentFile.parentFile.parentFile.path}/$module/"
         val srcRoot = File(File(File(modulePath, "src"), "main"), "java")
         return Compiler.javac()
@@ -99,4 +99,4 @@ class ProcessorTester(private val processor: () -> Processor, private vararg val
  * Return `true` if the status of the compilation is [Compilation.Status.SUCCESS], `false`
  * otherwise.
  */
-fun Compilation.isSuccessful() = this.status() == Compilation.Status.SUCCESS
\ No newline at end of file
+fun Compilation.isSuccessful() = this.status() == Compilation.Status.SUCCESS
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationCrossModuleFunctionalTests.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationCrossModuleFunctionalTests.kt
index 25e98875..615e7098 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationCrossModuleFunctionalTests.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationCrossModuleFunctionalTests.kt
@@ -202,6 +202,6 @@ class JavaIntegrationCrossModuleFunctionalTests {
     }
 
     private fun <T : Any> assertThatClassCompilationIsSuccessful(kClass: KClass<T>) {
-        Assertions.assertThat(processorTester.compileClassInModule(module, kClass).isSuccessful()).isTrue()
+        Assertions.assertThat(processorTester.compileClassesInModule(module, kClass).isSuccessful()).isTrue()
     }
-}
\ No newline at end of file
+}
diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
index d7b57dca..34a87f65 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
@@ -134,10 +134,10 @@ class JavaIntegrationFunctionalTests {
     @Test
     fun `PublicFieldsNoHungarian compiles successfully`() {
         val processorTesterWithNoHungarian = ProcessorTester({ StagProcessor() }, "-AstagAssumeHungarianNotation=false")
-        assertThat(processorTesterWithNoHungarian.compileClassInModule(module, PublicFieldsNoHungarian::class).isSuccessful()).isTrue()
+        assertThat(processorTesterWithNoHungarian.compileClassesInModule(module, PublicFieldsNoHungarian::class).isSuccessful()).isTrue()
 
         val processorTesterWithHungarian = ProcessorTester({ StagProcessor() }, "-AstagAssumeHungarianNotation=true")
-        assertThat(processorTesterWithHungarian.compileClassInModule(module, PublicFieldsNoHungarian::class).isSuccessful()).isTrue()
+        assertThat(processorTesterWithHungarian.compileClassesInModule(module, PublicFieldsNoHungarian::class).isSuccessful()).isTrue()
     }
 
     @Test
@@ -150,8 +150,49 @@ class JavaIntegrationFunctionalTests {
         assertThatClassCompilationIsSuccessful(WrapperTypeAdapterModel::class)
     }
 
+    @Test
+    fun `Verify that compilation is deterministic`() {
+        val classes = arrayOf(
+                AlternateNameModel::class,
+                AlternateNameModel1::class,
+                BaseExternalModel::class,
+                BooleanFields::class,
+                EnumWithFieldsModel::class,
+                ExternalAbstractClass::class,
+                ExternalModel1::class,
+                ExternalModel2::class,
+                ExternalModelGeneric::class,
+                ExternalModelGeneric1::class,
+                ModelWithNestedInterface::class,
+                NativeJavaModel::class,
+                NativeJavaModelExtension::class,
+                NativeJavaModelExtensionWithoutAnnotation::class,
+                RawGenericField::class,
+                NullFields::class,
+                PrivateMembers::class,
+                WildcardModel::class,
+                DynamicallyTypedModel::class,
+                DynamicallyTypedWildcard::class,
+                AbstractDataList::class,
+                SuperAbstractDataList::class,
+                ConcreteDataList::class
+        )
+
+        val compilation1Hash = processorTester.compileClassesInModule(module, *classes)
+                .generatedFiles()
+                .map { it.getCharContent(false).hashCode() }
+                .sum()
+
+        val compilation2Hash = processorTester.compileClassesInModule(module, *classes)
+                .generatedFiles()
+                .map { it.getCharContent(false).hashCode() }
+                .sum()
+
+        assertThat(compilation1Hash).isEqualTo(compilation2Hash)
+    }
+
     private fun <T : Any> assertThatClassCompilationIsSuccessful(kClass: KClass<T>) {
-        assertThat(processorTester.compileClassInModule(module, kClass).isSuccessful()).isTrue()
+        assertThat(processorTester.compileClassesInModule(module, kClass).isSuccessful()).isTrue()
     }
 
 }

From 8e475072c9218b6175b89a4585e964774b937320 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Mon, 10 Sep 2018 17:23:55 -0400
Subject: [PATCH 75/84] Guarantee determinism between compilations by using
 LinkedHashMap and LinkedHashSet

---
 .../vimeo/stag/processor/StagProcessor.java   |  5 ++--
 .../generators/EnumTypeAdapterGenerator.java  |  5 ++--
 .../processor/generators/StagGenerator.java   |  3 ++-
 .../generators/TypeAdapterGenerator.java      |  9 ++++---
 .../generators/model/AnnotatedClass.java      |  9 ++++---
 .../generators/model/SupportedTypesModel.java |  6 ++---
 .../vimeo/stag/processor/utils/TypeUtils.java | 24 ++++++++++---------
 7 files changed, 32 insertions(+), 29 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 fef5cff3..271b6d3d 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
@@ -51,7 +51,7 @@
 
 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.Set;
@@ -185,7 +185,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
             StagGenerator stagFactoryGenerator = new StagGenerator(supportedTypes);
 
-            Map<String, List<ClassInfo>> adapterFactoryMap = new HashMap<>();
+            Map<String, List<ClassInfo>> adapterFactoryMap = new LinkedHashMap<>();
 
             for (AnnotatedClass annotatedClass : supportedTypesModel.getSupportedTypes()) {
                 TypeElement element = annotatedClass.getElement();
@@ -267,4 +267,5 @@ private void writeTypeSpecToFile(@NotNull TypeSpec typeSpec, @NotNull String pac
         // Write the Java file to disk
         FileGenUtils.writeToFile(javaFile, filer);
     }
+
 }
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 cf2f6734..56472149 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
@@ -41,6 +41,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.lang.model.element.Element;
@@ -114,8 +115,8 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
                 .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
 
 
-        Map<String, Element> nameToConstant = new HashMap<>();
-        Map<Element, String> constantToName = new HashMap<>();
+        Map<String, Element> nameToConstant = new LinkedHashMap<>();
+        Map<Element, String> constantToName = new LinkedHashMap<>();
 
         for (Element enclosingElement : mElement.getEnclosedElements()) {
             if (enclosingElement.getKind() == ElementKind.ENUM_CONSTANT) {
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 fcdf8fa1..3d351b9b 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
@@ -42,6 +42,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -60,7 +61,7 @@ public class StagGenerator {
     private final Map<String, ClassInfo> mKnownClasses;
 
     public StagGenerator(@NotNull Set<TypeMirror> knownTypes) {
-        mKnownClasses = new HashMap<>(knownTypes.size());
+        mKnownClasses = new LinkedHashMap<>(knownTypes.size());
 
         for (TypeMirror knownType : knownTypes) {
             if (!TypeUtils.isAbstract(knownType)) {
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 b4d83ad3..b51b7e00 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
@@ -53,7 +53,6 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -128,7 +127,7 @@ private static String getTypeTokenCode(@NotNull TypeMirror fieldType,
             /*
              * Iterate through all the types from the typeArguments and generate type token code accordingly
              */
-            Map<TypeMirror, TypeMirror> fieldTypeVarsMap = new HashMap<>(typeMirrors.size());
+            Map<TypeMirror, TypeMirror> fieldTypeVarsMap = new LinkedHashMap<>(typeMirrors.size());
             List<? extends TypeMirror> classArguments = TypeUtils.getTypeArguments(declaredFieldType.asElement().asType());
 
             int paramIndex = 0;
@@ -571,7 +570,7 @@ public TypeSpec createTypeAdapterSpec(@NotNull StagGenerator stagGenerator) {
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .superclass(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), typeVariableName));
 
-        Map<TypeMirror, String> typeVarsMap = new HashMap<>();
+        Map<TypeMirror, String> typeVarsMap = new LinkedHashMap<>();
 
         int idx = 0;
         if (typeArguments != null) {
@@ -671,8 +670,8 @@ private static class AdapterFieldInfo {
 
         AdapterFieldInfo(int capacity) {
             mAdapterFields = new LinkedHashMap<>(capacity);
-            mAdapterAccessor = new HashMap<>(capacity);
-            mFieldAdapterAccessor = new HashMap<>(capacity);
+            mAdapterAccessor = new LinkedHashMap<>(capacity);
+            mFieldAdapterAccessor = new LinkedHashMap<>(capacity);
             mTypeTokenAccessorFields = new LinkedHashMap<>();
         }
 
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 9fddc65f..d69dedb6 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
@@ -30,18 +30,17 @@
 import com.vimeo.stag.processor.generators.model.accessor.FieldAccessor;
 import com.vimeo.stag.processor.generators.model.accessor.MethodFieldAccessor;
 import com.vimeo.stag.processor.generators.model.accessor.MethodFieldAccessor.Notation;
-import com.vimeo.stag.processor.utils.logging.DebugLog;
 import com.vimeo.stag.processor.utils.MessagerUtils;
 import com.vimeo.stag.processor.utils.Preconditions;
 import com.vimeo.stag.processor.utils.TypeUtils;
+import com.vimeo.stag.processor.utils.logging.DebugLog;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -55,7 +54,7 @@ public class AnnotatedClass {
 
     @NotNull
     public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<AnnotatedClass> annotatedClasses) {
-        Set<TypeMirror> typeMirrors = new HashSet<>();
+        Set<TypeMirror> typeMirrors = new LinkedHashSet<>();
         for (AnnotatedClass annotatedClass : annotatedClasses) {
             typeMirrors.add(annotatedClass.getType());
         }
@@ -83,7 +82,7 @@ public static Set<TypeMirror> annotatedClassToTypeMirror(@NotNull Collection<Ann
         mNamingNotation = namingNotation;
         mType = element.asType();
         mElement = element;
-        Map<String, FieldAccessor> variableNames = new HashMap<>(element.getEnclosedElements().size());
+        Map<String, FieldAccessor> variableNames = new LinkedHashMap<>(element.getEnclosedElements().size());
         TypeMirror inheritedType = TypeUtils.getInheritedType(element);
 
         UseStag useStag = element.getAnnotation(UseStag.class);
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 ef2f4a71..b21a4439 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
@@ -31,15 +31,15 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.lang.model.type.TypeMirror;
 
 public final class SupportedTypesModel {
 
-    @NotNull private final Map<String, AnnotatedClass> mSupportedTypesMap = new HashMap<>();
-    @NotNull private final Map<String, AnnotatedClass> mKnownInheritedTypesMap = new HashMap<>();
+    @NotNull private final Map<String, AnnotatedClass> mSupportedTypesMap = new LinkedHashMap<>();
+    @NotNull private final Map<String, AnnotatedClass> mKnownInheritedTypesMap = new LinkedHashMap<>();
     @NotNull private final Notation mNamingNotation;
 
     public SupportedTypesModel(@NotNull Notation namingNotation) {
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 14fc6a15..3eef5c67 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
@@ -56,9 +56,11 @@ public final class TypeUtils {
 
     private static final String TAG = TypeUtils.class.getSimpleName();
 
-    @NotNull private static final HashMap<String, String> PRIMITIVE_TO_OBJECT_MAP = new HashMap<>();
+    @NotNull
+    private static final HashMap<String, String> PRIMITIVE_TO_OBJECT_MAP = new HashMap<>();
 
-    @Nullable private static Types sTypeUtils;
+    @Nullable
+    private static Types sTypeUtils;
 
     static {
         PRIMITIVE_TO_OBJECT_MAP.put(boolean.class.getName(), Boolean.class.getName());
@@ -363,7 +365,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), resolvedType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Parameterized Type - " + member.getValue().toString() +
-                                      " resolved to - " + resolvedType.toString());
+                            " resolved to - " + resolvedType.toString());
                 } else {
 
                     int index = inheritedTypes.indexOf(member.getKey().asType());
@@ -371,7 +373,7 @@ public static LinkedHashMap<FieldAccessor, TypeMirror> getConcreteMembers(@NotNu
                     map.put(member.getKey(), concreteType);
 
                     DebugLog.log(TAG, "\t\t\tGeneric Type - " + member.getValue().toString() +
-                                      " resolved to - " + concreteType.toString());
+                            " resolved to - " + concreteType.toString());
                 }
             }
         }
@@ -468,8 +470,8 @@ public static boolean isNativeArray(@NotNull TypeMirror type) {
     public static boolean isSupportedList(@NotNull 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());
     }
 
     /**
@@ -485,11 +487,11 @@ public static boolean isSupportedMap(@Nullable TypeMirror type) {
         String outerClassType = TypeUtils.getOuterClassType(type);
         //noinspection LiteralAsArgToStringEquals
         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());
     }
 
     /**

From f454959f26342e001eeff61acf790070f04eee8f Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Tue, 11 Sep 2018 15:13:41 -0400
Subject: [PATCH 76/84] Extract the hashing code into an extension function

---
 .../JavaIntegrationFunctionalTests.kt         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
index 34a87f65..11e60392 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
@@ -1,5 +1,6 @@
 package com.vimeo.stag.processor.functional
 
+import com.google.testing.compile.Compilation
 import com.vimeo.sample_java_model.*
 import com.vimeo.stag.processor.ProcessorTester
 import com.vimeo.stag.processor.StagProcessor
@@ -178,19 +179,19 @@ class JavaIntegrationFunctionalTests {
                 ConcreteDataList::class
         )
 
-        val compilation1Hash = processorTester.compileClassesInModule(module, *classes)
-                .generatedFiles()
-                .map { it.getCharContent(false).hashCode() }
-                .sum()
-
-        val compilation2Hash = processorTester.compileClassesInModule(module, *classes)
-                .generatedFiles()
-                .map { it.getCharContent(false).hashCode() }
-                .sum()
+        val compilation1Hash = processorTester.compileClassesInModule(module, *classes).hashOutput()
+        val compilation2Hash = processorTester.compileClassesInModule(module, *classes).hashOutput()
 
         assertThat(compilation1Hash).isEqualTo(compilation2Hash)
     }
 
+    /**
+     * Returns the concatenation of the hash of each file generated by the [Compilation].
+     */
+    private fun Compilation.hashOutput(): String = generatedFiles()
+            .map { it.getCharContent(false).hashCode() }
+            .joinToString()
+
     private fun <T : Any> assertThatClassCompilationIsSuccessful(kClass: KClass<T>) {
         assertThat(processorTester.compileClassesInModule(module, kClass).isSuccessful()).isTrue()
     }

From 4d24da11ed4b619fb7c5e70547dc3b31ae7bc014 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 12 Sep 2018 14:25:15 -0400
Subject: [PATCH 77/84] Simplify hashOutput function

---
 .../processor/functional/JavaIntegrationFunctionalTests.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
index 11e60392..d3c00a84 100644
--- a/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
+++ b/stag-library-compiler/src/test/java/com/vimeo/stag/processor/functional/JavaIntegrationFunctionalTests.kt
@@ -189,8 +189,7 @@ class JavaIntegrationFunctionalTests {
      * Returns the concatenation of the hash of each file generated by the [Compilation].
      */
     private fun Compilation.hashOutput(): String = generatedFiles()
-            .map { it.getCharContent(false).hashCode() }
-            .joinToString()
+            .joinToString { it.getCharContent(false).hashCode().toString() }
 
     private fun <T : Any> assertThatClassCompilationIsSuccessful(kClass: KClass<T>) {
         assertThat(processorTester.compileClassesInModule(module, kClass).isSuccessful()).isTrue()

From 65df976739e52961f89bce95247090e10175f450 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Wed, 12 Sep 2018 14:52:14 -0400
Subject: [PATCH 78/84] Removing duplicate utils

---
 .../com/vimeo/stag/KnownTypeAdaptersTestKt.kt |   1 +
 .../src/test/java/verification/Utils.java     | 103 ------------------
 .../{com/vimeo/stag => verification}/Utils.kt |   5 +-
 3 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 stag-library/src/test/java/verification/Utils.java
 rename stag-library/src/test/java/{com/vimeo/stag => verification}/Utils.kt (95%)

diff --git a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
index 8d489977..3729c42e 100644
--- a/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
+++ b/stag-library/src/test/java/com/vimeo/stag/KnownTypeAdaptersTestKt.kt
@@ -10,6 +10,7 @@ import com.google.gson.stream.JsonToken
 import com.google.gson.stream.JsonWriter
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
+import verification.assertThatClassIsNotInstantiable
 import java.io.StringReader
 
 /**
diff --git a/stag-library/src/test/java/verification/Utils.java b/stag-library/src/test/java/verification/Utils.java
deleted file mode 100644
index a75caea5..00000000
--- a/stag-library/src/test/java/verification/Utils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package verification;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
-import org.junit.Assert;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import static org.junit.Assert.assertEquals;
-
-public final class Utils {
-
-    private Utils() {}
-
-    public static <K, V> void assertMapsEqual(Map<K, V> map1, Map<K, V> map2) {
-        for (Entry<K, V> kvEntry : map1.entrySet()) {
-            assertEquals(kvEntry.getValue(), map2.get(kvEntry.getKey()));
-        }
-
-        for (Entry<K, V> kvEntry : map2.entrySet()) {
-            assertEquals(kvEntry.getValue(), map1.get(kvEntry.getKey()));
-        }
-    }
-
-    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 HashMap<String, String> createStringDummyMap() {
-        HashMap<String, String> stringMap = new HashMap<>();
-
-        stringMap.put("abc", "0");
-        stringMap.put("abc1", "1");
-        stringMap.put("abc2", "2");
-        stringMap.put("abc3", "3");
-        stringMap.put("abc4", "4");
-        stringMap.put("abc5", "5");
-
-        return stringMap;
-    }
-
-    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;
-    }
-
-    public static HashMap<Integer, Integer> createIntegerDummyMap() {
-        HashMap<Integer, Integer> integerMap = new HashMap<>();
-
-        integerMap.put(1, 11);
-        integerMap.put(2, 22);
-        integerMap.put(3, 33);
-        integerMap.put(4, 44);
-        integerMap.put(5, 55);
-        integerMap.put(6, 66);
-
-        return integerMap;
-    }
-
-    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;
-    }
-}
diff --git a/stag-library/src/test/java/com/vimeo/stag/Utils.kt b/stag-library/src/test/java/verification/Utils.kt
similarity index 95%
rename from stag-library/src/test/java/com/vimeo/stag/Utils.kt
rename to stag-library/src/test/java/verification/Utils.kt
index f24c4045..65b99a6f 100644
--- a/stag-library/src/test/java/com/vimeo/stag/Utils.kt
+++ b/stag-library/src/test/java/verification/Utils.kt
@@ -1,13 +1,12 @@
 @file:JvmName("Utils")
 
-package com.vimeo.stag
+package verification
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
-import java.util.ArrayList
-import java.util.HashMap
+import java.util.*
 
 inline fun <reified T : Any> assertThatClassIsNotInstantiable() {
     assertThatThrownBy {

From 541bf506a96c80471b712deada7068ca1e00e335 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 25 Oct 2018 11:45:22 -0400
Subject: [PATCH 79/84] Updating build tools and android dependencies

- Updated gradle version to support latest Android Studio
- Updated android build tools.
- Updated android dependencies.
- Updated annotation processor inclusion to support new plugin.
---
 .travis.yml                                     |  4 ++--
 build.gradle                                    | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties        |  4 ++--
 integration-test-android/build.gradle           |  4 ++--
 integration-test-java-cross-module/build.gradle |  4 ++--
 integration-test-java/build.gradle              |  2 +-
 sample/build.gradle                             |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed7bd28c..baba0273 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,8 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
     - extra-android-support
     - extra-android-m2repository
 # workaround for Google changing android-27 package and causing a checksum mismatch
diff --git a/build.gradle b/build.gradle
index 40ae096e..7cde4888 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 buildscript {
     ext {
-        kotlinVersion = '1.2.61'
+        kotlinVersion = '1.2.71'
         jacocoVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
         gsonVersion = '2.8.2'
         assertJ = '3.9.1'
 
         // android dependencies
-        targetSdk = 27
+        targetSdk = 28
         minSdk = 14
-        buildTools = "27.0.3"
+        buildTools = "28.0.3"
     }
     repositories {
         google()
@@ -17,7 +17,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
@@ -43,5 +43,5 @@ allprojects {
 
 subprojects {
     group = 'com.vimeo.stag'
-    version = '2.5.1'
+    version = '2.6.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 207e72b8..f83c6b89 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 09 13:12:02 EDT 2018
+#Thu Oct 25 11:29:47 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/integration-test-android/build.gradle b/integration-test-android/build.gradle
index 729f7c9e..2bcd4248 100644
--- a/integration-test-android/build.gradle
+++ b/integration-test-android/build.gradle
@@ -34,8 +34,8 @@ android {
 
 dependencies {
     implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-annotations:28.0.0'
 
     implementation project(':stag-library')
     annotationProcessor project(':stag-library-compiler')
diff --git a/integration-test-java-cross-module/build.gradle b/integration-test-java-cross-module/build.gradle
index e4e23f6f..b76a37a4 100644
--- a/integration-test-java-cross-module/build.gradle
+++ b/integration-test-java-cross-module/build.gradle
@@ -4,10 +4,10 @@ apply plugin: "net.ltgt.apt"
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
     implementation 'org.jetbrains:annotations-java5:16.0.2@jar'
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
 
     implementation project(':stag-library')
-    apt project(':stag-library-compiler')
+    annotationProcessor project(':stag-library-compiler')
 
     implementation project(':integration-test-java')
 
diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index b74bb9cd..0a7e148d 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
 
     implementation project(':stag-library')
-    apt project(':stag-library-compiler')
+    annotationProcessor project(':stag-library-compiler')
 
     testImplementation 'junit:junit:4.12'
 }
diff --git a/sample/build.gradle b/sample/build.gradle
index 400fcdd9..43e9f6ea 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -45,7 +45,7 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
     implementation project(':stag-library')
     annotationProcessor project(':stag-library-compiler')

From 67cfdcd9acfb0e999806b0f215ba5064b26d34db Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 25 Oct 2018 11:45:43 -0400
Subject: [PATCH 80/84] Updating name of the serialize nulls option to
 stag.serializeNulls

---
 .../src/main/java/com/vimeo/stag/processor/StagProcessor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 486d7de5..b0d9752c 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
@@ -72,14 +72,14 @@
 
 @AutoService(Processor.class)
 @SupportedAnnotationTypes(value = {"com.vimeo.stag.UseStag"})
-@SupportedOptions(value = {StagProcessor.OPTION_PACKAGE_NAME, StagProcessor.OPTION_DEBUG, StagProcessor.OPTION_HUNGARIAN_NOTATION})
+@SupportedOptions(value = {StagProcessor.OPTION_PACKAGE_NAME, StagProcessor.OPTION_DEBUG, StagProcessor.OPTION_HUNGARIAN_NOTATION, StagProcessor.OPTION_SERIALIZE_NULLS})
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
 public final class StagProcessor extends AbstractProcessor {
 
     static final String OPTION_DEBUG = "stagDebug";
     static final String OPTION_PACKAGE_NAME = "stagGeneratedPackageName";
     static final String OPTION_HUNGARIAN_NOTATION = "stagAssumeHungarianNotation";
-    static final String OPTION_SERIALIZE_NULLS = "serializeNulls";
+    static final String OPTION_SERIALIZE_NULLS = "stag.serializeNulls";
     private static final String DEFAULT_GENERATED_PACKAGE_NAME = "com.vimeo.stag.generated";
     private boolean mHasBeenProcessed;
 

From 50b50d1a453d6afdc4cacb5c74c454841266b6a1 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 25 Oct 2018 11:47:25 -0400
Subject: [PATCH 81/84] Adding changelog for 2.6.0

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f1255ce..45b91325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+Version 2.6.0 *(2018-10-25)*
+----------------------------
+- Improved formatting of generated code.
+- Improved logging by putting all debug logging behind the `stagDebug` flag.
+- Improve integration of library by switching to new nullability annotations library.
+- Wrote unit tests for `KnownTypeAdapters`.
+- Fixed bug where code generation was non deterministic by switching to linked versions of `HashSet` and `HashMap`.
+- Added support for turning on/off serialization of `null` with `stag.serializeNulls` compiler option. Default is off, which is a behavior change from version 2.5.1.
+
 Version 2.5.1 *(2018-01-17)*
 ----------------------------
 - Fixed bug where types with wildcards caused compilation to fail.

From fa0829e5aa539a6f43c0547aa390afc5b0a99bfc Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 25 Oct 2018 12:25:02 -0400
Subject: [PATCH 82/84] Updating readme for release

---
 README.md | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 2d5e1c22..a63669a7 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ buildscript {
 apply plugin: 'net.ltgt.apt'
 
 dependencies {
-    def stagVersion = '2.5.1'
+    def stagVersion = '2.6.0'
     compile "com.vimeo.stag:stag-library:$stagVersion"
     apt "com.vimeo.stag:stag-library-compiler:$stagVersion"
 }
@@ -45,9 +45,10 @@ dependencies {
 gradle.projectsEvaluated {
     tasks.withType(JavaCompile) {
         aptOptions.processorArgs = [
-                stagAssumeHungarianNotation: "true",
-                stagGeneratedPackageName   : "com.vimeo.sample.stag.generated",
-                stagDebug                  : "true"
+                "stagAssumeHungarianNotation": "true",
+                "stagGeneratedPackageName"   : "com.vimeo.sample.stag.generated",
+                "stagDebug "                 : "true",
+                "stag.serializeNulls"        : "true",
         ]
     }
 }
@@ -58,7 +59,7 @@ gradle.projectsEvaluated {
 apply plugin: 'kotlin-kapt'
 
 dependencies {
-    def stagVersion = '2.5.1'
+    def stagVersion = '2.6.0'
     compile "com.vimeo.stag:stag-library:$stagVersion"
     kapt "com.vimeo.stag:stag-library-compiler:$stagVersion"
 }
@@ -70,6 +71,7 @@ kapt {
         arg("stagDebug", "true")
         arg("stagGeneratedPackageName", "com.vimeo.sample.stag.generated")
         arg("stagAssumeHungarianNotation", "true")
+        arg("stag.serializeNulls", "true")
     }
 }
 ```
@@ -78,7 +80,7 @@ kapt {
 
 ```groovy
 dependencies {
-    def stagVersion = '2.5.1'
+    def stagVersion = '2.6.0'
     compile "com.vimeo.stag:stag-library:$stagVersion"
     annotationProcessor "com.vimeo.stag:stag-library-compiler:$stagVersion"
 }
@@ -91,9 +93,10 @@ android {
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
-                    stagAssumeHungarianNotation: 'true'
-                    stagGeneratedPackageName   : 'com.vimeo.sample.stag.generated',
-                    stagDebug                  : 'true'
+                    "stagAssumeHungarianNotation": 'true',
+                    "stagGeneratedPackageName"   : 'com.vimeo.sample.stag.generated',
+                    "stagDebug"                  : 'true',
+                    "stag.serializeNulls"        : 'true'
                 ]
             }
         }
@@ -112,6 +115,10 @@ android {
  Stag will look for members named `set[variable_name]` and `get[variable_name]`. If your member variables are named using Hungarian notation,
  then you will need to pass true to this parameter so that for a field named `mField`, Stag will look for `setField` and `getField` instead
  of `setMField` and `getMField`. Default is false.
+ - `stag.serializeNulls`: By default this is set to false. If an object has a null field and you send it to be serialized by Gson, it is optional
+ whether or not that field is serialized into the JSON. If this field is set to `false` null fields will not be serialized, and if set to `true`, 
+ they will be serialized. Prior to stag version 2.6.0, null fields were always serialized to JSON. This should not affect most models. However, if
+ you have a model that has a nullable field that also has a non null default value, then it might be a good idea to turn this option on.
 
 ## Features
 
@@ -249,7 +256,7 @@ class Herd {
  * You parse the list from JSON using
  * Gson.
  */
-MyParsingClass {
+class MyParsingClass {
     private Gson gson = new GsonBuilder()
                                  .registerTypeAdapterFactory(new Stag.Factory())
                                  .create();

From f45b40d41d4997bdb5ef5c99cffb3174e73eeae1 Mon Sep 17 00:00:00 2001
From: Brent Watson <brent@brentwatson.com>
Date: Thu, 25 Oct 2018 12:35:04 -0400
Subject: [PATCH 83/84] Update PODAM version

Co-Authored-By: anthonycr <anthonyrestaino11@gmail.com>
---
 integration-test-java/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-test-java/build.gradle b/integration-test-java/build.gradle
index 54e667c7..9ea2cd51 100644
--- a/integration-test-java/build.gradle
+++ b/integration-test-java/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     apt project(':stag-library-compiler')
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'uk.co.jemos.podam:podam:7.1.0.RELEASE'
+    testImplementation 'uk.co.jemos.podam:podam:7.2.0.RELEASE'
 }
 
 gradle.projectsEvaluated {

From d381fab26517a04a38efa953125916a731c76a0c Mon Sep 17 00:00:00 2001
From: Anthony Restaino <AnthonyR@vimeo.com>
Date: Thu, 25 Oct 2018 12:35:19 -0400
Subject: [PATCH 84/84] Change formatting

---
 integration-test-java/src/test/java/verification/Utils.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/integration-test-java/src/test/java/verification/Utils.java b/integration-test-java/src/test/java/verification/Utils.java
index d525bec1..b4900ed9 100644
--- a/integration-test-java/src/test/java/verification/Utils.java
+++ b/integration-test-java/src/test/java/verification/Utils.java
@@ -90,11 +90,10 @@ public static <T> void verifyTypeAdapterCorrectness(@NotNull Class<T> clazz) {
 
         final T object = factory.manufacturePojo(clazz);
         final TypeAdapter<T> typeAdapter = getTypeAdapter(clazz);
-
-
+        
         T newObject = null;
         if (typeAdapter != null) {
-            String json = typeAdapter.toJson(object);
+            final String json = typeAdapter.toJson(object);
             try {
                 newObject = typeAdapter.fromJson(json);
             } catch (IOException ignored) {}