425 improve wrong type exceptions (graphql-java#429)

dh94 · andimarek · commit 7e02a966b131 · 2017-05-13T07:48:12.000+02:00
better exceptions for incorrect types in IDL
diff --git a/src/main/java/graphql/schema/idl/SchemaGenerator.java b/src/main/java/graphql/schema/idl/SchemaGenerator.java
@@ -41,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;
@@ -212,8 +214,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);
@@ -242,8 +247,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);
@@ -461,4 +469,4 @@ private String buildDescription(Node node) {
         }
         return sb.toString();
     }
-}
+}
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("expected InputType, but found %s type", 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("expected OutputType, but found %s type", 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
@@ -595,7 +597,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 == "expected InputType, but found CharacterInput type"
+    }
+
+    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 == "expected OutputType, but found CharacterInput type"
     }
 }
