Fix missing symbol for input type with default enum value (#522)

apollographql · Jun 14, 2017 · 59f7901 · 59f7901
1 parent a58f5c4
commit 59f7901
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 9 deletions.
diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/BuilderTypeSpecBuilder.kt b/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/BuilderTypeSpecBuilder.kt
@@ -1,12 +1,14 @@
 package com.apollographql.apollo.compiler
 
+import com.apollographql.apollo.compiler.ir.TypeDeclaration
 import com.squareup.javapoet.*
 import javax.lang.model.element.Modifier
 
 class BuilderTypeSpecBuilder(
     val targetObjectClassName: ClassName,
     val fields: List<Pair<String, TypeName>>,
-    val fieldDefaultValues: Map<String, Any?>
+    val fieldDefaultValues: Map<String, Any?>,
+    val typeDeclarations: List<TypeDeclaration>
 ) {
   fun build(): TypeSpec {
     return TypeSpec.classBuilder(builderClassName)
@@ -25,9 +27,15 @@ class BuilderTypeSpecBuilder(
         val defaultValue = fieldDefaultValues[fieldName]?.let {
           (it as? Number)?.castTo(fieldType.withoutAnnotations()) ?: it
         }
+        val initializerCode = defaultValue?.let {
+          if (fieldType.isEnum(typeDeclarations))
+            CodeBlock.of("\$T.\$L", fieldType.withoutAnnotations(), defaultValue)
+          else
+            CodeBlock.of("\$L", defaultValue)
+        } ?: CodeBlock.of("")
         FieldSpec.builder(fieldType, fieldName)
             .addModifiers(Modifier.PRIVATE)
-            .initializer(defaultValue?.let { CodeBlock.of("\$L", it) } ?: CodeBlock.of(""))
+            .initializer(initializerCode)
             .build()
       })
 
@@ -83,5 +91,8 @@ class BuilderTypeSpecBuilder(
         } else {
           this
         }
+
+    private fun TypeName.isEnum(typeDeclarations: List<TypeDeclaration>) =
+        ((this is ClassName) && typeDeclarations.count { it.kind == "EnumType" && it.name == simpleName() } > 0)
   }
 }
diff --git a/...-compiler/src/main/kotlin/com/apollographql/apollo/compiler/InputObjectTypeSpecBuilder.kt b/...-compiler/src/main/kotlin/com/apollographql/apollo/compiler/InputObjectTypeSpecBuilder.kt
@@ -56,7 +56,14 @@ class InputObjectTypeSpecBuilder(
       val builderFields = fields.map { it.name.decapitalize() to it.javaTypeName(context) }
       val builderFieldDefaultValues = fields.associate { it.name.decapitalize() to it.defaultValue }
       return addMethod(BuilderTypeSpecBuilder.builderFactoryMethod())
-          .addType(BuilderTypeSpecBuilder(objectClassName, builderFields, builderFieldDefaultValues).build())
+          .addType(
+              BuilderTypeSpecBuilder(
+                  targetObjectClassName = objectClassName,
+                  fields = builderFields,
+                  fieldDefaultValues = builderFieldDefaultValues,
+                  typeDeclarations = context.typeDeclarations
+              ).build()
+          )
     }
   }
 

diff --git a/...lo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/OperationTypeSpecBuilder.kt b/...lo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/OperationTypeSpecBuilder.kt
@@ -170,13 +170,24 @@ class OperationTypeSpecBuilder(
   private fun TypeSpec.Builder.addBuilder(context: CodeGenerationContext): TypeSpec.Builder {
     addMethod(BuilderTypeSpecBuilder.builderFactoryMethod())
     if (operation.variables.isEmpty()) {
-      return BuilderTypeSpecBuilder(ClassName.get("", OPERATION_TYPE_NAME), emptyList(), emptyMap())
-          .let { addType(it.build()) }
+      return BuilderTypeSpecBuilder(
+          targetObjectClassName = ClassName.get("", OPERATION_TYPE_NAME),
+          fields = emptyList(),
+          fieldDefaultValues = emptyMap(),
+          typeDeclarations = context.typeDeclarations
+      ).let { addType(it.build()) }
     }
     return operation.variables
         .map { it.name.decapitalize() to it.type }
         .map { it.first to JavaTypeResolver(context, context.typesPackage).resolve(it.second).unwrapOptionalType() }
-        .let { BuilderTypeSpecBuilder(ClassName.get("", OPERATION_TYPE_NAME), it, emptyMap()) }
+        .let {
+          BuilderTypeSpecBuilder(
+              targetObjectClassName = ClassName.get("", OPERATION_TYPE_NAME),
+              fields = it,
+              fieldDefaultValues = emptyMap(),
+              typeDeclarations = context.typeDeclarations
+          )
+        }
         .let { addType(it.build()) }
   }
 

diff --git a/...lo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/VariablesTypeSpecBuilder.kt b/...lo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/VariablesTypeSpecBuilder.kt
@@ -82,7 +82,14 @@ class VariablesTypeSpecBuilder(
     } else {
       val builderFields = variables.map { it.name.decapitalize() to it.javaTypeName(context, context.typesPackage) }
       return addMethod(BuilderTypeSpecBuilder.builderFactoryMethod())
-          .addType(BuilderTypeSpecBuilder(VARIABLES_TYPE_NAME, builderFields, emptyMap()).build())
+          .addType(
+              BuilderTypeSpecBuilder(
+                  targetObjectClassName = VARIABLES_TYPE_NAME,
+                  fields = builderFields,
+                  fieldDefaultValues = emptyMap(),
+                  typeDeclarations = context.typeDeclarations
+              ).build()
+          )
     }
   }
 

