44import graphql .ExecutionInput ;
55import graphql .ExecutionResult ;
66import graphql .ExecutionResultImpl ;
7- import graphql .GraphQLException ;
87import graphql .Internal ;
98import graphql .MutationNotSupportedError ;
109import graphql .execution .instrumentation .Instrumentation ;
2019import java .util .List ;
2120import java .util .Map ;
2221
22+ import static graphql .Assert .assertShouldNeverHappen ;
2323import static graphql .execution .ExecutionStrategyParameters .newParameters ;
2424import static graphql .execution .TypeInfo .newTypeInfo ;
2525import static graphql .language .OperationDefinition .Operation .MUTATION ;
@@ -43,37 +43,25 @@ public Execution(ExecutionStrategy queryStrategy, ExecutionStrategy mutationStra
4343 }
4444
4545 public ExecutionResult execute (Document document , GraphQLSchema graphQLSchema , ExecutionId executionId , ExecutionInput executionInput ) {
46- final Object context = executionInput .getContext ();
47- final Object root = executionInput .getRoot ();
48- final String operationName = executionInput .getOperationName ();
49- final Map <String , Object > variables = executionInput .getVariables ();
5046
51- ExecutionContextBuilder executionContextBuilder = new ExecutionContextBuilder (new ValuesResolver (), instrumentation );
52- ExecutionContext executionContext = executionContextBuilder
47+ ExecutionContext executionContext = new ExecutionContextBuilder ()
48+ .valuesResolver (new ValuesResolver ())
49+ .instrumentation (instrumentation )
5350 .executionId (executionId )
54- .build (graphQLSchema , queryStrategy , mutationStrategy , subscriptionStrategy , context , root , document , operationName , variables );
55- return executeOperation (executionContext , root , executionContext .getOperationDefinition ());
56- }
57-
58- private GraphQLObjectType getOperationRootType (GraphQLSchema graphQLSchema , OperationDefinition .Operation operation ) {
59- if (operation == MUTATION ) {
60- return graphQLSchema .getMutationType ();
61-
62- } else if (operation == QUERY ) {
63- return graphQLSchema .getQueryType ();
64-
65- } else if (operation == SUBSCRIPTION ) {
66- return graphQLSchema .getSubscriptionType ();
67-
68- } else {
69- throw new GraphQLException ("Unhandled case. An extra operation enum has been added without code support" );
70- }
51+ .graphQLSchema (graphQLSchema )
52+ .queryStrategy (queryStrategy )
53+ .mutationStrategy (mutationStrategy )
54+ .subscriptionStrategy (subscriptionStrategy )
55+ .context (executionInput .getContext ())
56+ .root (executionInput .getRoot ())
57+ .document (document )
58+ .operationName (executionInput .getOperationName ())
59+ .variables (executionInput .getVariables ())
60+ .build ();
61+ return executeOperation (executionContext , executionInput .getRoot (), executionContext .getOperationDefinition ());
7162 }
7263
73- private ExecutionResult executeOperation (
74- ExecutionContext executionContext ,
75- Object root ,
76- OperationDefinition operationDefinition ) {
64+ private ExecutionResult executeOperation (ExecutionContext executionContext , Object root , OperationDefinition operationDefinition ) {
7765
7866 InstrumentationContext <ExecutionResult > dataFetchCtx = instrumentation .beginDataFetch (new InstrumentationDataFetchParameters (executionContext ));
7967
@@ -89,7 +77,9 @@ private ExecutionResult executeOperation(
8977 return new ExecutionResultImpl (Collections .singletonList (new MutationNotSupportedError ()));
9078 }
9179
92- FieldCollectorParameters collectorParameters = FieldCollectorParameters .newParameters (executionContext .getGraphQLSchema (), operationRootType )
80+ FieldCollectorParameters collectorParameters = FieldCollectorParameters .newParameters ()
81+ .schema (executionContext .getGraphQLSchema ())
82+ .objectType (operationRootType )
9383 .fragments (executionContext .getFragmentsByName ())
9484 .variables (executionContext .getVariables ())
9585 .build ();
@@ -130,4 +120,16 @@ private ExecutionResult executeOperation(
130120 dataFetchCtx .onEnd (result );
131121 return result ;
132122 }
123+
124+ private GraphQLObjectType getOperationRootType (GraphQLSchema graphQLSchema , OperationDefinition .Operation operation ) {
125+ if (operation == MUTATION ) {
126+ return graphQLSchema .getMutationType ();
127+ } else if (operation == QUERY ) {
128+ return graphQLSchema .getQueryType ();
129+ } else if (operation == SUBSCRIPTION ) {
130+ return graphQLSchema .getSubscriptionType ();
131+ } else {
132+ return assertShouldNeverHappen ("Unhandled case. An extra operation enum has been added without code support" );
133+ }
134+ }
133135}
0 commit comments