This adds support for QueryAppliedDirective on operations and documents - refactor

bbakerman · bbakerman · commit 1951ed6e98c7 · 2026-03-07T09:49:08.000+11:00
diff --git a/src/main/java/graphql/execution/directives/DirectivesResolver.java b/src/main/java/graphql/execution/directives/DirectivesResolver.java
@@ -3,9 +3,9 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.ImmutableList;
 import graphql.GraphQLContext;
 import graphql.Internal;
+import graphql.collect.ImmutableKit;
 import graphql.execution.CoercedVariables;
 import graphql.execution.ValuesResolver;
 import graphql.language.Directive;
@@ -14,7 +14,6 @@
 import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLSchema;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -66,13 +65,16 @@ private void buildArguments(GraphQLDirective.Builder directiveBuilder,
 
     public List<QueryAppliedDirective> toAppliedDirectives(List<Directive> directives, GraphQLSchema schema, CoercedVariables variables, GraphQLContext graphQLContext, Locale locale) {
         BiMap<GraphQLDirective, Directive> directivesMap = resolveDirectives(directives, schema, variables, graphQLContext, locale);
-        return toAppliedDirectives(directivesMap.keySet());
-    }
-
-    public List<QueryAppliedDirective> toAppliedDirectives(Collection<GraphQLDirective> directives) {
-        return directives.stream().map(this::toAppliedDirective).collect(ImmutableList.toImmutableList());
+        return ImmutableKit.map(directivesMap.keySet(), this::toAppliedDirective);
     }
 
+    /**
+     * This helps us remodel the applied GraphQLDirective back to the better modelled and named {@link QueryAppliedDirective}
+     *
+     * @param directive the directive to remodel
+     *
+     * @return a QueryAppliedDirective
+     */
     public QueryAppliedDirective toAppliedDirective(GraphQLDirective directive) {
         QueryAppliedDirective.Builder builder = QueryAppliedDirective.newDirective();
         builder.name(directive.getName());
