Skip to content

Allow null values in DefaultExecutionStrategyProvider #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2020
Merged

Allow null values in DefaultExecutionStrategyProvider #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions ...rt/src/main/java/graphql/kickstart/execution/config/DefaultExecutionStrategyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package graphql.kickstart.execution.config;

import graphql.execution.AsyncExecutionStrategy;
import graphql.execution.ExecutionStrategy;
import graphql.execution.SubscriptionExecutionStrategy;

/**
* @author Andrew Potter
Expand All @@ -18,19 +16,14 @@ public DefaultExecutionStrategyProvider() {
}

public DefaultExecutionStrategyProvider(ExecutionStrategy executionStrategy) {
this(executionStrategy, null, null);
this(executionStrategy, executionStrategy, null);
}

public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy,
ExecutionStrategy mutationExecutionStrategy, ExecutionStrategy subscriptionExecutionStrategy) {
this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy, new AsyncExecutionStrategy());
this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, this.queryExecutionStrategy);
this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy,
new SubscriptionExecutionStrategy());
}

private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {
return executionStrategy != null ? executionStrategy : defaultStrategy;
this.queryExecutionStrategy = queryExecutionStrategy;
this.mutationExecutionStrategy = mutationExecutionStrategy;
this.subscriptionExecutionStrategy = subscriptionExecutionStrategy;
}

@Override
Expand Down
21 changes: 18 additions & 3 deletions graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package graphql.kickstart.execution.config;

import graphql.GraphQL;
import graphql.execution.ExecutionStrategy;
import graphql.execution.instrumentation.ChainedInstrumentation;
import graphql.execution.instrumentation.Instrumentation;
import graphql.execution.instrumentation.SimpleInstrumentation;
Expand Down Expand Up @@ -49,11 +50,25 @@ public GraphQL build(GraphQLSchema schema) {

public GraphQL build(GraphQLSchema schema, Supplier<Instrumentation> configuredInstrumentationSupplier) {
ExecutionStrategyProvider executionStrategyProvider = executionStrategyProviderSupplier.get();
ExecutionStrategy queryExecutionStrategy = executionStrategyProvider.getQueryExecutionStrategy();
ExecutionStrategy mutationExecutionStrategy = executionStrategyProvider.getMutationExecutionStrategy();
ExecutionStrategy subscriptionExecutionStrategy = executionStrategyProvider.getSubscriptionExecutionStrategy();

GraphQL.Builder builder = GraphQL.newGraphQL(schema)
.queryExecutionStrategy(executionStrategyProvider.getQueryExecutionStrategy())
.mutationExecutionStrategy(executionStrategyProvider.getMutationExecutionStrategy())
.subscriptionExecutionStrategy(executionStrategyProvider.getSubscriptionExecutionStrategy())
.preparsedDocumentProvider(preparsedDocumentProviderSupplier.get());

if (queryExecutionStrategy != null) {
builder.queryExecutionStrategy(queryExecutionStrategy);
}

if (mutationExecutionStrategy != null) {
builder.mutationExecutionStrategy(mutationExecutionStrategy);
}

if (subscriptionExecutionStrategy != null) {
builder.subscriptionExecutionStrategy(subscriptionExecutionStrategy);
}

Instrumentation instrumentation = configuredInstrumentationSupplier.get();
builder.instrumentation(instrumentation);
if (containsDispatchInstrumentation(instrumentation)) {
Expand Down