Merge pull request #194 from sav007/bug-183/union-type

Fix issue with union type
apollographql · Feb 14, 2017 · 7591820 · 7591820
2 parents 8ce085a + cba70d7
commit 7591820
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/ir/Field.kt b/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/ir/Field.kt
@@ -42,7 +42,7 @@ data class Field(
 
   private fun toTypeName(responseType: String, typesPackage: String,
       customScalarTypeMap: Map<String, String>): TypeName {
-    val packageName = if (fields?.any() ?: false || hasFragments()) "" else typesPackage
+    val packageName = if (isNonScalar()) "" else typesPackage
     return JavaTypeResolver(customScalarTypeMap, packageName).resolve(responseType, isOptional())
   }
 
@@ -71,7 +71,7 @@ data class Field(
 
   fun isNonScalar() = hasFragments() || (fields?.any() ?: false)
 
-  fun hasFragments() = fragmentSpreads?.any() ?: false
+  fun hasFragments() = (fragmentSpreads?.any() ?: false) || (inlineFragments?.any() ?: false)
 
   fun isOptional(): Boolean = isConditional || !methodResponseType().endsWith("!")
 }