diff --git a/apollo-compiler/src/test/graphql/com/example/input_object_type/TestQuery.json b/apollo-compiler/src/test/graphql/com/example/input_object_type/TestQuery.json
@@ -127,6 +127,12 @@
 					"name": "favoriteColor",
 					"description": "Favorite color, optional",
 					"type": "ColorInput!"
+				},
+				{
+					"name": "enumWithDefaultValue",
+					"description": "for test purpose only",
+					"type": "Episode",
+					"defaultValue": "JEDI"
 				}
 			]
 		},

diff --git a/apollo-compiler/src/test/graphql/com/example/input_object_type/type/ReviewInput.java b/apollo-compiler/src/test/graphql/com/example/input_object_type/type/ReviewInput.java
@@ -17,12 +17,16 @@ public final class ReviewInput {
 
   private final @Nonnull ColorInput favoriteColor;
 
+  private final @Nullable Episode enumWithDefaultValue;
+
   ReviewInput(int stars, @Nullable Integer nullableIntFieldWithDefaultValue,
-      @Nullable String commentary, @Nonnull ColorInput favoriteColor) {
+      @Nullable String commentary, @Nonnull ColorInput favoriteColor,
+      @Nullable Episode enumWithDefaultValue) {
     this.stars = stars;
     this.nullableIntFieldWithDefaultValue = nullableIntFieldWithDefaultValue;
     this.commentary = commentary;
     this.favoriteColor = favoriteColor;
+    this.enumWithDefaultValue = enumWithDefaultValue;
   }
 
   public int stars() {
@@ -41,6 +45,10 @@ public int stars() {
     return this.favoriteColor;
   }
 
+  public @Nullable Episode enumWithDefaultValue() {
+    return this.enumWithDefaultValue;
+  }
+
   public static Builder builder() {
     return new Builder();
   }
@@ -54,6 +62,8 @@ public static final class Builder {
 
     private @Nonnull ColorInput favoriteColor;
 
+    private @Nullable Episode enumWithDefaultValue = Episode.JEDI;
+
     Builder() {
     }
 
@@ -77,9 +87,14 @@ public Builder favoriteColor(@Nonnull ColorInput favoriteColor) {
       return this;
     }
 
+    public Builder enumWithDefaultValue(@Nullable Episode enumWithDefaultValue) {
+      this.enumWithDefaultValue = enumWithDefaultValue;
+      return this;
+    }
+
     public ReviewInput build() {
       if (favoriteColor == null) throw new IllegalStateException("favoriteColor can't be null");
-      return new ReviewInput(stars, nullableIntFieldWithDefaultValue, commentary, favoriteColor);
+      return new ReviewInput(stars, nullableIntFieldWithDefaultValue, commentary, favoriteColor, enumWithDefaultValue);
     }
   }
 }
diff --git a/apollo-compiler/src/test/graphql/schema.json b/apollo-compiler/src/test/graphql/schema.json
@@ -1643,6 +1643,16 @@
                 }
               },
               "defaultValue": null
+            },
+            {
+              "name": "enumWithDefaultValue",
+              "description": "for test purpose only",
+              "type": {
+                "kind": "ENUM",
+                "name": "Episode",
+                "ofType": null
+              },
+              "defaultValue": "JEDI"
             }
           ],
           "interfaces": null,