graphql-java · bbakerman · Jun 7, 2023 · May 29, 2023
diff --git a/src/main/java/graphql/ExecutionInput.java b/src/main/java/graphql/ExecutionInput.java
@@ -1,6 +1,5 @@
 package graphql;
 
-import graphql.cachecontrol.CacheControl;
 import graphql.collect.ImmutableKit;
 import graphql.execution.ExecutionId;
 import graphql.execution.RawVariables;
@@ -28,7 +27,6 @@ public class ExecutionInput {
     private final RawVariables rawVariables;
     private final Map<String, Object> extensions;
     private final DataLoaderRegistry dataLoaderRegistry;
-    private final CacheControl cacheControl;
     private final ExecutionId executionId;
     private final Locale locale;
 
@@ -42,7 +40,6 @@ private ExecutionInput(Builder builder) {
         this.root = builder.root;
         this.rawVariables = builder.rawVariables;
         this.dataLoaderRegistry = builder.dataLoaderRegistry;
-        this.cacheControl = builder.cacheControl;
         this.executionId = builder.executionId;
         this.locale = builder.locale != null ? builder.locale : Locale.getDefault(); // always have a locale in place
         this.localContext = builder.localContext;
@@ -119,16 +116,6 @@ public DataLoaderRegistry getDataLoaderRegistry() {
         return dataLoaderRegistry;
     }
 
-    /**
-     * @return the cache control helper associated with this execution
-     *
-     * @deprecated - Apollo has deprecated the Cache Control specification
-     */
-    @Deprecated
-    @DeprecatedAt("2022-07-26")
-    public CacheControl getCacheControl() {
-        return cacheControl;
-    }
 
     /**
      * @return Id that will be/was used to execute this operation.
@@ -170,7 +157,6 @@ public ExecutionInput transform(Consumer<Builder> builderConsumer) {
                 .localContext(this.localContext)
                 .root(this.root)
                 .dataLoaderRegistry(this.dataLoaderRegistry)
-                .cacheControl(this.cacheControl)
                 .variables(this.rawVariables.toMap())
                 .extensions(this.extensions)
                 .executionId(this.executionId)
@@ -229,8 +215,6 @@ public static class Builder {
         // dataloader field tracking away.
         //
         private DataLoaderRegistry dataLoaderRegistry = DataLoaderDispatcherInstrumentationState.EMPTY_DATALOADER_REGISTRY;
-        @DeprecatedAt("2022-07-26")
-        private CacheControl cacheControl = CacheControl.newCacheControl();
         private Locale locale = Locale.getDefault();
         private ExecutionId executionId;
 
@@ -399,13 +383,6 @@ public Builder dataLoaderRegistry(DataLoaderRegistry dataLoaderRegistry) {
             return this;
         }
 
-        @Deprecated
-        @DeprecatedAt("2022-07-26")
-        public Builder cacheControl(CacheControl cacheControl) {
-            this.cacheControl = assertNotNull(cacheControl);
-            return this;
-        }
-
         public ExecutionInput build() {
             return new ExecutionInput(this);
         }

diff --git a/src/main/java/graphql/cachecontrol/CacheControl.java b/src/main/java/graphql/cachecontrol/CacheControl.java
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -90,7 +90,6 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
                 .document(document)
                 .operationDefinition(operationDefinition)
                 .dataLoaderRegistry(executionInput.getDataLoaderRegistry())
-                .cacheControl(executionInput.getCacheControl())
                 .locale(executionInput.getLocale())
                 .valueUnboxer(valueUnboxer)
                 .executionInput(executionInput)

diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -8,7 +8,6 @@
 import graphql.GraphQLContext;
 import graphql.GraphQLError;
 import graphql.PublicApi;
-import graphql.cachecontrol.CacheControl;
 import graphql.collect.ImmutableKit;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.InstrumentationState;
@@ -52,7 +51,6 @@ public class ExecutionContext {
     private final AtomicReference<ImmutableList<GraphQLError>> errors = new AtomicReference<>(ImmutableKit.emptyList());
     private final Set<ResultPath> errorPaths = new HashSet<>();
     private final DataLoaderRegistry dataLoaderRegistry;
-    private final CacheControl cacheControl;
     private final Locale locale;
     private final ValueUnboxer valueUnboxer;
     private final ExecutionInput executionInput;
@@ -74,7 +72,6 @@ public class ExecutionContext {
         this.root = builder.root;
         this.instrumentation = builder.instrumentation;
         this.dataLoaderRegistry = builder.dataLoaderRegistry;
-        this.cacheControl = builder.cacheControl;
         this.locale = builder.locale;
         this.valueUnboxer = builder.valueUnboxer;
         this.errors.set(builder.errors);
@@ -166,12 +163,6 @@ public DataLoaderRegistry getDataLoaderRegistry() {
         return dataLoaderRegistry;
     }
 
-    @Deprecated
-    @DeprecatedAt("2022-07-26")
-    public CacheControl getCacheControl() {
-        return cacheControl;
-    }
-
     public Locale getLocale() {
         return locale;
     }

diff --git a/src/main/java/graphql/execution/ExecutionContextBuilder.java b/src/main/java/graphql/execution/ExecutionContextBuilder.java
@@ -8,7 +8,6 @@
 import graphql.GraphQLError;
 import graphql.Internal;
 import graphql.PublicApi;
-import graphql.cachecontrol.CacheControl;
 import graphql.collect.ImmutableKit;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.InstrumentationState;
@@ -42,7 +41,6 @@ public class ExecutionContextBuilder {
     CoercedVariables coercedVariables = CoercedVariables.emptyVariables();
     ImmutableMap<String, FragmentDefinition> fragmentsByName = ImmutableKit.emptyMap();
     DataLoaderRegistry dataLoaderRegistry;
-    CacheControl cacheControl;
     Locale locale;
     ImmutableList<GraphQLError> errors = emptyList();
     ValueUnboxer valueUnboxer;
@@ -89,7 +87,6 @@ public ExecutionContextBuilder() {
         coercedVariables = other.getCoercedVariables();
         fragmentsByName = ImmutableMap.copyOf(other.getFragmentsByName());
         dataLoaderRegistry = other.getDataLoaderRegistry();
-        cacheControl = other.getCacheControl();
         locale = other.getLocale();
         errors = ImmutableList.copyOf(other.getErrors());
         valueUnboxer = other.getValueUnboxer();
@@ -194,13 +191,6 @@ public ExecutionContextBuilder dataLoaderRegistry(DataLoaderRegistry dataLoaderR
         return this;
     }
 
-    @Deprecated
-    @DeprecatedAt("2022-07-26")
-    public ExecutionContextBuilder cacheControl(CacheControl cacheControl) {
-        this.cacheControl = cacheControl;
-        return this;
-    }
-
     public ExecutionContextBuilder locale(Locale locale) {
         this.locale = locale;
         return this;