refactor the normalized input to contain literals

andimarek · andimarek · commit 4e019793590e · 2021-05-14T18:38:32.000+10:00
diff --git a/src/main/java/graphql/execution/ValuesResolver.java b/src/main/java/graphql/execution/ValuesResolver.java
diff --git a/src/main/java/graphql/normalized/FieldCollectorNormalizedQuery.java b/src/main/java/graphql/normalized/FieldCollectorNormalizedQuery.java
@@ -209,7 +209,7 @@ private void collectField(FieldCollectorNormalizedQueryParams parameters,
                 Map<String, Object> argumentValues = valuesResolver.getArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getCoercedVariableValues());
                 Map<String, NormalizedInputValue> normalizedArgumentValues = null;
                 if (parameters.getNormalizedVariableValues() != null) {
-                    normalizedArgumentValues = valuesResolver.getNormalizedArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getCoercedVariableValues(), parameters.getNormalizedVariableValues());
+                    normalizedArgumentValues = valuesResolver.getNormalizedArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getNormalizedVariableValues());
                 }
                 NormalizedField newFieldWTC = NormalizedField.newQueryExecutionField()
                         .alias(field.getAlias())
diff --git a/src/main/java/graphql/normalized/NormalizedInputValue.java b/src/main/java/graphql/normalized/NormalizedInputValue.java
@@ -1,7 +1,11 @@
 package graphql.normalized;
 
+import graphql.language.Value;
+
 import java.util.Objects;
 
+import static graphql.language.AstPrinter.printAst;
+
 /**
  * A value with type information.
  */
@@ -62,6 +66,9 @@ public boolean equals(Object o) {
             return false;
         }
         NormalizedInputValue that = (NormalizedInputValue) o;
+        if (value instanceof Value && that.value instanceof Value) {
+            return Objects.equals(typeName, that.typeName) && Objects.equals(printAst((Value) value), printAst((Value) that.value));
+        }
         return Objects.equals(typeName, that.typeName) && Objects.equals(value, that.value);
     }
 
diff --git a/src/main/java/graphql/normalized/NormalizedQueryTreeFactory.java b/src/main/java/graphql/normalized/NormalizedQueryTreeFactory.java
@@ -58,7 +58,7 @@ private NormalizedQueryTree createNormalizedQueryImplWithRawVariables(GraphQLSch
 
         List<VariableDefinition> variableDefinitions = operationDefinition.getVariableDefinitions();
         Map<String, Object> coerceVariableValues = valuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, rawVariables);
-        Map<String, NormalizedInputValue> normalizedVariableValues = valuesResolver.coerceNormalizedVariableValues(graphQLSchema, variableDefinitions, rawVariables);
+        Map<String, NormalizedInputValue> normalizedVariableValues = valuesResolver.getNormalizedVariableValues(graphQLSchema, variableDefinitions, rawVariables);
         return createNormalizedQueryImpl(graphQLSchema, operationDefinition, fragments, coerceVariableValues, normalizedVariableValues);
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -126,7 +126,7 @@ public Object parseLiteral(Object input) {
     @Internal
     public Value valueToLiteral(Object input) {
         GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(input.toString());
-        assertNotNull(enumValueDefinition, () -> "Invalid input for Enum '" + name + "'. No value found for name '" + input.toString() + "'");
+        assertNotNull(enumValueDefinition, () -> "Invalid input for Enum '" + name + "'. No value found for name '" + input + "'");
         return EnumValue.newEnumValue(enumValueDefinition.getName()).build();
 
     }
diff --git a/src/test/groovy/graphql/normalized/NormalizedQueryTreeFactoryTest.groovy b/src/test/groovy/graphql/normalized/NormalizedQueryTreeFactoryTest.groovy
@@ -14,6 +14,8 @@ import graphql.util.TraverserContext
 import graphql.util.TraverserVisitorStub
 import spock.lang.Specification
 
+import static graphql.language.AstPrinter.printAst
+import static graphql.parser.Parser.parseValue
 import static graphql.schema.FieldCoordinates.coordinates
 
 class NormalizedQueryTreeFactoryTest extends Specification {
@@ -1091,7 +1093,7 @@ schema {
                 var2: [foo: "foo", input2: [bar: 123]]
         ]
         // the normalized arg value should be the same regardless of how the value was provided
-        def expectedNormalizedArgValue = [foo: new NormalizedInputValue("String", "foo"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 123)])]
+        def expectedNormalizedArgValue = [foo: new NormalizedInputValue("String", parseValue('"foo"')), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", parseValue("123"))])]
         when:
         def tree = dependencyGraph.createNormalizedQueryWithRawVariables(graphQLSchema, document, null, variables)
         def topLevelField = tree.getTopLevelFields().get(0)
@@ -1102,7 +1104,7 @@ schema {
 
         then:
         topLevelField.getNormalizedArgument("id").getTypeName() == "ID"
-        topLevelField.getNormalizedArgument("id").getValue() == "123"
+        printAst(topLevelField.getNormalizedArgument("id").getValue()) == '"123"'
 
         arg1.getTypeName() == "Input1"
         arg1.getValue() == expectedNormalizedArgValue
@@ -1151,16 +1153,16 @@ schema {
 
         then:
         arg1.typeName == "[ID!]"
-        arg1.value == ["1", "2"]
+        arg1.value.collect { printAst(it) } == ['"1"', '"2"']
         arg2.typeName == "[[Input1]]"
         arg2.value == [[
-                               [foo: new NormalizedInputValue("String", "foo1"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 123)])],
-                               [foo: new NormalizedInputValue("String", "foo2"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 456)])]
+                               [foo: new NormalizedInputValue("String", parseValue('"foo1"')), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", parseValue("123"))])],
+                               [foo: new NormalizedInputValue("String", parseValue('"foo2"')), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", parseValue("456"))])]
                        ]]
 
         arg3.getTypeName() == "[Input1]"
         arg3.value == [
-                [foo: new NormalizedInputValue("String", "foo3"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 789)])],
+                [foo: new NormalizedInputValue("String", parseValue('"foo3"')), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", parseValue("789"))])],
         ]
 
 
