Merge pull request #2135 from graphql-java/anonymizer-cyclic

andimarek · web-flow · commit 5e61bb3221f4 · 2020-12-12T11:39:45.000+11:00
fix handling of cyclic type references
diff --git a/src/main/java/graphql/util/Anonymizer.java b/src/main/java/graphql/util/Anonymizer.java
@@ -45,6 +45,7 @@
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLSchemaElement;
 import graphql.schema.GraphQLType;
+import graphql.schema.GraphQLTypeReference;
 import graphql.schema.GraphQLTypeVisitor;
 import graphql.schema.GraphQLTypeVisitorStub;
 import graphql.schema.GraphQLUnionType;
@@ -104,6 +105,15 @@ public static AnonymizeResult anonymizeSchemaAndQueries(GraphQLSchema schema, Li
 
         SchemaTransformer schemaTransformer = new SchemaTransformer();
         GraphQLSchema newSchema = schemaTransformer.transform(schema, new GraphQLTypeVisitorStub() {
+
+            @Override
+            public TraversalControl visitGraphQLTypeReference(GraphQLTypeReference graphQLTypeReference, TraverserContext<GraphQLSchemaElement> context) {
+                GraphQLNamedSchemaElement type = (GraphQLNamedSchemaElement) schema.getType(graphQLTypeReference.getName());
+                String newName = newNameMap.get(type);
+                GraphQLTypeReference newReference = GraphQLTypeReference.typeRef(newName);
+                return changeNode(context, newReference);
+            }
+
             @Override
             public TraversalControl visitGraphQLArgument(GraphQLArgument graphQLArgument, TraverserContext<GraphQLSchemaElement> context) {
                 String newName = assertNotNull(newNameMap.get(graphQLArgument));
diff --git a/src/test/groovy/graphql/util/AnonymizerTest.groovy b/src/test/groovy/graphql/util/AnonymizerTest.groovy
@@ -449,4 +449,40 @@ type Object2 {
         then:
         newQuery == "query {field2 {__typename alias1:__typename field1}}"
     }
+
+    def "handles cyclic types"() {
+        def schema = TestUtil.schema("""
+            type Query {
+                query: Foo
+            }
+            type Foo {
+                foo: [Bar]
+            }
+
+            type Bar {
+                bar: [Foo]
+            }
+        """)
+        when:
+        def result = Anonymizer.anonymizeSchema(schema)
+        def newSchema = new SchemaPrinter(SchemaPrinter.Options.defaultOptions().includeDirectiveDefinitions(false)).print(result)
+
+        then:
+        newSchema == """schema {
+  query: Object1
+}
+
+type Object1 {
+  field1: Object2
+}
+
+type Object2 {
+  field2: [Object3]
+}
+
+type Object3 {
+  field3: [Object2]
+}
+"""
+    }
 }
