From 62118c6a09a298f578004d3ee303b2d5b9857192 Mon Sep 17 00:00:00 2001
From: Brad Baker <bbaker@atlassian.com>
Date: Sun, 10 Mar 2024 11:16:09 +1100
Subject: [PATCH] Removed deprecated methods in ExecutionContext

---
 src/main/java/graphql/execution/ExecutionContext.java  | 10 ----------
 .../graphql/schema/DataFetchingEnvironmentImpl.java    |  2 +-
 .../execution/ExecutionContextBuilderTest.groovy       |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
index 71f6c1827b..fac002a060 100644
--- a/src/main/java/graphql/execution/ExecutionContext.java
+++ b/src/main/java/graphql/execution/ExecutionContext.java
@@ -120,16 +120,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
index d94197141e..4377330e48 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 eb35f277b7..210c442989 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