Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/graphql/GraphQL.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ public class GraphQL {
private static final Logger logNotSafe = LogKit.getNotPrivacySafeLogger(GraphQL.class);

private final static Instrumentation DEFAULT_INSTRUMENTATION = new DataLoaderDispatcherInstrumentation();
private final static ExecutionStrategy DEFAULT_QUERY_STRATEGY = new AsyncExecutionStrategy();
private final static ExecutionStrategy DEFAULT_MUTATION_STRATEGY = new AsyncSerialExecutionStrategy();
private final static ExecutionStrategy DEFAULT_SUBSCRIPTION_STRATEGY = new SubscriptionExecutionStrategy();


private final GraphQLSchema graphQLSchema;
private final ExecutionStrategy queryStrategy;
Expand Down Expand Up @@ -161,9 +165,9 @@ private GraphQL(GraphQLSchema graphQLSchema,
PreparsedDocumentProvider preparsedDocumentProvider,
ValueUnboxer valueUnboxer) {
this.graphQLSchema = assertNotNull(graphQLSchema, () -> "graphQLSchema must be non null");
this.queryStrategy = queryStrategy != null ? queryStrategy : new AsyncExecutionStrategy();
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new AsyncSerialExecutionStrategy();
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new SubscriptionExecutionStrategy();
this.queryStrategy = queryStrategy != null ? queryStrategy : DEFAULT_QUERY_STRATEGY;
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : DEFAULT_MUTATION_STRATEGY;
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : DEFAULT_SUBSCRIPTION_STRATEGY;
this.idProvider = assertNotNull(idProvider, () -> "idProvider must be non null");
this.instrumentation = assertNotNull(instrumentation);
this.preparsedDocumentProvider = assertNotNull(preparsedDocumentProvider, () -> "preparsedDocumentProvider must be non null");
Expand Down Expand Up @@ -209,9 +213,9 @@ private static <T> T nvl(T obj, T elseObj) {
@PublicApi
public static class Builder {
private GraphQLSchema graphQLSchema;
private ExecutionStrategy queryExecutionStrategy = new AsyncExecutionStrategy();
private ExecutionStrategy mutationExecutionStrategy = new AsyncSerialExecutionStrategy();
private ExecutionStrategy subscriptionExecutionStrategy = new SubscriptionExecutionStrategy();
private ExecutionStrategy queryExecutionStrategy = DEFAULT_QUERY_STRATEGY;
private ExecutionStrategy mutationExecutionStrategy = DEFAULT_MUTATION_STRATEGY;
private ExecutionStrategy subscriptionExecutionStrategy = DEFAULT_SUBSCRIPTION_STRATEGY;
private ExecutionIdProvider idProvider = DEFAULT_EXECUTION_ID_PROVIDER;
private Instrumentation instrumentation = null; // deliberate default here
private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
Expand Down