Add optional handling, rename unboxing

mrdon-atlassian · bbakerman · commit df57417aa5d0 · 2017-11-20T07:50:36.000+11:00
diff --git a/src/main/java/graphql/execution/DataFetcherResult.java b/src/main/java/graphql/execution/DataFetcherResult.java
@@ -11,7 +11,8 @@
 
 /**
  * An object that can be returned from a {@link DataFetcher} that contains both data and errors to be relativized and
- * added to the final result.
+ * added to the final result. This is a useful when your ``DataFetcher`` retrieves data from multiple sources
+ * or from another GraphQL resource.
  *
  * @param <T> The type of the data fetched
  */
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -230,13 +230,14 @@ protected CompletableFuture<Object> fetchField(ExecutionContext executionContext
                         return result;
                     }
                 })
-                .thenApply(result -> processPossibleDataFetcherResult(executionContext, parameters, result));
+                .thenApply(result -> unboxPossibleDataFetcherResult(executionContext, parameters, result))
+                .thenApply(this::unboxPossibleOptional);
     }
 
-    Object processPossibleDataFetcherResult(ExecutionContext executionContext,
-                                            ExecutionStrategyParameters parameters,
-                                            Object result) {
-        if (result != null && result instanceof DataFetcherResult) {
+    Object unboxPossibleDataFetcherResult(ExecutionContext executionContext,
+                                          ExecutionStrategyParameters parameters,
+                                          Object result) {
+        if (result instanceof DataFetcherResult) {
             //noinspection unchecked
             DataFetcherResult<?> dataFetcherResult = (DataFetcherResult) result;
             dataFetcherResult.getErrors().stream()
diff --git a/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy
@@ -23,7 +23,6 @@ import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
 import spock.lang.Specification
 
-import javax.xml.transform.Source
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionException
 
@@ -537,7 +536,7 @@ class ExecutionStrategyTest extends Specification {
 
         def executionData = ["child": [:]]
         when:
-        def executionResult = executionStrategy.processPossibleDataFetcherResult(executionContext, parameters,
+        def executionResult = executionStrategy.unboxPossibleDataFetcherResult(executionContext, parameters,
                 new DataFetcherResult(executionData, [new DataFetchingErrorGraphQLError("bad foo", ["child", "foo"])]))
 
         then:
@@ -565,7 +564,7 @@ class ExecutionStrategyTest extends Specification {
 
         def executionData = ["child": [:]]
         when:
-        def executionResult = executionStrategy.processPossibleDataFetcherResult(executionContext, parameters,
+        def executionResult = executionStrategy.unboxPossibleDataFetcherResult(executionContext, parameters,
                 new DataFetcherResult(executionData, [new DataFetchingErrorGraphQLError("bad foo")]))
 
         then:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* An object that can be returned from a {@link DataFetcher} that contains both data and errors to be relativized and`
`14`		`- * added to the final result.`
	`14`	+ * added to the final result. This is a useful when your ``DataFetcher`` retrieves data from multiple sources
	`15`	`+ * or from another GraphQL resource.`
`15`	`16`	`*`
`16`	`17`	`* @param <T> The type of the data fetched`
`17`	`18`	`*/`