This adds support for QueryAppliedDirective on operations and documents - made it a supplier for performance

bbakerman · bbakerman · commit 17e7ccd1b932 · 2026-03-07T12:07:23.000+11:00
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -111,8 +111,8 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
         ResponseMapFactory responseMapFactory = GraphQL.unusualConfiguration(graphQLContext)
                 .responseMapFactory().getOr(ResponseMapFactory.DEFAULT);
 
-        Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> operationDirectives = operationDirectivesResolver
-                .resolveDirectives(document, graphQLSchema, coercedVariables, graphQLContext, locale);
+        Supplier<Map<OperationDefinition, ImmutableList<QueryAppliedDirective>>> operationDirectives = FpKit.interThreadMemoize(() ->
+                operationDirectivesResolver.resolveDirectives(document, graphQLSchema, coercedVariables, graphQLContext, locale));
 
         ExecutionContext executionContext = newExecutionContextBuilder()
                 .instrumentation(instrumentation)
diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -36,6 +36,8 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import static graphql.normalized.ExecutableNormalizedOperationFactory.*;
+
 @SuppressWarnings("TypeParameterUnusedInFormals")
 @PublicApi
 public class ExecutionContext {
@@ -75,8 +77,8 @@ public class ExecutionContext {
     private final ResultNodesInfo resultNodesInfo = new ResultNodesInfo();
     private final EngineRunningState engineRunningState;
 
-    private final Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> allOperationsDirectives;
-    private final Map<String, ImmutableList<QueryAppliedDirective>> operationDirectives;
+    private final Supplier<Map<OperationDefinition, ImmutableList<QueryAppliedDirective>>> allOperationsDirectives;
+    private final Supplier<Map<String, ImmutableList<QueryAppliedDirective>>> operationDirectives;
     private final Profiler profiler;
 
     ExecutionContext(ExecutionContextBuilder builder) {
@@ -103,13 +105,27 @@ public class ExecutionContext {
         this.localContext = builder.localContext;
         this.executionInput = builder.executionInput;
         this.dataLoaderDispatcherStrategy = builder.dataLoaderDispatcherStrategy;
-        this.queryTree = FpKit.interThreadMemoize(() -> ExecutableNormalizedOperationFactory.createExecutableNormalizedOperation(graphQLSchema, operationDefinition, fragmentsByName, coercedVariables));
         this.propagateErrorsOnNonNullContractFailure = builder.propagateErrorsOnNonNullContractFailure;
         this.engineRunningState = builder.engineRunningState;
         this.profiler = builder.profiler;
-        this.allOperationsDirectives = builder.opDirectivesMap;
-        List<QueryAppliedDirective> list = allOperationsDirectives.get(getOperationDefinition());
-        this.operationDirectives = OperationDirectivesResolver.toAppliedDirectivesByName(list);
+        // lazy loading for performance
+        this.queryTree = mkExecutableNormalizedOperation();
+        this.allOperationsDirectives = builder.allOperationsDirectives;
+        this.operationDirectives = mkOpDirectives(builder.allOperationsDirectives);
+    }
+
+    private Supplier<ExecutableNormalizedOperation> mkExecutableNormalizedOperation() {
+        return FpKit.interThreadMemoize(() -> {
+            Options options = Options.defaultOptions().graphQLContext(graphQLContext).locale(locale);
+            return createExecutableNormalizedOperation(graphQLSchema, operationDefinition, fragmentsByName, coercedVariables, options);
+        });
+    }
+
+    private Supplier<Map<String, ImmutableList<QueryAppliedDirective>>> mkOpDirectives(Supplier<Map<OperationDefinition, ImmutableList<QueryAppliedDirective>>> allOperationsDirectives) {
+        return FpKit.interThreadMemoize(() -> {
+            List<QueryAppliedDirective> list = allOperationsDirectives.get().get(operationDefinition);
+            return OperationDirectivesResolver.toAppliedDirectivesByName(list);
+        });
     }
 
     public ExecutionId getExecutionId() {
@@ -148,15 +164,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() {
-        return operationDirectives;
+        return operationDirectives.get();
     }
 
     /**
      * @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 allOperationsDirectives;
+        return allOperationsDirectives.get();
     }
 
     public CoercedVariables getCoercedVariables() {
diff --git a/src/main/java/graphql/execution/ExecutionContextBuilder.java b/src/main/java/graphql/execution/ExecutionContextBuilder.java
@@ -21,7 +21,6 @@
 import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -58,7 +57,7 @@ public class ExecutionContextBuilder {
     EngineRunningState engineRunningState;
     ResponseMapFactory responseMapFactory = ResponseMapFactory.DEFAULT;
     Profiler profiler;
-    Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> opDirectivesMap = Collections.emptyMap();
+    Supplier<Map<OperationDefinition, ImmutableList<QueryAppliedDirective>>> allOperationsDirectives = Collections::emptyMap;
 
     /**
      * @return a new builder of {@link graphql.execution.ExecutionContext}s
@@ -261,8 +260,8 @@ public ExecutionContextBuilder profiler(Profiler profiler) {
         return this;
     }
 
-    public ExecutionContextBuilder operationDirectives(Map<OperationDefinition, ImmutableList<QueryAppliedDirective>> opDirectivesMap) {
-        this.opDirectivesMap = opDirectivesMap;
+    public ExecutionContextBuilder operationDirectives(Supplier<Map<OperationDefinition, ImmutableList<QueryAppliedDirective>>> allOperationsDirectives) {
+        this.allOperationsDirectives = allOperationsDirectives;
         return this;
     }
 
