Skip to content

Commit e116da7

Browse files
bbakermanbbakerman
committed
Ok had another go after PR feedback - now has the extra fields where in execution context that makes sense to pass on
1 parent 30769d1 commit e116da7

13 files changed

Lines changed: 329 additions & 253 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import static graphql.execution.FieldValueInfo.CompleteValueType.NULL;
5151
import static graphql.execution.FieldValueInfo.CompleteValueType.OBJECT;
5252
import static graphql.execution.FieldValueInfo.CompleteValueType.SCALAR;
53-
import static graphql.schema.DataFetchingEnvironmentBuilder.newDataFetchingEnvironment;
53+
import static graphql.schema.DataFetchingEnvironmentImpl.newDataFetchingEnvironment;
5454
import static graphql.schema.GraphQLTypeUtil.isList;
5555
import static java.util.concurrent.CompletableFuture.completedFuture;
5656

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import static graphql.execution.ExecutionStepInfo.newExecutionStepInfo;
6060
import static graphql.execution.FieldCollectorParameters.newParameters;
6161
import static graphql.execution.UnboxPossibleOptional.unboxPossibleOptional;
62-
import static graphql.schema.DataFetchingEnvironmentBuilder.newDataFetchingEnvironment;
62+
import static graphql.schema.DataFetchingEnvironmentImpl.newDataFetchingEnvironment;
6363
import static java.util.Collections.singletonList;
6464
import static java.util.stream.Collectors.toList;
6565

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.List;
1010
import java.util.concurrent.CompletableFuture;
1111

12-
import static graphql.schema.DataFetchingEnvironmentBuilder.newDataFetchingEnvironment;
12+
import static graphql.schema.DataFetchingEnvironmentImpl.newDataFetchingEnvironment;
1313

1414
/**
1515
* Given a normal data fetcher as a delegate,

‎src/main/java/graphql/execution/nextgen/ValueFetcher.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import graphql.language.Field;
2020
import graphql.schema.DataFetcher;
2121
import graphql.schema.DataFetchingEnvironment;
22+
import graphql.schema.DataFetchingEnvironmentImpl;
2223
import graphql.schema.DataFetchingFieldSelectionSet;
2324
import graphql.schema.DataFetchingFieldSelectionSetImpl;
2425
import graphql.schema.GraphQLCodeRegistry;
@@ -37,7 +38,7 @@
3738
import java.util.concurrent.CompletionStage;
3839
import java.util.stream.Collectors;
3940

40-
import static graphql.schema.DataFetchingEnvironmentBuilder.newDataFetchingEnvironment;
41+
import static graphql.schema.DataFetchingEnvironmentImpl.*;
4142
import static java.util.Collections.singletonList;
4243

4344
@Internal

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import graphql.execution.ExecutionId;
55
import graphql.execution.ExecutionStepInfo;
66
import graphql.execution.MergedField;
7+
import graphql.language.Document;
78
import graphql.language.Field;
89
import graphql.language.FragmentDefinition;
10+
import graphql.language.OperationDefinition;
911
import org.dataloader.DataLoader;
10-
import org.dataloader.DataLoaderRegistry;
1112

1213
import java.util.List;
1314
import java.util.Map;
@@ -192,7 +193,17 @@ public interface DataFetchingEnvironment {
192193
<K, V> DataLoader<K, V> getDataLoader(String dataLoaderName);
193194

194195
/**
195-
* @return the {@link org.dataloader.DataLoaderRegistry} backing this field fetch
196+
* @return the current operation that is being executed
196197
*/
197-
DataLoaderRegistry getDataLoaderRegistry();
198+
OperationDefinition getOperationDefinition();
199+
200+
/**
201+
* @return the current query Document that is being executed
202+
*/
203+
Document getDocument();
204+
205+
/**
206+
* @return the variables that have been passed to the query that is being executed
207+
*/
208+
Map<String, Object> getVariables();
198209
}

‎src/main/java/graphql/schema/DataFetchingEnvironmentBuilder.java‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)