Merge pull request #19 from vimeo/dev

Merge dev into master for 1.1.1

README.md

@@ -19,8 +19,8 @@ The Stag library solves this problem. It leverages annotations to automatically
 from jCenter
 ```groovy
 dependencies {
-    compile 'com.vimeo.stag:stag-library:1.1.0'
-    apt 'com.vimeo.stag:stag-library-compiler:1.1.0'
+    compile 'com.vimeo.stag:stag-library:1.1.1'
+    apt 'com.vimeo.stag:stag-library-compiler:1.1.1'
 }
 ```
 

build.gradle

@@ -27,5 +27,5 @@ allprojects {
 
 subprojects {
     group = 'com.vimeo.stag'
-    version = '1.1.0'
+    version = '1.1.1'
 }

sample/src/main/java/com/vimeo/sample/model/IdenticalFieldTypes.java

@@ -0,0 +1,26 @@
+package com.vimeo.sample.model;
+
+import com.vimeo.stag.GsonAdapterKey;
+
+import java.util.ArrayList;
+
+public class IdenticalFieldTypes {
+
+    @GsonAdapterKey
+    User mUser;
+
+    @GsonAdapterKey
+    User mSecondUser;
+
+    @GsonAdapterKey
+    ArrayList<User> mUsersList;
+
+    @GsonAdapterKey
+    ArrayList<User> mSecondUsersList;
+
+    @GsonAdapterKey
+    ArrayList<Stats> mStatsArrayList;
+
+    @GsonAdapterKey
+    Stats mStats;
+}

stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/TypeAdapterGenerator.java

@@ -210,8 +210,10 @@ private MethodSpec getReadMethodSpec(@NotNull TypeName typeName,
     private static void addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
                                          @NotNull MethodSpec.Builder constructorBuilder,
                                          @NotNull Map<Element, TypeMirror> memberVariables) {
-        HashSet<TypeMirror> typeSet = new HashSet<>(memberVariables.values());
-        for (TypeMirror fieldType : typeSet) {
+        HashSet<TypeMirror> inclusiveTypeSet = new HashSet<>(memberVariables.values());
+        HashSet<TypeMirror> exclusiveTypeSet = new HashSet<>();
+
+        for (TypeMirror fieldType : inclusiveTypeSet) {
             if (isNative(fieldType.toString())) {
                 continue;
             }
@@ -220,6 +222,10 @@ private static void addAdapterFields(@NotNull TypeSpec.Builder adapterBuilder,
                 fieldType = getInnerListType(fieldType);
             }
 
+            exclusiveTypeSet.add(fieldType);
+        }
+
+        for (TypeMirror fieldType : exclusiveTypeSet) {
             TypeName typeName = getAdapterFieldTypeName(fieldType);
             String fieldName = getAdapterField(fieldType);
 
@@ -288,13 +294,20 @@ private static String getReadTokenType(@NotNull TypeMirror type) {
     @NotNull
     private static String getReadCode(@NotNull String prefix, @NotNull String variableName,
                                       @NotNull TypeMirror type) {
-        if (TypeUtils.getOuterClassType(type).equals(ArrayList.class.getName())) {
+        String outerClassType = TypeUtils.getOuterClassType(type);
+        if (outerClassType.equals(ArrayList.class.getName())) {
             TypeMirror innerType = getInnerListType(type);
             String innerRead = getAdapterRead(innerType);
             return prefix + "reader.beginArray();\n" +
                    prefix + "object." + variableName + " = new java.util.ArrayList<>();\n" +
                    prefix + "while (reader.hasNext()) {\n" +
-                   prefix + "\tobject." + variableName + ".add(" + innerRead + ");\n" +
+
+                   prefix + "\ttry {\n" +
+                   prefix + "\t\tobject." + variableName + ".add(" + innerRead + ");\n" +
+                   prefix + "\t} catch(Exception exception) {\n" +
+                   prefix + "\t\tthrow new IOException(\"Error parsing " +
+                   outerClassType + "." + variableName + " JSON!\", exception)\n;" +
+                   prefix + "\t}" +
                    prefix + "}\n" +
                    prefix + "reader.endArray();";
         } else {