diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java index 3cc63fb83..e459cbe0a 100644 --- a/src/main/java/graphql/execution/ExecutionContext.java +++ b/src/main/java/graphql/execution/ExecutionContext.java @@ -122,16 +122,6 @@ public OperationDefinition getOperationDefinition() { return operationDefinition; } - /** - * @return map of coerced variables - * - * @deprecated use {@link #getCoercedVariables()} instead - */ - @Deprecated(since = "2022-05-24") - public Map getVariables() { - return coercedVariables.toMap(); - } - public CoercedVariables getCoercedVariables() { return coercedVariables; } diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java index d94197141..4377330e4 100644 --- a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java +++ b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java @@ -94,7 +94,7 @@ public static Builder newDataFetchingEnvironment(ExecutionContext executionConte .locale(executionContext.getLocale()) .document(executionContext.getDocument()) .operationDefinition(executionContext.getOperationDefinition()) - .variables(executionContext.getVariables()) + .variables(executionContext.getCoercedVariables().toMap()) .executionId(executionContext.getExecutionId()); } diff --git a/src/test/groovy/graphql/execution/ExecutionContextBuilderTest.groovy b/src/test/groovy/graphql/execution/ExecutionContextBuilderTest.groovy index eb35f277b..210c44298 100644 --- a/src/test/groovy/graphql/execution/ExecutionContextBuilderTest.groovy +++ b/src/test/groovy/graphql/execution/ExecutionContextBuilderTest.groovy @@ -54,7 +54,7 @@ class ExecutionContextBuilderTest extends Specification { executionContext.root == root executionContext.context == context // Retain deprecated method for test coverage executionContext.graphQLContext == graphQLContext - executionContext.variables == [var: 'value'] // Retain deprecated method for test coverage + executionContext.getCoercedVariables().toMap() == [var: 'value'] executionContext.getFragmentsByName() == [MyFragment: fragment] executionContext.operationDefinition == operation executionContext.dataLoaderRegistry == dataLoaderRegistry