Now follows spec as discussed

bbakerman · andimarek · commit 8987ac67dc91 · 2017-10-08T15:26:52.000+11:00
diff --git a/src/main/java/graphql/execution/ValuesResolver.java b/src/main/java/graphql/execution/ValuesResolver.java
@@ -10,6 +10,7 @@
 import graphql.language.Value;
 import graphql.language.VariableDefinition;
 import graphql.language.VariableReference;
+import graphql.schema.CoercingParseValueException;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLEnumType;
 import graphql.schema.GraphQLInputObjectField;
@@ -145,19 +146,23 @@ private Object coerceValue(VariableDefinition variableDefinition, GraphQLType gr
             return returnValue;
         }
 
-        if (value == null) return null;
+        if (value == null) {
+            return null;
+        }
 
         if (graphQLType instanceof GraphQLScalarType) {
             return coerceValueForScalar((GraphQLScalarType) graphQLType, value);
         } else if (graphQLType instanceof GraphQLEnumType) {
             return coerceValueForEnum((GraphQLEnumType) graphQLType, value);
         } else if (graphQLType instanceof GraphQLList) {
             return coerceValueForList(variableDefinition, (GraphQLList) graphQLType, value);
-        } else if (graphQLType instanceof GraphQLInputObjectType && value instanceof Map) {
-            //noinspection unchecked
-            return coerceValueForInputObjectType(variableDefinition, (GraphQLInputObjectType) graphQLType, (Map<String, Object>) value);
         } else if (graphQLType instanceof GraphQLInputObjectType) {
-            return value;
+            if (value instanceof Map) {
+                //noinspection unchecked
+                return coerceValueForInputObjectType(variableDefinition, (GraphQLInputObjectType) graphQLType, (Map<String, Object>) value);
+            } else {
+                throw new CoercingParseValueException("Variables for GraphQLInputObjectType must be an instance of a Map according to the graphql specification.  The offending object was a " + value.getClass().getName());
+            }
         } else {
             return assertShouldNeverHappen("unhandled type " + graphQLType);
         }
diff --git a/src/test/groovy/graphql/Issue739.groovy b/src/test/groovy/graphql/Issue739.groovy
@@ -1,5 +1,6 @@
 package graphql
 
+import graphql.schema.CoercingParseValueException
 import graphql.schema.GraphQLObjectType
 import graphql.schema.idl.RuntimeWiring
 import spock.lang.Specification
@@ -85,6 +86,6 @@ class Issue739 extends Specification {
                 .join()
 
         then:
-        1 == varResult.getErrors().size()
+        thrown(CoercingParseValueException)
     }
 }
diff --git a/src/test/groovy/graphql/execution/ValuesResolverTest.groovy b/src/test/groovy/graphql/execution/ValuesResolverTest.groovy
@@ -16,6 +16,7 @@ import graphql.language.TypeName
 import graphql.language.Value
 import graphql.language.VariableDefinition
 import graphql.language.VariableReference
+import graphql.schema.CoercingParseValueException
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLList
 import graphql.schema.GraphQLNonNull
@@ -111,9 +112,9 @@ class ValuesResolverTest extends Specification {
 
         when:
         def obj = new Person('a', 123)
-        def resolvedValues = resolver.coerceArgumentValues(schema, [variableDefinition], [variable: obj])
+        resolver.coerceArgumentValues(schema, [variableDefinition], [variable: obj])
         then:
-        resolvedValues['variable'] == obj
+        thrown(CoercingParseValueException)
     }
 
     def "getVariableValues: simple value gets resolved to a list when the type is a List"() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package graphql`
`2`	`2`
	`3`	`+import graphql.schema.CoercingParseValueException`
`3`	`4`	`import graphql.schema.GraphQLObjectType`
`4`	`5`	`import graphql.schema.idl.RuntimeWiring`
`5`	`6`	`import spock.lang.Specification`
`@@ -85,6 +86,6 @@ class Issue739 extends Specification {`
`85`	`86`	`.join()`
`86`	`87`
`87`	`88`	`then:`
`88`		`- 1 == varResult.getErrors().size()`
	`89`	`+ thrown(CoercingParseValueException)`
`89`	`90`	`}`
`90`	`91`	`}`