Add more tests and fix bugs

Daniel Treacy · Daniel Treacy · commit ef50a7166ba6 · 2020-01-06T16:33:03.000+11:00
diff --git a/src/main/java/graphql/schema/SchemaTransformer.java b/src/main/java/graphql/schema/SchemaTransformer.java
@@ -163,6 +163,7 @@ public TraversalControl leave(TraverserContext<GraphQLSchemaElement> context) {
             public TraversalControl backRef(TraverserContext<GraphQLSchemaElement> context) {
                 NodeZipper<GraphQLSchemaElement> zipper = zipperByOriginalNode.get(context.thisNode());
                 breadcrumbsByZipper.get(zipper).add(context.getBreadcrumbs());
+                visitor.visitBackRef(context);
                 return TraversalControl.CONTINUE;
             }
         };
diff --git a/src/main/java/graphql/schema/transform/FieldVisibilitySchemaTransformation.java b/src/main/java/graphql/schema/transform/FieldVisibilitySchemaTransformation.java
@@ -5,7 +5,9 @@
 
 import graphql.PublicApi;
 import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectField;
 import graphql.schema.GraphQLInterfaceType;
+import graphql.schema.GraphQLNamedSchemaElement;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLSchemaElement;
@@ -84,7 +86,10 @@ private FieldVisibilityVisitor(VisibleFieldPredicate visibilityPredicate,
         @Override
         public TraversalControl visitGraphQLInterfaceType(GraphQLInterfaceType node,
                                                           TraverserContext<GraphQLSchemaElement> context) {
-            observedTypes.add(node);
+            if (context.getBreadcrumbs().stream()
+                    .noneMatch(crumb -> crumb.getLocation().getName().equalsIgnoreCase("addTypes"))) {
+                observedTypes.add(node);
+            }
 
             return TraversalControl.CONTINUE;
         }
@@ -94,23 +99,49 @@ public TraversalControl visitGraphQLObjectType(GraphQLObjectType node,
                                                        TraverserContext<GraphQLSchemaElement> context) {
 
             if (context.getBreadcrumbs().stream()
-                    .anyMatch(crumb -> crumb.getLocation().getName().equalsIgnoreCase("addTypes"))) {
-                return TraversalControl.ABORT;
+                    .noneMatch(crumb -> crumb.getLocation().getName().equalsIgnoreCase("addTypes"))) {
+                observedTypes.add(node);
             }
 
-            observedTypes.add(node);
-
             return TraversalControl.CONTINUE;
         }
 
         @Override
         public TraversalControl visitGraphQLFieldDefinition(GraphQLFieldDefinition definition,
                                                             TraverserContext<GraphQLSchemaElement> context) {
+            return visitField(definition, context);
+        }
+
+        @Override
+        public TraversalControl visitGraphQLInputObjectField(GraphQLInputObjectField definition,
+                                                             TraverserContext<GraphQLSchemaElement> context) {
+            return visitField(definition, context);
+        }
+
+        @Override
+        public TraversalControl visitBackRef(TraverserContext<GraphQLSchemaElement> context) {
+            if (context.thisNode() instanceof GraphQLInterfaceType || context.thisNode() instanceof GraphQLObjectType) {
+                if (context.getBreadcrumbs().stream()
+                        .noneMatch(crumb -> crumb.getLocation().getName().equalsIgnoreCase("addTypes"))) {
+                    observedTypes.add((GraphQLType) context.thisNode());
+                }
+            }
+            return TraversalControl.CONTINUE;
+        }
+
+        private TraversalControl visitField(GraphQLNamedSchemaElement element,
+                                            TraverserContext<GraphQLSchemaElement> context) {
+
             VisibleFieldPredicateEnvironment environment = new VisibleFieldPredicateEnvironmentImpl(
-                    definition, context.getParentNode());
+                    element, context.getParentNode());
             if (!visibilityPredicate.isVisible(environment)) {
                 deleteNode(context);
-                removedTypes.add(definition.getType());
+
+                if (element instanceof GraphQLFieldDefinition) {
+                    removedTypes.add(((GraphQLFieldDefinition) element).getType());
+                } else if (element instanceof GraphQLInputObjectField) {
+                    removedTypes.add(((GraphQLInputObjectField) element).getType());
+                }
             }
 
             return TraversalControl.CONTINUE;
@@ -131,10 +162,17 @@ private TypeVisibilityVisitor(Set<String> protectedTypeNames,
             this.removedTypes = removedTypes;
         }
 
+        @Override
+        public TraversalControl visitGraphQLInterfaceType(GraphQLInterfaceType node,
+                                                          TraverserContext<GraphQLSchemaElement> context) {
+            return super.visitGraphQLInterfaceType(node, context);
+        }
+
         @Override
         public TraversalControl visitGraphQLObjectType(GraphQLObjectType node,
                                                        TraverserContext<GraphQLSchemaElement> context) {
             if (!observedTypes.contains(node) &&
+                    node.getInterfaces().stream().noneMatch(observedTypes::contains) &&
                     node.getInterfaces().stream().anyMatch(removedTypes::contains) &&
                     !ScalarInfo.isStandardScalar(node.getName()) &&
                     !protectedTypeNames.contains(node.getName())) {
diff --git a/src/main/java/graphql/schema/transform/VisibleFieldPredicateEnvironment.java b/src/main/java/graphql/schema/transform/VisibleFieldPredicateEnvironment.java
@@ -1,7 +1,7 @@
 package graphql.schema.transform;
 
 import graphql.PublicApi;
-import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLNamedSchemaElement;
 import graphql.schema.GraphQLSchemaElement;
 
 /**
@@ -10,7 +10,7 @@
 @PublicApi
 public interface VisibleFieldPredicateEnvironment {
 
-    GraphQLFieldDefinition getFieldDefinition();
+    GraphQLNamedSchemaElement getFieldDefinition();
 
     /**
      * Get the field's immediate parent node.
@@ -21,17 +21,17 @@ public interface VisibleFieldPredicateEnvironment {
 
     class VisibleFieldPredicateEnvironmentImpl implements VisibleFieldPredicateEnvironment {
 
-        private final GraphQLFieldDefinition fieldDefinition;
+        private final GraphQLNamedSchemaElement fieldDefinition;
         private final GraphQLSchemaElement parentElement;
 
-        public VisibleFieldPredicateEnvironmentImpl(GraphQLFieldDefinition fieldDefinition,
+        public VisibleFieldPredicateEnvironmentImpl(GraphQLNamedSchemaElement fieldDefinition,
                                                     GraphQLSchemaElement parentElement) {
             this.fieldDefinition = fieldDefinition;
             this.parentElement = parentElement;
         }
 
         @Override
-        public GraphQLFieldDefinition getFieldDefinition() {
+        public GraphQLNamedSchemaElement getFieldDefinition() {
             return fieldDefinition;
         }
 
diff --git a/src/test/groovy/graphql/schema/transform/FieldVisibilitySchemaTransformationTest.groovy b/src/test/groovy/graphql/schema/transform/FieldVisibilitySchemaTransformationTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public TraversalControl leave(TraverserContext<GraphQLSchemaElement> context) {`
`163`	`163`	`public TraversalControl backRef(TraverserContext<GraphQLSchemaElement> context) {`
`164`	`164`	`NodeZipper<GraphQLSchemaElement> zipper = zipperByOriginalNode.get(context.thisNode());`
`165`	`165`	`breadcrumbsByZipper.get(zipper).add(context.getBreadcrumbs());`
	`166`	`+ visitor.visitBackRef(context);`
`166`	`167`	`return TraversalControl.CONTINUE;`
`167`	`168`	`}`
`168`	`169`	`};`