add errors to the root ERN

andimarek · bbakerman · commit a35079e3ed1f · 2019-03-22T13:03:27.000+11:00
diff --git a/src/main/java/graphql/execution/nextgen/result/ResultNodesUtil.java b/src/main/java/graphql/execution/nextgen/result/ResultNodesUtil.java
@@ -32,11 +32,14 @@
 @Internal
 public class ResultNodesUtil {
 
-    public static ExecutionResult toExecutionResult(ExecutionResultNode root) {
+    public static ExecutionResult toExecutionResult(RootExecutionResultNode root) {
         ExecutionResultData executionResultData = toDataImpl(root);
+        List<GraphQLError> allErrors = new ArrayList<>();
+        allErrors.addAll(executionResultData.errors);
+        allErrors.addAll(root.getErrors());
         return ExecutionResultImpl.newExecutionResult()
                 .data(executionResultData.data)
-                .errors(executionResultData.errors)
+                .errors(allErrors)
                 .build();
     }
 
diff --git a/src/main/java/graphql/execution/nextgen/result/RootExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/RootExecutionResultNode.java
@@ -1,13 +1,24 @@
 package graphql.execution.nextgen.result;
 
+import graphql.GraphQLError;
 import graphql.execution.nextgen.FetchedValueAnalysis;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class RootExecutionResultNode extends ObjectExecutionResultNode {
 
+    private final List<GraphQLError> errors;
+
+    public RootExecutionResultNode(List<ExecutionResultNode> children, List<GraphQLError> errors) {
+        super(null, children);
+        this.errors = new ArrayList<>(errors);
+    }
+
     public RootExecutionResultNode(List<ExecutionResultNode> children) {
         super(null, children);
+        this.errors = Collections.emptyList();
     }
 
     @Override
@@ -19,4 +30,8 @@ public FetchedValueAnalysis getFetchedValueAnalysis() {
     public ObjectExecutionResultNode withNewChildren(List<ExecutionResultNode> children) {
         return new RootExecutionResultNode(children);
     }
+
+    public List<GraphQLError> getErrors() {
+        return new ArrayList<>(errors);
+    }
 }
diff --git a/src/test/groovy/graphql/execution/nextgen/DefaultExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/nextgen/DefaultExecutionStrategyTest.groovy
@@ -14,6 +14,31 @@ import static graphql.execution.DataFetcherResult.newResult
 
 class DefaultExecutionStrategyTest extends Specification {
 
+    def "test simple execution with one scalar field"() {
+        def fooData = "hello"
+        def dataFetchers = [
+                Query: [foo: { env -> fooData } as DataFetcher]
+        ]
+        def schema = schema("""
+        type Query {
+            foo: String
+        }
+        """, dataFetchers)
+
+
+        def query = """
+        {foo} 
+        """
+
+
+        when:
+        def graphQL = GraphQL.newGraphQL(schema).executionStrategy(new DefaultExecutionStrategy()).build()
+        def result = graphQL.execute(newExecutionInput().query(query))
+
+        then:
+        result.getData() == [foo: fooData]
+
+    }
 
     def "test simple execution"() {
         def fooData = [id: "fooId", bar: [id: "barId", name: "someBar"]]
@@ -376,6 +401,7 @@ class DefaultExecutionStrategyTest extends Specification {
 
         then:
         result.getData() == null
+        result.getErrors().size() > 0
     }
 
     def "test list"() {
