graphql-java#1855 add ExecutionStrategyParameters parameter to handleResults method (graphql-java#1935)

bugy · web-flow · commit d94eacc4fc97 · 2020-06-07T11:06:46.000+10:00
diff --git a/src/main/java/graphql/execution/AbstractAsyncExecutionStrategy.java b/src/main/java/graphql/execution/AbstractAsyncExecutionStrategy.java
@@ -19,6 +19,11 @@ public AbstractAsyncExecutionStrategy(DataFetcherExceptionHandler dataFetcherExc
         super(dataFetcherExceptionHandler);
     }
 
+    protected BiConsumer<List<ExecutionResult>, Throwable> handleResults(ExecutionContext executionContext, List<String> fieldNames, CompletableFuture<ExecutionResult> overallResult, ExecutionStrategyParameters parameters) {
+        return this.handleResults(executionContext, fieldNames, overallResult);
+    }
+
+    // This method is kept for backward compatibility. Prefer calling/overriding another handleResults method
     protected BiConsumer<List<ExecutionResult>, Throwable> handleResults(ExecutionContext executionContext, List<String> fieldNames, CompletableFuture<ExecutionResult> overallResult) {
         return (List<ExecutionResult> results, Throwable exception) -> {
             if (exception != null) {
diff --git a/src/main/java/graphql/execution/AsyncExecutionStrategy.java b/src/main/java/graphql/execution/AsyncExecutionStrategy.java
@@ -79,7 +79,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont
         executionStrategyCtx.onDispatched(overallResult);
 
         Async.each(futures).whenComplete((completeValueInfos, throwable) -> {
-            BiConsumer<List<ExecutionResult>, Throwable> handleResultsConsumer = handleResults(executionContext, resolvedFields, overallResult);
+            BiConsumer<List<ExecutionResult>, Throwable> handleResultsConsumer = handleResults(executionContext, resolvedFields, overallResult, parameters);
             if (throwable != null) {
                 handleResultsConsumer.accept(null, throwable.getCause());
                 return;
diff --git a/src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java b/src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java
@@ -24,7 +24,7 @@ public AsyncSerialExecutionStrategy(DataFetcherExceptionHandler exceptionHandler
     }
 
     @Override
-    @SuppressWarnings({"TypeParameterUnusedInFormals","FutureReturnValueIgnored"})
+    @SuppressWarnings({"TypeParameterUnusedInFormals", "FutureReturnValueIgnored"})
     public CompletableFuture<ExecutionResult> execute(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {
 
         Instrumentation instrumentation = executionContext.getInstrumentation();
@@ -44,7 +44,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont
         CompletableFuture<ExecutionResult> overallResult = new CompletableFuture<>();
         executionStrategyCtx.onDispatched(overallResult);
 
-        resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult));
+        resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult, parameters));
         overallResult.whenComplete(executionStrategyCtx::onCompleted);
         return overallResult;
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public AsyncSerialExecutionStrategy(DataFetcherExceptionHandler exceptionHandler`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- @SuppressWarnings({"TypeParameterUnusedInFormals","FutureReturnValueIgnored"})`
	`27`	`+ @SuppressWarnings({"TypeParameterUnusedInFormals", "FutureReturnValueIgnored"})`
`28`	`28`	`public CompletableFuture<ExecutionResult> execute(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {`
`29`	`29`
`30`	`30`	`Instrumentation instrumentation = executionContext.getInstrumentation();`
`@@ -44,7 +44,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont`
`44`	`44`	`CompletableFuture<ExecutionResult> overallResult = new CompletableFuture<>();`
`45`	`45`	`executionStrategyCtx.onDispatched(overallResult);`
`46`	`46`
`47`		`- resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult));`
	`47`	`+ resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult, parameters));`
`48`	`48`	`overallResult.whenComplete(executionStrategyCtx::onCompleted);`
`49`	`49`	`return overallResult;`
`50`	`50`	`}`