Merge pull request #2014 from dugenkui03/fix_for_ValuesResolver

andimarek · web-flow · commit 34f34fee9d2f · 2020-10-20T11:40:07.000+11:00
Fix getArgumentValuesImpl according by spec.CoerceArgumentValues()
diff --git a/src/main/java/graphql/execution/ValuesResolver.java b/src/main/java/graphql/execution/ValuesResolver.java
@@ -108,7 +108,10 @@ private Map<String, Object> getArgumentValuesImpl(GraphQLCodeRegistry codeRegist
             if (argument != null) {
                 value = coerceValueAst(codeRegistry.getFieldVisibility(), fieldArgument.getType(), argument.getValue(), variables);
             }
-            if (value == null) {
+            if (value == null
+                    && !(argument != null && argument.getValue() instanceof NullValue)
+                    && !(argument != null && argument.getValue() instanceof VariableReference && variables.containsKey(((VariableReference) argument.getValue()).getName()))
+            ) {
                 value = fieldArgument.getDefaultValue();
             }
             boolean wasValueProvided = false;
diff --git a/src/test/groovy/graphql/execution/ValuesResolverTest.groovy b/src/test/groovy/graphql/execution/ValuesResolverTest.groovy
@@ -9,6 +9,7 @@ import graphql.language.EnumValue
 import graphql.language.IntValue
 import graphql.language.ListType
 import graphql.language.NonNullType
+import graphql.language.NullValue
 import graphql.language.ObjectField
 import graphql.language.ObjectValue
 import graphql.language.StringValue
@@ -449,4 +450,40 @@ class ValuesResolverTest extends Specification {
         then:
         thrown(GraphQLException)
     }
+
+    // Note: use NullValue defined in Field when it exists,
+    // and ignore defaultValue defined in type system
+    def "getArgumentValues: use null value when argumentValue defined in Field is null"() {
+        given: "schema defining input object"
+        def inputObjectType = newInputObject()
+                .name("inputObject")
+                .build()
+
+        def fieldArgument = new GraphQLArgument("arg", "", inputObjectType, "hello")
+        def argument = new Argument("arg", NullValue.newNullValue().build())
+
+        when:
+        def variables = [:]
+        def values = resolver.getArgumentValues([fieldArgument], [argument], variables)
+
+        then:
+        values['arg'] == null
+    }
+
+    def "getArgumentValues: use null when reference value in variables is null"() {
+        given: "schema defining input object"
+        def inputObjectType = newInputObject()
+                .name("inputObject")
+                .build()
+
+        def fieldArgument = new GraphQLArgument("arg", "", inputObjectType, "hello")
+        def argument = new Argument("arg", new VariableReference("var"))
+
+        when:
+        def variables = ["var": null]
+        def values = resolver.getArgumentValues([fieldArgument], [argument], variables)
+
+        then:
+        values['arg'] == null
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,10 @@ private Map<String, Object> getArgumentValuesImpl(GraphQLCodeRegistry codeRegist`
`108`	`108`	`if (argument != null) {`
`109`	`109`	`value = coerceValueAst(codeRegistry.getFieldVisibility(), fieldArgument.getType(), argument.getValue(), variables);`
`110`	`110`	`}`
`111`		`- if (value == null) {`
	`111`	`+ if (value == null`
	`112`	`+ && !(argument != null && argument.getValue() instanceof NullValue)`
	`113`	`+ && !(argument != null && argument.getValue() instanceof VariableReference && variables.containsKey(((VariableReference) argument.getValue()).getName()))`
	`114`	`+ ) {`
`112`	`115`	`value = fieldArgument.getDefaultValue();`
`113`	`116`	`}`
`114`	`117`	`boolean wasValueProvided = false;`