Merge pull request graphql-java#392 from apottere/expose-fragments

Add fragment definitions and execution id to DataFetchingEnvironment

Author: bbakerman

src/main/java/graphql/execution/ExecutionStrategy.java

@@ -70,11 +70,10 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, Execut
 DataFetchingEnvironmentenvironment = newDataFetchingEnvironmentImpl(
 parameters.source(),
 argumentValues,
-executionContext.getRoot(),
 fields,
 fieldDef.getType(),
 type,
-executionContext.getGraphQLSchema()
+executionContext
  );
 
 Instrumentationinstrumentation = executionContext.getInstrumentation();

src/main/java/graphql/execution/batched/BatchedExecutionStrategy.java

@@ -255,11 +255,10 @@ private List<GraphQLExecutionNodeValue> fetchData(ExecutionContext executionCont
 DataFetchingEnvironmentenvironment = newDataFetchingEnvironmentImpl(
 sources,
 argumentValues,
-executionContext.getRoot(),
 fields,
 fieldDef.getType(),
 parentType,
-executionContext.getGraphQLSchema()
+executionContext
  );
 
 List<Object> values;

src/main/java/graphql/execution/batched/UnbatchedDataFetcher.java

@@ -35,7 +35,9 @@ public Object get(DataFetchingEnvironment environment){
 environment.getFields(),
 environment.getFieldType(),
 environment.getParentType(),
-environment.getGraphQLSchema());
+environment.getGraphQLSchema(),
+environment.getFragmentsByName(),
+environment.getExecutionId());
 results.add(delegate.get(singleEnv));
  }
 returnresults;

src/main/java/graphql/schema/DataFetchingEnvironment.java

@@ -1,6 +1,8 @@
 packagegraphql.schema;
 
+importgraphql.execution.ExecutionId;
 importgraphql.language.Field;
+importgraphql.language.FragmentDefinition;
 
 importjava.util.List;
 importjava.util.Map;
@@ -69,4 +71,14 @@ public interface DataFetchingEnvironment{
  * @return the underlying graphql schema
  */
 GraphQLSchemagetGraphQLSchema();
+
+/**
+ * @return the{@link FragmentDefinition} map for the current operation
+ */
+Map<String, FragmentDefinition> getFragmentsByName();
+
+/**
+ * @return the{@link ExecutionId} for the current operation
+ */
+ExecutionIdgetExecutionId();
 }

src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java

@@ -1,7 +1,10 @@
 packagegraphql.schema;
 
 
+importgraphql.execution.ExecutionContext;
+importgraphql.execution.ExecutionId;
 importgraphql.language.Field;
+importgraphql.language.FragmentDefinition;
 
 importjava.util.List;
 importjava.util.Map;
