Renamed it to getFieldDefinition

bbakerman · bbakerman · commit 9f0876f2bf1c · 2017-06-21T16:16:25.000+10:00
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -89,7 +89,7 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, Execut
         DataFetchingEnvironment environment = newDataFetchingEnvironment(executionContext)
                 .source(parameters.source())
                 .arguments(argumentValues)
-                .field(fieldDef)
+                .fieldDefinition(fieldDef)
                 .fields(fields)
                 .fieldType(fieldType)
                 .parentType(parentType)
diff --git a/src/main/java/graphql/execution/batched/BatchedExecutionStrategy.java b/src/main/java/graphql/execution/batched/BatchedExecutionStrategy.java
@@ -301,7 +301,7 @@ private List<GraphQLExecutionNodeValue> fetchData(ExecutionContext executionCont
         DataFetchingEnvironment environment = newDataFetchingEnvironment(executionContext)
                 .source(sources)
                 .arguments(argumentValues)
-                .field(fieldDef)
+                .fieldDefinition(fieldDef)
                 .fields(fields)
                 .fieldType(fieldDef.getType())
                 .parentType(parentType)
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironment.java b/src/main/java/graphql/schema/DataFetchingEnvironment.java
@@ -74,7 +74,7 @@ public interface DataFetchingEnvironment {
     /**
      * @return the definition of the current field
      */
-    GraphQLFieldDefinition getField();
+    GraphQLFieldDefinition getFieldDefinition();
 
 
     /**
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentBuilder.java b/src/main/java/graphql/schema/DataFetchingEnvironmentBuilder.java
@@ -52,7 +52,7 @@ public static DataFetchingEnvironmentBuilder newDataFetchingEnvironment(Executio
     private Map<String, Object> arguments = Collections.emptyMap();
     private Object context;
     private Object root;
-    private GraphQLFieldDefinition field;
+    private GraphQLFieldDefinition fieldDefinition;
     private List<Field> fields = Collections.emptyList();
     private GraphQLOutputType fieldType;
     private GraphQLType parentType;
@@ -82,8 +82,8 @@ public DataFetchingEnvironmentBuilder root(Object root) {
         return this;
     }
 
-    public DataFetchingEnvironmentBuilder field(GraphQLFieldDefinition field) {
-        this.field = field;
+    public DataFetchingEnvironmentBuilder fieldDefinition(GraphQLFieldDefinition fieldDefinition) {
+        this.fieldDefinition = fieldDefinition;
         return this;
     }
 
@@ -124,7 +124,7 @@ public DataFetchingEnvironmentBuilder selectionSet(DataFetchingFieldSelectionSet
 
     public DataFetchingEnvironment build() {
         return new DataFetchingEnvironmentImpl(source, arguments, context, root,
-                field, fields, fieldType, parentType, graphQLSchema, fragmentsByName, executionId, selectionSet
+                fieldDefinition, fields, fieldType, parentType, graphQLSchema, fragmentsByName, executionId, selectionSet
         );
     }
 }
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
@@ -16,7 +16,7 @@ public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment {
     private final Map<String, Object> arguments;
     private final Object context;
     private final Object root;
-    private final GraphQLFieldDefinition field;
+    private final GraphQLFieldDefinition fieldDefinition;
     private final List<Field> fields;
     private final GraphQLOutputType fieldType;
     private final GraphQLType parentType;
@@ -25,12 +25,12 @@ public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment {
     private final ExecutionId executionId;
     private final DataFetchingFieldSelectionSet selectionSet;
 
-    public DataFetchingEnvironmentImpl(Object source, Map<String, Object> arguments, Object context, Object root, GraphQLFieldDefinition field, List<Field> fields, GraphQLOutputType fieldType, GraphQLType parentType, GraphQLSchema graphQLSchema, Map<String, FragmentDefinition> fragmentsByName, ExecutionId executionId, DataFetchingFieldSelectionSet selectionSet) {
+    public DataFetchingEnvironmentImpl(Object source, Map<String, Object> arguments, Object context, Object root, GraphQLFieldDefinition fieldDefinition, List<Field> fields, GraphQLOutputType fieldType, GraphQLType parentType, GraphQLSchema graphQLSchema, Map<String, FragmentDefinition> fragmentsByName, ExecutionId executionId, DataFetchingFieldSelectionSet selectionSet) {
         this.source = source;
         this.arguments = arguments;
         this.context = context;
         this.root = root;
-        this.field = field;
+        this.fieldDefinition = fieldDefinition;
         this.fields = fields;
         this.fieldType = fieldType;
         this.parentType = parentType;
@@ -71,8 +71,8 @@ public <T> T getRoot() {
     }
 
     @Override
-    public GraphQLFieldDefinition getField() {
-        return field;
+    public GraphQLFieldDefinition getFieldDefinition() {
+        return fieldDefinition;
     }
 
     @Override
diff --git a/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy
@@ -214,7 +214,7 @@ class ExecutionStrategyTest extends Specification {
 
         then:
         1 * dataFetcher.get({ it -> environment = it })
-        environment.field == fieldDefinition
+        environment.fieldDefinition == fieldDefinition
         environment.graphQLSchema == schema
         environment.context == "context"
         environment.source == "source"

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static DataFetchingEnvironmentBuilder newDataFetchingEnvironment(Executio`
`52`	`52`	`private Map<String, Object> arguments = Collections.emptyMap();`
`53`	`53`	`private Object context;`
`54`	`54`	`private Object root;`
`55`		`- private GraphQLFieldDefinition field;`
	`55`	`+ private GraphQLFieldDefinition fieldDefinition;`
`56`	`56`	`private List<Field> fields = Collections.emptyList();`
`57`	`57`	`private GraphQLOutputType fieldType;`
`58`	`58`	`private GraphQLType parentType;`
`@@ -82,8 +82,8 @@ public DataFetchingEnvironmentBuilder root(Object root) {`
`82`	`82`	`return this;`
`83`	`83`	`}`
`84`	`84`
`85`		`- public DataFetchingEnvironmentBuilder field(GraphQLFieldDefinition field) {`
`86`		`- this.field = field;`
	`85`	`+ public DataFetchingEnvironmentBuilder fieldDefinition(GraphQLFieldDefinition fieldDefinition) {`
	`86`	`+ this.fieldDefinition = fieldDefinition;`
`87`	`87`	`return this;`
`88`	`88`	`}`
`89`	`89`
`@@ -124,7 +124,7 @@ public DataFetchingEnvironmentBuilder selectionSet(DataFetchingFieldSelectionSet`
`124`	`124`
`125`	`125`	`public DataFetchingEnvironment build() {`
`126`	`126`	`return new DataFetchingEnvironmentImpl(source, arguments, context, root,`
`127`		`- field, fields, fieldType, parentType, graphQLSchema, fragmentsByName, executionId, selectionSet`
	`127`	`+ fieldDefinition, fields, fieldType, parentType, graphQLSchema, fragmentsByName, executionId, selectionSet`
`128`	`128`	`);`
`129`	`129`	`}`
`130`	`130`	`}`