remove unused import; remove redundant method

dugenkui03 · dugenkui03 · commit 1bd60a39e984 · 2020-10-13T13:38:37.000+08:00
diff --git a/src/main/java/graphql/execution/AbstractAsyncExecutionStrategy.java b/src/main/java/graphql/execution/AbstractAsyncExecutionStrategy.java
@@ -21,10 +21,6 @@ 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) -> {
diff --git a/src/main/java/graphql/execution/AsyncExecutionStrategy.java b/src/main/java/graphql/execution/AsyncExecutionStrategy.java
@@ -62,7 +62,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, parameters);
+            BiConsumer<List<ExecutionResult>, Throwable> handleResultsConsumer = handleResults(executionContext, resolvedFields, overallResult);
             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
@@ -46,7 +46,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont
         CompletableFuture<ExecutionResult> overallResult = new CompletableFuture<>();
         executionStrategyCtx.onDispatched(overallResult);
 
-        resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult, parameters));
+        resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult));
         overallResult.whenComplete(executionStrategyCtx::onCompleted);
         return overallResult;
     }
diff --git a/src/test/groovy/graphql/Issue1768.groovy b/src/test/groovy/graphql/Issue1768.groovy
@@ -1,20 +1,8 @@
 package graphql
 
 import graphql.schema.DataFetcher
-import graphql.schema.GraphQLObjectType
-import graphql.schema.GraphQLSchema
-import graphql.schema.GraphQLSchemaElement
-import graphql.schema.GraphQLTypeVisitorStub
-import graphql.schema.SchemaTransformer
-import graphql.schema.idl.NaturalEnumValuesProvider
-import graphql.util.TraversalControl
-import graphql.util.TraverserContext
-import graphql.util.TreeTransformerUtil
 import spock.lang.Specification
 
-import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring
-import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring
-
 class Issue1768 extends Specification {
 
     static enum ThreadSort {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont`
`46`	`46`	`CompletableFuture<ExecutionResult> overallResult = new CompletableFuture<>();`
`47`	`47`	`executionStrategyCtx.onDispatched(overallResult);`
`48`	`48`
`49`		`- resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult, parameters));`
	`49`	`+ resultsFuture.whenComplete(handleResults(executionContext, fieldNames, overallResult));`
`50`	`50`	`overallResult.whenComplete(executionStrategyCtx::onCompleted);`
`51`	`51`	`return overallResult;`
`52`	`52`	`}`