@@ -15,15 +18,23 @@ public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment{
 privatefinalGraphQLOutputTypefieldType;
 privatefinalGraphQLTypeparentType;
 privatefinalGraphQLSchemagraphQLSchema;
+privateMap<String, FragmentDefinition> fragmentsByName;
+privateExecutionIdexecutionId;
 
-publicDataFetchingEnvironmentImpl(Objectsource, Map<String, Object> arguments, Objectcontext, List<Field> fields, GraphQLOutputTypefieldType, GraphQLTypeparentType, GraphQLSchemagraphQLSchema){
+publicDataFetchingEnvironmentImpl(Objectsource, Map<String, Object> arguments, List<Field> fields, GraphQLOutputTypefieldType, GraphQLTypeparentType, ExecutionContextexecutionContext){
+this(source, arguments, executionContext.getRoot(), fields, fieldType, parentType, executionContext.getGraphQLSchema(), executionContext.getFragmentsByName(), executionContext.getExecutionId());
+ }
+
+publicDataFetchingEnvironmentImpl(Objectsource, Map<String, Object> arguments, Objectcontext, List<Field> fields, GraphQLOutputTypefieldType, GraphQLTypeparentType, GraphQLSchemagraphQLSchema, Map<String, FragmentDefinition> fragmentsByName, ExecutionIdexecutionId){
 this.source = source;
 this.arguments = arguments;
 this.context = context;
 this.fields = fields;
 this.fieldType = fieldType;
 this.parentType = parentType;
 this.graphQLSchema = graphQLSchema;
+this.fragmentsByName = fragmentsByName;
+this.executionId = executionId;
  }
 
 @Override
@@ -70,4 +81,14 @@ public GraphQLType getParentType(){
 publicGraphQLSchemagetGraphQLSchema(){
 returngraphQLSchema;
  }
+
+@Override
+publicMap<String, FragmentDefinition> getFragmentsByName(){
+returnfragmentsByName;
+ }
+
+@Override
+publicExecutionIdgetExecutionId(){
+returnexecutionId;
+ }
 }

src/test/groovy/graphql/DataFetcherTest.groovy

@@ -2,6 +2,8 @@ package graphql
 
 importgraphql.schema.DataFetchingEnvironmentImpl
 importgraphql.schema.FieldDataFetcher
+importgraphql.schema.GraphQLOutputType
+importgraphql.schema.GraphQLScalarType
 importgraphql.schema.PropertyDataFetcher
 importspock.lang.Specification
 
@@ -53,9 +55,13 @@ class DataFetcherTest extends Specification{
  dataHolder.setBooleanFieldWithGet(false)
  }
 
+privatedefenv(GraphQLOutputTypetype){
+newDataFetchingEnvironmentImpl(dataHolder, null, null, null, type, null, null, null, null)
+ }
+
 def"get field value"(){
 given:
-def environment =newDataFetchingEnvironmentImpl(dataHolder, null, null, null, GraphQLString, null, null)
+def environment =env(GraphQLString)
 when:
 def result =newFieldDataFetcher("publicField").get(environment)
 then:
@@ -64,7 +70,7 @@ class DataFetcherTest extends Specification{
 
 def"get property value"(){
 given:
-def environment =newDataFetchingEnvironmentImpl(dataHolder, null, null, null, GraphQLString, null, null)
+def environment =env(GraphQLString)
 when:
 def result =newPropertyDataFetcher("property").get(environment)
 then:
@@ -73,7 +79,7 @@ class DataFetcherTest extends Specification{
 
 def"get Boolean property value"(){
 given:
-def environment =newDataFetchingEnvironmentImpl(dataHolder, null, null, null, GraphQLBoolean, null, null)
+def environment =env(GraphQLBoolean)
 when:
 def result =newPropertyDataFetcher("booleanField").get(environment)
 then:
@@ -82,7 +88,7 @@ class DataFetcherTest extends Specification{
 
 def"get Boolean property value with get"(){
 given:
-def environment =newDataFetchingEnvironmentImpl(dataHolder, null, null, null, GraphQLBoolean, null, null)
+def environment =env(GraphQLBoolean)
 when:
 def result =newPropertyDataFetcher("booleanFieldWithGet").get(environment)
 then:
@@ -91,7 +97,7 @@ class DataFetcherTest extends Specification{
 
 def"get field value as property"(){
 given:
-def environment =newDataFetchingEnvironmentImpl(dataHolder, null, null, null, GraphQLString, null, null)
+def environment =env(GraphQLString)
 when:
 def result =newPropertyDataFetcher("publicField").get(environment)
 then:

src/test/groovy/graphql/schema/PropertyDataFetcherTest.groovy

@@ -7,12 +7,15 @@ import spock.lang.Specification
 classPropertyDataFetcherTestextendsSpecification{
 
 defenv(obj){
-returnnewDataFetchingEnvironmentImpl(obj,
+returnnewDataFetchingEnvironmentImpl(
+ obj,
 Collections.emptyMap(),
 null,
 Collections.emptyList(),
 null,
 null,
+null,
+null,
 null
  )
  }