Resolve TypeReferences in schema applied directives

kaqqao · kaqqao · commit de7932faf1e0 · 2022-12-14T02:56:30.000+01:00
Fixes #3053
diff --git a/src/main/java/graphql/schema/impl/SchemaUtil.java b/src/main/java/graphql/schema/impl/SchemaUtil.java
@@ -100,6 +100,7 @@ public static void replaceTypeReferences(GraphQLSchema schema) {
         final Map<String, GraphQLNamedType> typeMap = schema.getTypeMap();
         List<GraphQLSchemaElement> roots = new ArrayList<>(typeMap.values());
         roots.addAll(schema.getDirectives());
+        roots.addAll(schema.getSchemaAppliedDirectives());
         SchemaTraverser schemaTraverser = new SchemaTraverser(schemaElement -> schemaElement.getChildrenWithTypeReferences().getChildrenAsList());
         schemaTraverser.depthFirst(new GraphQLTypeResolvingVisitor(typeMap), roots);
     }
diff --git a/src/test/groovy/graphql/TypeReferenceSchema.java b/src/test/groovy/graphql/TypeReferenceSchema.java
@@ -1,6 +1,8 @@
 package graphql;
 
 import graphql.schema.Coercing;
+import graphql.schema.GraphQLAppliedDirective;
+import graphql.schema.GraphQLAppliedDirectiveArgument;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLDirective;
@@ -315,6 +317,14 @@ public Boolean parseLiteral(Object input) {
                     .type(QueryDirectiveInput))
             .build();
 
+    public static GraphQLAppliedDirective cacheApplied = GraphQLAppliedDirective.newDirective()
+            .name("cache")
+            .argument(GraphQLAppliedDirectiveArgument.newArgument()
+                    .name("enabled")
+                    .type(GraphQLTypeReference.typeRef(OnOff.getName()))
+                    .valueProgrammatic("On"))
+            .build();
+
     public static GraphQLCodeRegistry codeRegistry = GraphQLCodeRegistry.newCodeRegistry()
             .typeResolver("Pet", new TypeResolverProxy())
             .typeResolver("Addressable", new TypeResolverProxy())
@@ -336,5 +346,6 @@ public Boolean parseLiteral(Object input) {
             .additionalDirective(enumValueDirective)
             .additionalDirective(interfaceDirective)
             .codeRegistry(codeRegistry)
+            .withSchemaAppliedDirectives(cacheApplied)
             .build();
 }
diff --git a/src/test/groovy/graphql/schema/impl/SchemaUtilTest.groovy b/src/test/groovy/graphql/schema/impl/SchemaUtilTest.groovy
@@ -4,6 +4,7 @@ import graphql.AssertException
 import graphql.DirectivesUtil
 import graphql.NestedInputSchema
 import graphql.introspection.Introspection
+import graphql.schema.GraphQLAppliedDirectiveArgument
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLInputObjectType
@@ -164,12 +165,15 @@ class SchemaUtilTest extends Specification {
         GraphQLObjectType person = ((GraphQLObjectType) SchemaWithReferences.getType("Person"))
         GraphQLArgument cacheEnabled = SchemaWithReferences.getDirectivesByName()
                 .get(Cache.getName()).getArgument("enabled")
+        GraphQLAppliedDirectiveArgument appliedCacheEnabled = SchemaWithReferences.getSchemaAppliedDirective(Cache.getName())
+                .getArgument("enabled")
 
         then:
         SchemaWithReferences.allTypesAsList.findIndexOf { it instanceof GraphQLTypeReference } == -1
         pet.types.findIndexOf { it instanceof GraphQLTypeReference } == -1
         person.interfaces.findIndexOf { it instanceof GraphQLTypeReference } == -1
         !(cacheEnabled.getType() instanceof GraphQLTypeReference)
+        !(appliedCacheEnabled.getType() instanceof GraphQLTypeReference)
     }
 
     def "all references are replaced with deprecated directiveWithArg"() {

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public static void replaceTypeReferences(GraphQLSchema schema) {`
`100`	`100`	`final Map<String, GraphQLNamedType> typeMap = schema.getTypeMap();`
`101`	`101`	`List<GraphQLSchemaElement> roots = new ArrayList<>(typeMap.values());`
`102`	`102`	`roots.addAll(schema.getDirectives());`
	`103`	`+ roots.addAll(schema.getSchemaAppliedDirectives());`
`103`	`104`	`SchemaTraverser schemaTraverser = new SchemaTraverser(schemaElement -> schemaElement.getChildrenWithTypeReferences().getChildrenAsList());`
`104`	`105`	`schemaTraverser.depthFirst(new GraphQLTypeResolvingVisitor(typeMap), roots);`
`105`	`106`	`}`