Merge pull request #3512 from graphql-java/remove-deprecated-method-on-execution-context

andimarek · web-flow · commit 108910e9b5a4 · 2024-03-26T04:32:19.000Z
Removed deprecated methods in ExecutionContext
diff --git 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<String, Object> 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static Builder newDataFetchingEnvironment(ExecutionContext executionConte`
`94`	`94`	`.locale(executionContext.getLocale())`
`95`	`95`	`.document(executionContext.getDocument())`
`96`	`96`	`.operationDefinition(executionContext.getOperationDefinition())`
`97`		`- .variables(executionContext.getVariables())`
	`97`	`+ .variables(executionContext.getCoercedVariables().toMap())`
`98`	`98`	`.executionId(executionContext.getExecutionId());`
`99`	`99`	`}`
`100`	`100`