@@ -1204,10 +1206,10 @@ schema {
         then:
         arg1.typeName == "[[Input1]]"
         arg1.value == [[
-                               [foo: new NormalizedInputValue("String", "foo1"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 123)])],
+                               [foo: new NormalizedInputValue("String", parseValue('"foo1"')), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", parseValue("123"))])],
                        ]]
         arg2.typeName == "[[ID!]!]"
-        arg2.value == [["1"], ["2"]]
+        arg2.value.collect { outer -> outer.collect { printAst(it) } } == [['"1"'], ['"2"']]
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private void collectField(FieldCollectorNormalizedQueryParams parameters,`
`209`	`209`	`Map<String, Object> argumentValues = valuesResolver.getArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getCoercedVariableValues());`
`210`	`210`	`Map<String, NormalizedInputValue> normalizedArgumentValues = null;`
`211`	`211`	`if (parameters.getNormalizedVariableValues() != null) {`
`212`		`- normalizedArgumentValues = valuesResolver.getNormalizedArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getCoercedVariableValues(), parameters.getNormalizedVariableValues());`
	`212`	`+ normalizedArgumentValues = valuesResolver.getNormalizedArgumentValues(fieldDefinition.getArguments(), field.getArguments(), parameters.getNormalizedVariableValues());`
`213`	`213`	`}`
`214`	`214`	`NormalizedField newFieldWTC = NormalizedField.newQueryExecutionField()`
`215`	`215`	`.alias(field.getAlias())`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private NormalizedQueryTree createNormalizedQueryImplWithRawVariables(GraphQLSch`
`58`	`58`
`59`	`59`	`List<VariableDefinition> variableDefinitions = operationDefinition.getVariableDefinitions();`
`60`	`60`	`Map<String, Object> coerceVariableValues = valuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, rawVariables);`
`61`		`- Map<String, NormalizedInputValue> normalizedVariableValues = valuesResolver.coerceNormalizedVariableValues(graphQLSchema, variableDefinitions, rawVariables);`
	`61`	`+ Map<String, NormalizedInputValue> normalizedVariableValues = valuesResolver.getNormalizedVariableValues(graphQLSchema, variableDefinitions, rawVariables);`
`62`	`62`	`return createNormalizedQueryImpl(graphQLSchema, operationDefinition, fragments, coerceVariableValues, normalizedVariableValues);`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public Object parseLiteral(Object input) {`
`126`	`126`	`@Internal`
`127`	`127`	`public Value valueToLiteral(Object input) {`
`128`	`128`	`GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(input.toString());`
`129`		`- assertNotNull(enumValueDefinition, () -> "Invalid input for Enum '" + name + "'. No value found for name '" + input.toString() + "'");`
	`129`	`+ assertNotNull(enumValueDefinition, () -> "Invalid input for Enum '" + name + "'. No value found for name '" + input + "'");`
`130`	`130`	`return EnumValue.newEnumValue(enumValueDefinition.getName()).build();`
`131`	`131`
`132`	`132`	`}`