rename getUnmodified parent to getFieldsContainer

andimarek · andimarek · commit 56db22676869 · 2018-07-23T13:56:40.000+10:00
diff --git a/src/main/java/graphql/analysis/MaxQueryComplexityInstrumentation.java b/src/main/java/graphql/analysis/MaxQueryComplexityInstrumentation.java
@@ -108,7 +108,7 @@ private FieldComplexityEnvironment convertEnv(QueryVisitorFieldEnvironment query
         return new FieldComplexityEnvironment(
                 queryVisitorFieldEnvironment.getField(),
                 queryVisitorFieldEnvironment.getFieldDefinition(),
-                queryVisitorFieldEnvironment.getUnmodifiedParentType(),
+                queryVisitorFieldEnvironment.getFieldsContainer(),
                 queryVisitorFieldEnvironment.getArguments(),
                 parentEnv
         );
diff --git a/src/main/java/graphql/analysis/QueryVisitorFieldEnvironment.java b/src/main/java/graphql/analysis/QueryVisitorFieldEnvironment.java
@@ -34,7 +34,7 @@ public interface QueryVisitorFieldEnvironment {
      *
      * @throws IllegalStateException if the current field is __typename see {@link #isTypeNameIntrospectionField()}
      */
-    GraphQLFieldsContainer getUnmodifiedParentType();
+    GraphQLFieldsContainer getFieldsContainer();
 
     QueryVisitorFieldEnvironment getParentEnvironment();
 
diff --git a/src/main/java/graphql/analysis/QueryVisitorFieldEnvironmentImpl.java b/src/main/java/graphql/analysis/QueryVisitorFieldEnvironmentImpl.java
@@ -71,7 +71,7 @@ public SelectionSetContainer getSelectionSetContainer() {
     }
 
     @Override
-    public GraphQLFieldsContainer getUnmodifiedParentType() {
+    public GraphQLFieldsContainer getFieldsContainer() {
         if (isTypeNameIntrospectionField()) {
             throw new IllegalStateException("introspection field __typename doesn't have a fields container");
         }
diff --git a/src/main/java/graphql/execution/instrumentation/fieldvalidation/FieldValidationSupport.java b/src/main/java/graphql/execution/instrumentation/fieldvalidation/FieldValidationSupport.java
@@ -106,7 +106,7 @@ public GraphQLFieldDefinition getFieldDefinition() {
 
         @Override
         public GraphQLCompositeType getParentType() {
-            return traversalEnv.getUnmodifiedParentType();
+            return traversalEnv.getFieldsContainer();
         }
 
         @Override
diff --git a/src/test/groovy/graphql/analysis/QueryTraversalTest.groovy b/src/test/groovy/graphql/analysis/QueryTraversalTest.groovy
@@ -467,7 +467,7 @@ class QueryTraversalTest extends Specification {
         1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "bar" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Query" })
         1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it ->
             it.field.name == "subFoo" && it.fieldDefinition.type.name == "String" &&
-                    it.unmodifiedParentType.name == "Foo" &&
+                    it.fieldsContainer.name == "Foo" &&
                     (it.parentType instanceof GraphQLNonNull) &&
                     it.parentEnvironment.field.name == "foo" && it.parentEnvironment.fieldDefinition.type.wrappedType.name == "Foo"
         })
@@ -999,8 +999,8 @@ class QueryTraversalTest extends Specification {
 
         then:
         1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "foo" && it.fieldDefinition.type.name == "CatOrDog" && it.parentType.name == "Query" })
-        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "catName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Cat" && it.unmodifiedParentType.name == "Cat" })
-        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "dogName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Dog" && it.unmodifiedParentType.name == "Dog" })
+        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "catName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Cat" && it.fieldsContainer.name == "Cat" })
+        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "dogName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Dog" && it.fieldsContainer.name == "Dog" })
 
         where:
         order       | visitFn
@@ -1045,9 +1045,9 @@ class QueryTraversalTest extends Specification {
 
         then:
         1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "foo" && it.fieldDefinition.type == list(nonNull(catOrDog)) && it.parentType.name == "Query" })
-        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "catName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Cat" && it.unmodifiedParentType.name == "Cat" })
-        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "dogName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Dog" && it.unmodifiedParentType.name == "Dog" })
-        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "id" && it.fieldDefinition.type.name == "String" && it.parentType == nonNull(list(nonNull(bar))) && it.unmodifiedParentType.name == "Bar" })
+        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "catName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Cat" && it.fieldsContainer.name == "Cat" })
+        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "dogName" && it.fieldDefinition.type.name == "String" && it.parentType.name == "Dog" && it.fieldsContainer.name == "Dog" })
+        1 * visitor.visitField({ QueryVisitorFieldEnvironmentImpl it -> it.field.name == "id" && it.fieldDefinition.type.name == "String" && it.parentType == nonNull(list(nonNull(bar))) && it.fieldsContainer.name == "Bar" })
 
         where:
         order       | visitFn
@@ -1237,7 +1237,7 @@ class QueryTraversalTest extends Specification {
         when:
         queryTraversal.visitPreOrder(visitor)
         env.typeNameIntrospectionField
-        env.getUnmodifiedParentType()
+        env.getFieldsContainer()
 
         then:
         thrown(IllegalStateException)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public interface QueryVisitorFieldEnvironment {`
`34`	`34`	`*`
`35`	`35`	`* @throws IllegalStateException if the current field is __typename see {@link #isTypeNameIntrospectionField()}`
`36`	`36`	`*/`
`37`		`- GraphQLFieldsContainer getUnmodifiedParentType();`
	`37`	`+ GraphQLFieldsContainer getFieldsContainer();`
`38`	`38`
`39`	`39`	`QueryVisitorFieldEnvironment getParentEnvironment();`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public SelectionSetContainer getSelectionSetContainer() {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`
`74`		`- public GraphQLFieldsContainer getUnmodifiedParentType() {`
	`74`	`+ public GraphQLFieldsContainer getFieldsContainer() {`
`75`	`75`	`if (isTypeNameIntrospectionField()) {`
`76`	`76`	`throw new IllegalStateException("introspection field __typename doesn't have a fields container");`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public GraphQLFieldDefinition getFieldDefinition() {`
`106`	`106`
`107`	`107`	`@Override`
`108`	`108`	`public GraphQLCompositeType getParentType() {`
`109`		`- return traversalEnv.getUnmodifiedParentType();`
	`109`	`+ return traversalEnv.getFieldsContainer();`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`