Add environment to field instrumentation.

apottere · andimarek · commit a3a36a59bf53 · 2017-05-17T06:55:12.000+02:00
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -91,7 +91,7 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, Execut
 
         Instrumentation instrumentation = executionContext.getInstrumentation();
 
-        InstrumentationContext<ExecutionResult> fieldCtx = instrumentation.beginField(new FieldParameters(executionContext, fieldDef));
+        InstrumentationContext<ExecutionResult> fieldCtx = instrumentation.beginField(new FieldParameters(executionContext, fieldDef, environment));
 
         InstrumentationContext<Object> fetchCtx = instrumentation.beginFieldFetch(new FieldFetchParameters(executionContext, fieldDef, environment));
         Object resolvedValue = null;
diff --git a/src/main/java/graphql/execution/instrumentation/parameters/FieldFetchParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/FieldFetchParameters.java
@@ -12,7 +12,7 @@ public class FieldFetchParameters extends FieldParameters {
     private final DataFetchingEnvironment environment;
 
     public FieldFetchParameters(ExecutionContext getExecutionContext, GraphQLFieldDefinition fieldDef, DataFetchingEnvironment environment) {
-        super(getExecutionContext, fieldDef);
+        super(getExecutionContext, fieldDef, environment);
         this.environment = environment;
     }
 
diff --git a/src/main/java/graphql/execution/instrumentation/parameters/FieldParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/FieldParameters.java
@@ -2,6 +2,7 @@
 
 import graphql.execution.ExecutionContext;
 import graphql.execution.instrumentation.Instrumentation;
+import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLFieldDefinition;
 
 /**
@@ -10,10 +11,12 @@
 public class FieldParameters {
     private final ExecutionContext executionContext;
     private final graphql.schema.GraphQLFieldDefinition fieldDef;
+    private final DataFetchingEnvironment environment;
 
-    public FieldParameters(ExecutionContext executionContext, GraphQLFieldDefinition fieldDef) {
+    public FieldParameters(ExecutionContext executionContext, GraphQLFieldDefinition fieldDef, DataFetchingEnvironment environment) {
         this.executionContext = executionContext;
         this.fieldDef = fieldDef;
+        this.environment = environment;
     }
 
     public ExecutionContext getExecutionContext() {
@@ -23,4 +26,8 @@ public ExecutionContext getExecutionContext() {
     public GraphQLFieldDefinition getField() {
         return fieldDef;
     }
+
+    public DataFetchingEnvironment getEnvironment() {
+        return environment;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class FieldFetchParameters extends FieldParameters {`
`12`	`12`	`private final DataFetchingEnvironment environment;`
`13`	`13`
`14`	`14`	`public FieldFetchParameters(ExecutionContext getExecutionContext, GraphQLFieldDefinition fieldDef, DataFetchingEnvironment environment) {`
`15`		`- super(getExecutionContext, fieldDef);`
	`15`	`+ super(getExecutionContext, fieldDef, environment);`
`16`	`16`	`this.environment = environment;`
`17`	`17`	`}`
`18`	`18`