Added source location of where a type was used incorrectly

jimkyndemeyer · bbakerman · commit 31b8cbcf02e4 · 2018-05-22T19:41:48.000+10:00
diff --git a/src/main/java/graphql/schema/idl/SchemaGenerator.java b/src/main/java/graphql/schema/idl/SchemaGenerator.java
@@ -307,7 +307,7 @@ private <T extends GraphQLOutputType> T buildOutputType(BuildContext buildCtx, T
             outputType = buildScalar(buildCtx, (ScalarTypeDefinition) typeDefinition);
         } else {
             // typeDefinition is not a valid output type
-            throw new NotAnOutputTypeError(typeDefinition);
+            throw new NotAnOutputTypeError(rawType, typeDefinition);
         }
 
         buildCtx.put(outputType);
@@ -340,7 +340,7 @@ private GraphQLInputType buildInputType(BuildContext buildCtx, Type rawType) {
             inputType = buildScalar(buildCtx, (ScalarTypeDefinition) typeDefinition);
         } else {
             // typeDefinition is not a valid InputType
-            throw new NotAnInputTypeError(typeDefinition);
+            throw new NotAnInputTypeError(rawType, typeDefinition);
         }
 
         buildCtx.put(inputType);
diff --git a/src/main/java/graphql/schema/idl/errors/NotAnInputTypeError.java b/src/main/java/graphql/schema/idl/errors/NotAnInputTypeError.java
@@ -1,12 +1,13 @@
 package graphql.schema.idl.errors;
 
+import graphql.language.Type;
 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 %s", typeDefinition.getName(), lineCol(typeDefinition)));
+    public NotAnInputTypeError(Type rawType, TypeDefinition typeDefinition) {
+        super(rawType, format("The type '%s' %s is not an input type, but was used as an input type %s", typeDefinition.getName(), lineCol(typeDefinition), lineCol(rawType)));
     }
 }
diff --git a/src/main/java/graphql/schema/idl/errors/NotAnOutputTypeError.java b/src/main/java/graphql/schema/idl/errors/NotAnOutputTypeError.java
@@ -1,12 +1,13 @@
 package graphql.schema.idl.errors;
 
+import graphql.language.Type;
 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 %s", typeDefinition.getName(), lineCol(typeDefinition)));
+    public NotAnOutputTypeError(Type rawType, TypeDefinition typeDefinition) {
+        super(rawType, format("The type '%s' %s is not an output type, but was used to declare the output type of a field %s", typeDefinition.getName(), lineCol(typeDefinition), lineCol(rawType)));
     }
 }
diff --git a/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy b/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy
@@ -634,7 +634,7 @@ class SchemaGeneratorTest extends Specification {
 
         then:
         def err = thrown(NotAnInputTypeError.class)
-        err.message == "expected InputType, but found CharacterInput type [@11:13]"
+        err.message == "The type 'CharacterInput' [@11:13] is not an input type, but was used as an input type [@7:42]"
     }
 
     def "InputType used as type should throw appropriate error #425"() {
@@ -659,7 +659,7 @@ class SchemaGeneratorTest extends Specification {
 
         then:
         def err = thrown(NotAnOutputTypeError.class)
-        err.message == "expected OutputType, but found CharacterInput type [@11:13]"
+        err.message == "The type 'CharacterInput' [@11:13] is not an output type, but was used to declare the output type of a field [@7:32]"
     }
 
     def "schema with subscription"() {

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`package graphql.schema.idl.errors;`
`2`	`2`
	`3`	`+import graphql.language.Type;`
`3`	`4`	`import graphql.language.TypeDefinition;`
`4`	`5`
`5`	`6`	`import static java.lang.String.format;`
`6`	`7`
`7`	`8`	`public class NotAnInputTypeError extends BaseError {`
`8`	`9`
`9`		`- public NotAnInputTypeError(TypeDefinition typeDefinition) {`
`10`		`- super(typeDefinition, format("expected InputType, but found %s type %s", typeDefinition.getName(), lineCol(typeDefinition)));`
	`10`	`+ public NotAnInputTypeError(Type rawType, TypeDefinition typeDefinition) {`
	`11`	`+ super(rawType, format("The type '%s' %s is not an input type, but was used as an input type %s", typeDefinition.getName(), lineCol(typeDefinition), lineCol(rawType)));`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ class SchemaGeneratorTest extends Specification {`
`634`	`634`
`635`	`635`	`then:`
`636`	`636`	`def err = thrown(NotAnInputTypeError.class)`
`637`		`- err.message == "expected InputType, but found CharacterInput type [@11:13]"`
	`637`	`+ err.message == "The type 'CharacterInput' [@11:13] is not an input type, but was used as an input type [@7:42]"`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`def "InputType used as type should throw appropriate error #425"() {`
`@@ -659,7 +659,7 @@ class SchemaGeneratorTest extends Specification {`
`659`	`659`
`660`	`660`	`then:`
`661`	`661`	`def err = thrown(NotAnOutputTypeError.class)`
`662`		`- err.message == "expected OutputType, but found CharacterInput type [@11:13]"`
	`662`	`+ err.message == "The type 'CharacterInput' [@11:13] is not an output type, but was used to declare the output type of a field [@7:32]"`
`663`	`663`	`}`
`664`	`664`
`665`	`665`	`def "schema with subscription"() {`