better exceptions for incorrect types

dh94 · dh94 · commit 5f62bf0916fa · 2017-05-12T16:09:05.000+03:00
diff --git a/src/main/java/graphql/schema/idl/SchemaGenerator.java b/src/main/java/graphql/schema/idl/SchemaGenerator.java
@@ -22,7 +22,6 @@
 import graphql.language.Type;
 import graphql.language.TypeDefinition;
 import graphql.language.TypeExtensionDefinition;
-import graphql.language.TypeName;
 import graphql.language.UnionTypeDefinition;
 import graphql.language.Value;
 import graphql.schema.DataFetcher;
@@ -42,6 +41,8 @@
 import graphql.schema.PropertyDataFetcher;
 import graphql.schema.TypeResolver;
 import graphql.schema.TypeResolverProxy;
+import graphql.schema.idl.errors.NotAnInputTypeError;
+import graphql.schema.idl.errors.NotAnOutputTypeError;
 import graphql.schema.idl.errors.SchemaProblem;
 
 import java.util.Collections;
@@ -135,7 +136,9 @@ public SchemaGenerator() {
      *
      * @param typeRegistry this can be obtained via {@link SchemaCompiler#compile(String)}
      * @param wiring       this can be built using {@link RuntimeWiring#newRuntimeWiring()}
+     *
      * @return an executable schema
+     *
      * @throws SchemaProblem if there are problems in assembling a schema such as missing type resolvers or no operations defined
      */
     public GraphQLSchema makeExecutableSchema(TypeDefinitionRegistry typeRegistry, RuntimeWiring wiring) throws SchemaProblem {
@@ -184,6 +187,7 @@ private GraphQLObjectType buildOperation(BuildContext buildCtx, OperationTypeDef
      *
      * @param buildCtx the context we need to work out what we are doing
      * @param rawType  the type to be built
+     *
      * @return an output type
      */
     @SuppressWarnings("unchecked")
@@ -213,8 +217,11 @@ private <T extends GraphQLOutputType> T buildOutputType(BuildContext buildCtx, T
             outputType = buildUnionType(buildCtx, (UnionTypeDefinition) typeDefinition);
         } else if (typeDefinition instanceof EnumTypeDefinition) {
             outputType = buildEnumType((EnumTypeDefinition) typeDefinition);
-        } else {
+        } else if (typeDefinition instanceof ScalarTypeDefinition){
             outputType = buildScalar(buildCtx, (ScalarTypeDefinition) typeDefinition);
+        } else {
+            // typeDefinition is not a valid output type
+            throw new NotAnOutputTypeError(typeDefinition);
         }
 
         buildCtx.put(outputType);
@@ -243,8 +250,11 @@ private GraphQLInputType buildInputType(BuildContext buildCtx, Type rawType) {
             inputType = buildInputObjectType(buildCtx, (InputObjectTypeDefinition) typeDefinition);
         } else if (typeDefinition instanceof EnumTypeDefinition) {
             inputType = buildEnumType((EnumTypeDefinition) typeDefinition);
-        } else {
+        } else if (typeDefinition instanceof ScalarTypeDefinition){
             inputType = buildScalar(buildCtx, (ScalarTypeDefinition) typeDefinition);
+        } else {
+            // typeDefinition is not a valid InputType
+            throw new NotAnInputTypeError(typeDefinition);
         }
 
         buildCtx.put(inputType);
@@ -331,7 +341,9 @@ private GraphQLUnionType buildUnionType(BuildContext buildCtx, UnionTypeDefiniti
         builder.typeResolver(getTypeResolver(buildCtx, typeDefinition.getName()));
 
         typeDefinition.getMemberTypes().forEach(mt -> {
-            builder.possibleType(new GraphQLTypeReference(((TypeName) mt).getName()));
+            TypeDefinition memberTypeDef = buildCtx.getTypeDefinition(mt);
+            GraphQLObjectType objectType = buildObjectType(buildCtx, (ObjectTypeDefinition) memberTypeDef);
+            builder.possibleType(objectType);
         });
         return builder.build();
     }
diff --git a/src/main/java/graphql/schema/idl/errors/NotAnInputTypeError.java b/src/main/java/graphql/schema/idl/errors/NotAnInputTypeError.java
@@ -0,0 +1,12 @@
+package graphql.schema.idl.errors;
+
+import graphql.language.TypeDefinition;
+
+import static java.lang.String.format;
+
+public class NotAnInputTypeError extends BaseError {
+
+    public NotAnInputTypeError(TypeDefinition typeDefinition) {
+        super(typeDefinition, format("The %s type is used as an InputType, but is not declared as one", typeDefinition.getName()));
+    }
+}
diff --git a/src/main/java/graphql/schema/idl/errors/NotAnOutputTypeError.java b/src/main/java/graphql/schema/idl/errors/NotAnOutputTypeError.java
@@ -0,0 +1,12 @@
+package graphql.schema.idl.errors;
+
+import graphql.language.TypeDefinition;
+
+import static java.lang.String.format;
+
+public class NotAnOutputTypeError extends BaseError {
+
+    public NotAnOutputTypeError(TypeDefinition typeDefinition) {
+        super(typeDefinition, format("The %s type is used as an OutputType, but is not declared as one", typeDefinition.getName()));
+    }
+}
diff --git a/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy b/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy
@@ -2,6 +2,8 @@ package graphql.schema.idl
 
 import graphql.TypeResolutionEnvironment
 import graphql.schema.*
+import graphql.schema.idl.errors.NotAnInputTypeError
+import graphql.schema.idl.errors.NotAnOutputTypeError
 import spock.lang.Specification
 
 import java.util.function.UnaryOperator
@@ -479,8 +481,61 @@ class SchemaGeneratorTest extends Specification {
 
         type.interfaces.size() == 1
         type.interfaces[0].name == "Character"
+    }
+
+    def "Type used as inputType should throw appropriate error #425"() {
+        when:
+        def spec = """
+            schema {
+                query: Query
+            }
+            
+            type Query {
+                findCharacter(character: CharacterInput!): Boolean
+            }
+            
+            # CharacterInput must be an input, but is a type
+            type CharacterInput {
+                firstName: String
+                lastName: String
+                family: Boolean
+            }
+        """
+        def wiring = RuntimeWiring.newRuntimeWiring()
+                .build()
+
+        generateSchema(spec, wiring)
 
+        then:
+        def err = thrown(NotAnInputTypeError.class)
+        err.message == "The CharacterInput type is used as an InputType, but is not declared as one"
+    }
+
+    def "InputType used as type should throw appropriate error #425"() {
+        when:
+        def spec = """
+            schema {
+                query: Query
+            }
+            
+            type Query {
+                findCharacter: CharacterInput
+            }
+            
+            # CharacterInput must be an input, but is a type
+            input CharacterInput {
+                firstName: String
+                lastName: String
+                family: Boolean
+            }
+        """
+        def wiring = RuntimeWiring.newRuntimeWiring()
+                .build()
 
+        generateSchema(spec, wiring)
 
+        then:
+        def err = thrown(NotAnOutputTypeError.class)
+        err.message == "The CharacterInput type is used as an OutputType, but is not declared as one"
     }
 }
