Skip to content

Commit ce90d83

Browse files
committed
allowing null values to be passed into DefaultExecutionStrategyProvider because graphql-java handles null values and uses defaults when null execution strategies are given, so there is no longer a need to have default values set in this library
1 parent cba36c6 commit ce90d83

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/DefaultExecutionStrategyProvider.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package graphql.kickstart.execution.config;
22

3-
import graphql.execution.AsyncExecutionStrategy;
43
import graphql.execution.ExecutionStrategy;
5-
import graphql.execution.SubscriptionExecutionStrategy;
64

75
/**
86
* @author Andrew Potter
@@ -18,19 +16,14 @@ public DefaultExecutionStrategyProvider() {
1816
}
1917

2018
public DefaultExecutionStrategyProvider(ExecutionStrategy executionStrategy) {
21-
this(executionStrategy, null, null);
19+
this(executionStrategy, executionStrategy, null);
2220
}
2321

2422
public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy,
2523
ExecutionStrategy mutationExecutionStrategy, ExecutionStrategy subscriptionExecutionStrategy) {
26-
this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy, new AsyncExecutionStrategy());
27-
this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, this.queryExecutionStrategy);
28-
this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy,
29-
new SubscriptionExecutionStrategy());
30-
}
31-
32-
private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {
33-
return executionStrategy != null ? executionStrategy : defaultStrategy;
24+
this.queryExecutionStrategy = queryExecutionStrategy;
25+
this.mutationExecutionStrategy = mutationExecutionStrategy;
26+
this.subscriptionExecutionStrategy = subscriptionExecutionStrategy;
3427
}
3528

3629
@Override

0 commit comments

Comments
 (0)