open-source-explore
diff --git a/‎src/main/java/graphql/execution/DataFetcherResult.java‎
Lines changed: 2 additions & 0 deletions b/‎src/main/java/graphql/execution/DataFetcherResult.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/graphql/execution/ExecutionStrategy.java‎
Lines changed: 28 additions & 22 deletions b/‎src/main/java/graphql/execution/ExecutionStrategy.java‎
Lines changed: 28 additions & 22 deletions
@@ -1,6 +1,7 @@
 package graphql.execution;
 
 import graphql.GraphQLError;
+import graphql.PublicApi;
 import graphql.schema.DataFetcher;
 
 import java.util.List;
@@ -14,6 +15,7 @@
  *
  * @param <T> The type of the data fetched
  */
+@PublicApi
 public class DataFetcherResult<T> {
 
     private final T data;
 
@@ -1,9 +1,7 @@
 package graphql.execution;
 
-import graphql.ErrorType;
 import graphql.ExecutionResult;
 import graphql.ExecutionResultImpl;
-import graphql.GraphQLError;
 import graphql.PublicSpi;
 import graphql.SerializationError;
 import graphql.TypeResolutionEnvironment;
@@ -14,7 +12,6 @@
 import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters;
 import graphql.introspection.Introspection;
 import graphql.language.Field;
-import graphql.language.SourceLocation;
 import graphql.schema.CoercingSerializeException;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
@@ -40,7 +37,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import java.util.function.Function;
 import java.util.stream.IntStream;
 
 import static graphql.execution.ExecutionTypeInfo.newTypeInfo;
@@ -230,15 +226,34 @@ protected CompletableFuture<Object> fetchField(ExecutionContext executionContext
             fetchedValue = new CompletableFuture<>();
             fetchedValue.completeExceptionally(e);
         }
-        return fetchedValue.handle((result, exception) -> {
-            fetchCtx.onEnd(result, exception);
-            if (exception != null) {
-                handleFetchingException(executionContext, parameters, field, fieldDef, argumentValues, environment, exception);
-                return null;
-            } else {
-                return result;
-            }
-        });
+        return fetchedValue
+            .thenApply(result -> processPossibleDataFetcherResult(executionContext, parameters, result))
+            .handle((result, exception) -> {
+                fetchCtx.onEnd(result, exception);
+                if (exception != null) {
+                    handleFetchingException(executionContext, parameters, field, fieldDef, argumentValues, environment, exception);
+                    return null;
+                } else {
+                    return result;
+                }
+            });
+    }
+
+    Object processPossibleDataFetcherResult(ExecutionContext executionContext,
+                                            ExecutionStrategyParameters parameters,
+                                            Object result) {
+        if (result != null && result instanceof DataFetcherResult) {
+            //noinspection unchecked
+            DataFetcherResult<?> dataFetcherResult = (DataFetcherResult)result;
+            dataFetcherResult.getErrors().stream()
+                    .map(relError -> new AbsoluteGraphQLError(parameters, relError))
+                    .forEach(e -> executionContext.addError(e, Optional.ofNullable(e.getPath())
+                            .map(path -> ExecutionPath.fromList(e.getPath()))
+                            .orElse(parameters.path())));
+            return dataFetcherResult.getData();
+        } else {
+            return result;
+        }
     }
 
     private void handleFetchingException(ExecutionContext executionContext,
@@ -332,15 +347,6 @@ protected CompletableFuture<ExecutionResult> completeValue(ExecutionContext exec
         Object result = unboxPossibleOptional(parameters.source());
         GraphQLType fieldType = typeInfo.getType();
 
-        if (result != null && result instanceof DataFetcherResult) {
-            //noinspection unchecked
-            DataFetcherResult<Object> dataFetcherResult = (DataFetcherResult)result;
-            result = dataFetcherResult.getData();
-            dataFetcherResult.getErrors().stream()
-                    .map(relError -> new AbsoluteGraphQLError(parameters, relError))
-                    .forEach(e -> executionContext.addError(e, ExecutionPath.fromList(e.getPath())));
-        }
-
         if (result == null) {
             return completedFuture(new ExecutionResultImpl(parameters.nonNullFieldValidator().validate(parameters.path(), null), null));
         } else if (fieldType instanceof GraphQLList) {