Skip to content

Commit 62ccc28

Browse files
committed
Changed calls to coerce to NOT use new environment
1 parent 5386876 commit 62ccc28

31 files changed

Lines changed: 174 additions & 388 deletions

‎src/main/java/graphql/analysis/NodeVisitorWithTypeTracking.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import graphql.util.TraversalControl;
3030
import graphql.util.TraverserContext;
3131

32+
import java.util.Locale;
3233
import java.util.Map;
3334

3435
import static graphql.Assert.assertNotNull;
@@ -151,7 +152,7 @@ public TraversalControl visitField(Field field, TraverserContext<Node> context)
151152
boolean isTypeNameIntrospectionField = fieldDefinition == schema.getIntrospectionTypenameFieldDefinition();
152153
GraphQLFieldsContainer fieldsContainer = !isTypeNameIntrospectionField ? (GraphQLFieldsContainer) unwrapAll(parentEnv.getOutputType()) : null;
153154
GraphQLCodeRegistry codeRegistry = schema.getCodeRegistry();
154-
Map<String, Object> argumentValues = ValuesResolver.getArgumentValues(codeRegistry, fieldDefinition.getArguments(), field.getArguments(), CoercedVariables.of(variables));
155+
Map<String, Object> argumentValues = ValuesResolver.getArgumentValues(codeRegistry, fieldDefinition.getArguments(), field.getArguments(), CoercedVariables.of(variables), Locale.getDefault());
155156
QueryVisitorFieldEnvironment environment = new QueryVisitorFieldEnvironmentImpl(isTypeNameIntrospectionField,
156157
field,
157158
fieldDefinition,

‎src/main/java/graphql/analysis/QueryTraverser.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Collections;
2121
import java.util.LinkedHashMap;
2222
import java.util.List;
23+
import java.util.Locale;
2324
import java.util.Map;
2425

2526
import static graphql.Assert.assertNotNull;
@@ -70,7 +71,7 @@ private QueryTraverser(GraphQLSchema schema,
7071
this.fragmentsByName = getOperationResult.fragmentsByName;
7172
this.roots = singletonList(getOperationResult.operationDefinition);
7273
this.rootParentType = getRootTypeFromOperation(getOperationResult.operationDefinition);
73-
this.coercedVariables = ValuesResolver.coerceVariableValues(schema, variableDefinitions, rawVariables);
74+
this.coercedVariables = ValuesResolver.coerceVariableValues(schema, variableDefinitions, rawVariables, Locale.getDefault());
7475
}
7576

7677
private QueryTraverser(GraphQLSchema schema,

‎src/main/java/graphql/execution/ConditionalNodes.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import graphql.language.NodeUtil;
77

88
import java.util.List;
9+
import java.util.Locale;
910
import java.util.Map;
1011

1112
import static graphql.Directives.IncludeDirective;
@@ -30,7 +31,7 @@ public boolean shouldInclude(Map<String, Object> variables, List<Directive> dire
3031
private boolean getDirectiveResult(Map<String, Object> variables, List<Directive> directives, String directiveName, boolean defaultValue) {
3132
Directive foundDirective = NodeUtil.findNodeByName(directives, directiveName);
3233
if (foundDirective != null) {
33-
Map<String, Object> argumentValues = ValuesResolver.getArgumentValues(SkipDirective.getArguments(), foundDirective.getArguments(), CoercedVariables.of(variables));
34+
Map<String, Object> argumentValues = ValuesResolver.getArgumentValues(SkipDirective.getArguments(), foundDirective.getArguments(), CoercedVariables.of(variables), Locale.getDefault());
3435
Object flag = argumentValues.get("if");
3536
Assert.assertTrue(flag instanceof Boolean, () -> String.format("The '%s' directive MUST have a value for the 'if' argument", directiveName));
3637
return (Boolean) flag;

‎src/main/java/graphql/execution/Execution.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
6666

6767
CoercedVariables coercedVariables;
6868
try {
69-
coercedVariables = ValuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, inputVariables);
69+
coercedVariables = ValuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, inputVariables, executionInput.getLocale());
7070
} catch (RuntimeException rte) {
7171
if (rte instanceof GraphQLError) {
7272
return completedFuture(new ExecutionResultImpl((GraphQLError) rte));

‎src/main/java/graphql/execution/ExecutionStepInfoFactory.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public ExecutionStepInfo newExecutionStepInfoForSubField(ExecutionContext execut
2323
GraphQLOutputType fieldType = fieldDefinition.getType();
2424
List<Argument> fieldArgs = mergedField.getArguments();
2525
GraphQLCodeRegistry codeRegistry = executionContext.getGraphQLSchema().getCodeRegistry();
26-
Supplier<Map<String, Object>> argumentValues = FpKit.intraThreadMemoize(() -> ValuesResolver.getArgumentValues(codeRegistry, fieldDefinition.getArguments(), fieldArgs, executionContext.getCoercedVariables()));
26+
Supplier<Map<String, Object>> argumentValuesSupplier = () -> ValuesResolver.getArgumentValues(codeRegistry, fieldDefinition.getArguments(), fieldArgs, executionContext.getCoercedVariables(), executionContext.getLocale());
27+
Supplier<Map<String, Object>> argumentValues = FpKit.intraThreadMemoize(argumentValuesSupplier);
2728

2829
ResultPath newPath = parentInfo.getPath().segment(mergedField.getResultKey());
2930

‎src/main/java/graphql/execution/ExecutionStrategy.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import graphql.language.Field;
2424
import graphql.normalized.ExecutableNormalizedField;
2525
import graphql.normalized.ExecutableNormalizedOperation;
26-
import graphql.schema.CoercingEnvironment;
2726
import graphql.schema.CoercingSerializeException;
2827
import graphql.schema.DataFetcher;
2928
import graphql.schema.DataFetchingEnvironment;
@@ -591,9 +590,7 @@ protected FieldValueInfo completeValueForList(ExecutionContext executionContext,
591590
protected CompletableFuture<ExecutionResult> completeValueForScalar(ExecutionContext executionContext, ExecutionStrategyParameters parameters, GraphQLScalarType scalarType, Object result) {
592591
Object serialized;
593592
try {
594-
CoercingEnvironment<Object> environment = CoercingEnvironment.newEnvironment()
595-
.value(result).locale(executionContext.getLocale()).build();
596-
serialized = scalarType.getCoercing().serialize(environment);
593+
serialized = scalarType.getCoercing().serialize(result, executionContext.getLocale());
597594
} catch (CoercingSerializeException e) {
598595
serialized = handleCoercionProblem(executionContext, parameters, e);
599596
}
@@ -823,7 +820,8 @@ protected ExecutionStepInfo createExecutionStepInfo(ExecutionContext executionCo
823820
if (!fieldArgDefs.isEmpty()) {
824821
List<Argument> fieldArgs = field.getArguments();
825822
GraphQLCodeRegistry codeRegistry = executionContext.getGraphQLSchema().getCodeRegistry();
826-
argumentValues = FpKit.intraThreadMemoize(() -> ValuesResolver.getArgumentValues(codeRegistry, fieldArgDefs, fieldArgs, executionContext.getCoercedVariables()));
823+
Supplier<Map<String, Object>> argValuesSupplier = () -> ValuesResolver.getArgumentValues(codeRegistry, fieldArgDefs, fieldArgs, executionContext.getCoercedVariables(), executionContext.getLocale());
824+
argumentValues = FpKit.intraThreadMemoize(argValuesSupplier);
827825
}
828826

829827

0 commit comments

Comments
 (0)