|
23 | 23 | import graphql.language.Field; |
24 | 24 | import graphql.normalized.ExecutableNormalizedField; |
25 | 25 | import graphql.normalized.ExecutableNormalizedOperation; |
26 | | -import graphql.schema.CoercingEnvironment; |
27 | 26 | import graphql.schema.CoercingSerializeException; |
28 | 27 | import graphql.schema.DataFetcher; |
29 | 28 | import graphql.schema.DataFetchingEnvironment; |
@@ -591,9 +590,7 @@ protected FieldValueInfo completeValueForList(ExecutionContext executionContext, |
591 | 590 | protected CompletableFuture<ExecutionResult> completeValueForScalar(ExecutionContext executionContext, ExecutionStrategyParameters parameters, GraphQLScalarType scalarType, Object result) { |
592 | 591 | Object serialized; |
593 | 592 | 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()); |
597 | 594 | } catch (CoercingSerializeException e) { |
598 | 595 | serialized = handleCoercionProblem(executionContext, parameters, e); |
599 | 596 | } |
@@ -823,7 +820,8 @@ protected ExecutionStepInfo createExecutionStepInfo(ExecutionContext executionCo |
823 | 820 | if (!fieldArgDefs.isEmpty()) { |
824 | 821 | List<Argument> fieldArgs = field.getArguments(); |
825 | 822 | 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); |
827 | 825 | } |
828 | 826 |
|
829 | 827 |
|
|
0 commit comments