Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
classes
_site
generated-src/
out
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ dependencies {
testCompile 'com.google.code.gson:gson:2.8.0'
testCompile 'org.eclipse.jetty:jetty-server:9.4.5.v20170502'
testCompile 'org.slf4j:slf4j-simple:1.7.22'
testCompile 'org.awaitility:awaitility-groovy:3.0.0'

}

compileJava.source file("build/generated-src"), sourceSets.main.java
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/graphql/ExecutionResultImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
@Internal
public class ExecutionResultImpl implements ExecutionResult {

private final List<GraphQLError> errors;
private final Object data;
private final List<GraphQLError> errors;
private final transient boolean dataPresent;
private final transient Map<Object, Object> extensions;

Expand Down Expand Up @@ -74,4 +74,14 @@ public Map<String, Object> toSpecification() {
}
return result;
}

@Override
public String toString() {
return "ExecutionResultImpl{" +
"data=" + data +
", errors=" + errors +
", dataPresent=" + dataPresent +
", extensions=" + extensions +
'}';
}
}
15 changes: 8 additions & 7 deletions src/main/java/graphql/GraphQL.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package graphql;

import graphql.execution.AsyncExecutionStrategy;
import graphql.execution.AsyncSerialExecutionStrategy;
import graphql.execution.Execution;
import graphql.execution.ExecutionId;
import graphql.execution.ExecutionIdProvider;
import graphql.execution.ExecutionStrategy;
import graphql.execution.SimpleExecutionStrategy;
import graphql.execution.instrumentation.Instrumentation;
import graphql.execution.instrumentation.InstrumentationContext;
import graphql.execution.instrumentation.InstrumentationState;
Expand Down Expand Up @@ -106,9 +107,9 @@ public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, Exe

private GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, ExecutionIdProvider idProvider, Instrumentation instrumentation, PreparsedDocumentProvider preparsedDocumentProvider) {
this.graphQLSchema = assertNotNull(graphQLSchema, "queryStrategy must be non null");
this.queryStrategy = queryStrategy != null ? queryStrategy : new SimpleExecutionStrategy();
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new SimpleExecutionStrategy();
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new SimpleExecutionStrategy();
this.queryStrategy = queryStrategy != null ? queryStrategy : new AsyncExecutionStrategy();
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new AsyncSerialExecutionStrategy();
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new AsyncExecutionStrategy();
this.idProvider = assertNotNull(idProvider, "idProvider must be non null");
this.instrumentation = instrumentation;
this.preparsedDocumentProvider = assertNotNull(preparsedDocumentProvider, "preparsedDocumentProvider must be non null");
Expand All @@ -129,9 +130,9 @@ public static Builder newGraphQL(GraphQLSchema graphQLSchema) {
@PublicApi
public static class Builder {
private GraphQLSchema graphQLSchema;
private ExecutionStrategy queryExecutionStrategy = new SimpleExecutionStrategy();
private ExecutionStrategy mutationExecutionStrategy = new SimpleExecutionStrategy();
private ExecutionStrategy subscriptionExecutionStrategy = new SimpleExecutionStrategy();
private ExecutionStrategy queryExecutionStrategy = new AsyncExecutionStrategy();
private ExecutionStrategy mutationExecutionStrategy = new AsyncSerialExecutionStrategy();
private ExecutionStrategy subscriptionExecutionStrategy = new AsyncExecutionStrategy();
private ExecutionIdProvider idProvider = DEFAULT_EXECUTION_ID_PROVIDER;
private Instrumentation instrumentation = NoOpInstrumentation.INSTANCE;
private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package graphql.execution;

import graphql.ExecutionResult;
import graphql.ExecutionResultImpl;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;


public abstract class AbstractAsyncExecutionStrategy extends ExecutionStrategy {

public AbstractAsyncExecutionStrategy() {
}

public AbstractAsyncExecutionStrategy(DataFetcherExceptionHandler dataFetcherExceptionHandler) {
super(dataFetcherExceptionHandler);
}

protected void handleException(ExecutionContext executionContext, CompletableFuture<ExecutionResult> result, Throwable e) {
if (e instanceof CompletionException && e.getCause() instanceof NonNullableFieldWasNullException) {
assertNonNullFieldPrecondition((NonNullableFieldWasNullException) e.getCause(), result);
if (!result.isDone()) {
result.complete(new ExecutionResultImpl(null, executionContext.getErrors()));
}
} else {
result.completeExceptionally(e);
}
}

protected void completeCompletableFuture(ExecutionContext executionContext, List<String> fieldNames, List<CompletableFuture<ExecutionResult>> futures, CompletableFuture<ExecutionResult> result) {
Map<String, Object> resolvedValuesByField = new LinkedHashMap<>();
int ix = 0;
for (CompletableFuture<ExecutionResult> future : futures) {

if (future.isCompletedExceptionally()) {
future.whenComplete((Null, e) -> handleException(executionContext, result, e));
return;
}
String fieldName = fieldNames.get(ix++);
ExecutionResult resolvedResult = future.join();
resolvedValuesByField.put(fieldName, resolvedResult.getData());
}
result.complete(new ExecutionResultImpl(resolvedValuesByField, executionContext.getErrors()));
}
}
68 changes: 68 additions & 0 deletions src/main/java/graphql/execution/AsyncExecutionStrategy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package graphql.execution;

import graphql.ExecutionResult;
import graphql.language.Field;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;

/**
* The standard graphql execution strategy that runs fields asynchronously non-blocking.
*/
public class AsyncExecutionStrategy extends AbstractAsyncExecutionStrategy {

/**
* The standard graphql execution strategy that runs fields asynchronously
*/
public AsyncExecutionStrategy() {
super(new SimpleDataFetcherExceptionHandler());
}

/**
* Creates a execution strategy that uses the provided exception handler
*
* @param exceptionHandler the exception handler to use
*/
public AsyncExecutionStrategy(DataFetcherExceptionHandler exceptionHandler) {
super(exceptionHandler);
}

@Override
public CompletableFuture<ExecutionResult> execute(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {

Map<String, List<Field>> fields = parameters.fields();
List<String> fieldNames = new ArrayList<>(fields.keySet());
List<CompletableFuture<ExecutionResult>> futures = new ArrayList<>();
for (String fieldName : fieldNames) {
List<Field> currentField = fields.get(fieldName);

ExecutionPath fieldPath = parameters.path().segment(fieldName);
ExecutionStrategyParameters newParameters = parameters
.transform(builder -> builder.field(currentField).path(fieldPath));

CompletableFuture<ExecutionResult> future = resolveField(executionContext, newParameters);
futures.add(future);
}

CompletableFuture<ExecutionResult> result = new CompletableFuture<>();
CompletableFuture
.allOf(futures.toArray(new CompletableFuture[futures.size()]))
.whenComplete(futuresCompleted(executionContext, fieldNames, futures, result));

return result;
}

private BiConsumer<Void, Throwable> futuresCompleted(ExecutionContext executionContext,
List<String> fieldNames,
List<CompletableFuture<ExecutionResult>> futures,
CompletableFuture<ExecutionResult> result) {
return (notUsed1, notUsed2) -> {
completeCompletableFuture(executionContext, fieldNames, futures, result);
};
}


}
59 changes: 59 additions & 0 deletions src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package graphql.execution;

import graphql.ExecutionResult;
import graphql.language.Field;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;

/**
* Async non-blocking execution, but serial: only one field at the the time will be resolved.
* See {@link AsyncExecutionStrategy} for a non serial (parallel) execution of every field.
*/
public class AsyncSerialExecutionStrategy extends AbstractAsyncExecutionStrategy {

public AsyncSerialExecutionStrategy() {
super(new SimpleDataFetcherExceptionHandler());
}

public AsyncSerialExecutionStrategy(DataFetcherExceptionHandler exceptionHandler) {
super(exceptionHandler);
}

@Override
public CompletableFuture<ExecutionResult> execute(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {

CompletableFuture<ExecutionResult> result = new CompletableFuture<>();
resolveNthField(executionContext, parameters, 0, new ArrayList<>(), result);

return result;
}

private void resolveNthField(ExecutionContext executionContext,
ExecutionStrategyParameters parameters,
int index,
List<CompletableFuture<ExecutionResult>> allFutures,
CompletableFuture<ExecutionResult> overallResult) {
Map<String, List<Field>> fields = parameters.fields();
List<String> fieldNames = new ArrayList<>(fields.keySet());
String fieldName = fieldNames.get(index);

List<Field> currentField = fields.get(fieldName);
ExecutionPath fieldPath = parameters.path().segment(fieldName);
ExecutionStrategyParameters newParameters = parameters
.transform(builder -> builder.field(currentField).path(fieldPath));
CompletableFuture<ExecutionResult> future = resolveField(executionContext, newParameters);
future.whenComplete((notUsed1, notUsed2) -> {
allFutures.add(future);
if (index + 1 == fields.size()) {
completeCompletableFuture(executionContext, fieldNames, allFutures, overallResult);
} else {
resolveNthField(executionContext, parameters, index + 1, allFutures, overallResult);
}
});
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public class DataFetcherExceptionHandlerParameters {
private final GraphQLFieldDefinition fieldDefinition;
private final Map<String, Object> argumentValues;
private final ExecutionPath path;
private final Exception exception;
private final Throwable exception;

public DataFetcherExceptionHandlerParameters(ExecutionContext executionContext, DataFetchingEnvironment dataFetchingEnvironment, Field field, GraphQLFieldDefinition fieldDefinition, Map<String, Object> argumentValues, ExecutionPath path, Exception exception) {
public DataFetcherExceptionHandlerParameters(ExecutionContext executionContext, DataFetchingEnvironment dataFetchingEnvironment, Field field, GraphQLFieldDefinition fieldDefinition, Map<String, Object> argumentValues, ExecutionPath path, Throwable exception) {
this.executionContext = executionContext;
this.dataFetchingEnvironment = dataFetchingEnvironment;
this.field = field;
Expand Down Expand Up @@ -57,7 +57,7 @@ public ExecutionPath getPath() {
return path;
}

public Exception getException() {
public Throwable getException() {
return exception;
}

Expand All @@ -68,7 +68,7 @@ public static class Builder {
GraphQLFieldDefinition fieldDefinition;
Map<String, Object> argumentValues;
ExecutionPath path;
Exception exception;
Throwable exception;

private Builder() {
}
Expand Down Expand Up @@ -103,7 +103,7 @@ public Builder path(ExecutionPath path) {
return this;
}

public Builder exception(Exception exception) {
public Builder exception(Throwable exception) {
this.exception = exception;
return this;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/graphql/execution/Execution.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public class Execution {
private final Instrumentation instrumentation;

public Execution(ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, Instrumentation instrumentation) {
this.queryStrategy = queryStrategy != null ? queryStrategy : new SimpleExecutionStrategy();
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new SimpleExecutionStrategy();
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new SimpleExecutionStrategy();
this.queryStrategy = queryStrategy != null ? queryStrategy : new AsyncExecutionStrategy();
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new AsyncSerialExecutionStrategy();
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new AsyncExecutionStrategy();
this.instrumentation = instrumentation;
}

Expand Down
Loading