This adds support for QueryAppliedDirective on operations and documents - used field to make it cheaper

bbakerman · bbakerman · commit 8f049fe2332e · 2026-03-07T10:44:26.000+11:00
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -111,7 +111,8 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
         ResponseMapFactory responseMapFactory = GraphQL.unusualConfiguration(graphQLContext)
                 .responseMapFactory().getOr(ResponseMapFactory.DEFAULT);
 
-        Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> opDirectivesMap = operationDirectivesResolver.resolveDirectives(document, graphQLSchema, coercedVariables, graphQLContext, locale);
+        Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> operationDirectives = operationDirectivesResolver
+                .resolveDirectives(document, graphQLSchema, coercedVariables, graphQLContext, locale);
 
         ExecutionContext executionContext = newExecutionContextBuilder()
                 .instrumentation(instrumentation)
@@ -130,7 +131,7 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
                 .normalizedVariableValues(normalizedVariableValues)
                 .document(document)
                 .operationDefinition(getOperationResult.operationDefinition)
-                .operationDirectives(opDirectivesMap)
+                .operationDirectives(operationDirectives)
                 .dataLoaderRegistry(executionInput.getDataLoaderRegistry())
                 .locale(locale)
                 .valueUnboxer(valueUnboxer)
diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -75,7 +75,8 @@ public class ExecutionContext {
     private final ResultNodesInfo resultNodesInfo = new ResultNodesInfo();
     private final EngineRunningState engineRunningState;
 
-    private final Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> opDirectivesMap;
+    private final Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> allOperationsDirectives;
+    private final Map<String, ImmutableList<QueryAppliedDirective>> operationDirectives;
     private final Profiler profiler;
 
     ExecutionContext(ExecutionContextBuilder builder) {
@@ -105,8 +106,10 @@ public class ExecutionContext {
         this.queryTree = FpKit.interThreadMemoize(() -> ExecutableNormalizedOperationFactory.createExecutableNormalizedOperation(graphQLSchema, operationDefinition, fragmentsByName, coercedVariables));
         this.propagateErrorsOnNonNullContractFailure = builder.propagateErrorsOnNonNullContractFailure;
         this.engineRunningState = builder.engineRunningState;
-        this.opDirectivesMap = builder.opDirectivesMap;
         this.profiler = builder.profiler;
+        this.allOperationsDirectives = builder.opDirectivesMap;
+        List<QueryAppliedDirective> list = allOperationsDirectives.get(getOperationDefinition());
+        this.operationDirectives = OperationDirectivesResolver.toAppliedDirectivesByName(list);
     }
 
     public ExecutionId getExecutionId() {
@@ -145,16 +148,15 @@ public OperationDefinition getOperationDefinition() {
      * @return the map of {@link QueryAppliedDirective}s by name that were on this executing operation
      */
     public Map<String, ImmutableList<QueryAppliedDirective>> getOperationDirectives() {
-        List<QueryAppliedDirective> list = opDirectivesMap.get(getOperationDefinition());
-        return OperationDirectivesResolver.toAppliedDirectivesByName(list);
+        return operationDirectives;
     }
 
     /**
      * @return the map of all the  {@link QueryAppliedDirective}s that were on the {@link Document} including
      * {@link OperationDefinition}s that are not currently executing.
      */
     public Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> getAllOperationDirectives() {
-        return opDirectivesMap;
+        return allOperationsDirectives;
     }
 
     public CoercedVariables getCoercedVariables() {
