Added with new error support to result node

bbakerman · bbakerman · commit 31d4cecd1a56 · 2019-03-26T10:53:38.000+11:00
diff --git a/src/main/java/graphql/execution/nextgen/result/ExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/ExecutionResultNode.java
@@ -55,16 +55,37 @@ public List<ExecutionResultNode> getChildren() {
         return new ArrayList<>(this.children);
     }
 
-    public abstract ExecutionResultNode withNewChildren(List<ExecutionResultNode> children);
-
-    public abstract ExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis fetchedValueAnalysis);
-
     public Optional<NonNullableFieldWasNullException> getChildNonNullableException() {
         return children.stream()
                 .filter(executionResultNode -> executionResultNode.getNonNullableFieldWasNullException() != null)
                 .map(ExecutionResultNode::getNonNullableFieldWasNullException)
                 .findFirst();
     }
 
+    /**
+     * Creates a new ExecutionResultNode of the same specific type with the new set of result children
+     *
+     * @param children the new children for this result node
+     *
+     * @return a new ExecutionResultNode with the new result children
+     */
+    public abstract ExecutionResultNode withNewChildren(List<ExecutionResultNode> children);
+
+    /**
+     * Creates a new ExecutionResultNode of the same specific type with the new {@link graphql.execution.nextgen.FetchedValueAnalysis}
+     *
+     * @param fetchedValueAnalysis the {@link graphql.execution.nextgen.FetchedValueAnalysis} for this result node
+     *
+     * @return a new ExecutionResultNode with the new {@link graphql.execution.nextgen.FetchedValueAnalysis}
+     */
+    public abstract ExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis fetchedValueAnalysis);
 
+    /**
+     * Creates a new ExecutionResultNode of the same specific type with the new error collection
+     *
+     * @param errors the new errors for this result node
+     *
+     * @return a new ExecutionResultNode with the new errors
+     */
+    public abstract ExecutionResultNode withNewErrors(List<GraphQLError> errors);
 }
diff --git a/src/main/java/graphql/execution/nextgen/result/LeafExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/LeafExecutionResultNode.java
@@ -6,6 +6,7 @@
 import graphql.execution.NonNullableFieldWasNullException;
 import graphql.execution.nextgen.FetchedValueAnalysis;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,4 +38,9 @@ public ExecutionResultNode withNewChildren(List<ExecutionResultNode> children) {
     public ExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis fetchedValueAnalysis) {
         return new LeafExecutionResultNode(fetchedValueAnalysis, getNonNullableFieldWasNullException(), getErrors());
     }
+
+    @Override
+    public ExecutionResultNode withNewErrors(List<GraphQLError> errors) {
+        return new LeafExecutionResultNode(getFetchedValueAnalysis(), getNonNullableFieldWasNullException(), new ArrayList<>(errors));
+    }
 }
diff --git a/src/main/java/graphql/execution/nextgen/result/ListExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/ListExecutionResultNode.java
@@ -4,6 +4,7 @@
 import graphql.Internal;
 import graphql.execution.nextgen.FetchedValueAnalysis;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -31,4 +32,9 @@ public ExecutionResultNode withNewChildren(List<ExecutionResultNode> children) {
     public ExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis fetchedValueAnalysis) {
         return new ListExecutionResultNode(fetchedValueAnalysis, getChildren(), getErrors());
     }
+
+    @Override
+    public ExecutionResultNode withNewErrors(List<GraphQLError> errors) {
+        return new ListExecutionResultNode(getFetchedValueAnalysis(), getChildren(), new ArrayList<>(errors));
+    }
 }
diff --git a/src/main/java/graphql/execution/nextgen/result/ObjectExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/ObjectExecutionResultNode.java
@@ -4,6 +4,7 @@
 import graphql.Internal;
 import graphql.execution.nextgen.FetchedValueAnalysis;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,4 +34,9 @@ public ObjectExecutionResultNode withNewChildren(List<ExecutionResultNode> child
     public ExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis fetchedValueAnalysis) {
         return new ObjectExecutionResultNode(fetchedValueAnalysis, getChildren(), getErrors());
     }
+
+    @Override
+    public ExecutionResultNode withNewErrors(List<GraphQLError> errors) {
+        return new ObjectExecutionResultNode(getFetchedValueAnalysis(), getChildren(), new ArrayList<>(errors));
+    }
 }
diff --git a/src/main/java/graphql/execution/nextgen/result/RootExecutionResultNode.java b/src/main/java/graphql/execution/nextgen/result/RootExecutionResultNode.java
@@ -3,6 +3,7 @@
 import graphql.GraphQLError;
 import graphql.execution.nextgen.FetchedValueAnalysis;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,5 +36,8 @@ public RootExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis
         return assertShouldNeverHappen("not supported at root node");
     }
 
-
+    @Override
+    public ExecutionResultNode withNewErrors(List<GraphQLError> errors) {
+        return new RootExecutionResultNode(getChildren(), new ArrayList<>(errors));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import graphql.GraphQLError;`
`4`	`4`	`import graphql.execution.nextgen.FetchedValueAnalysis;`
`5`	`5`
	`6`	`+import java.util.ArrayList;`
`6`	`7`	`import java.util.Collections;`
`7`	`8`	`import java.util.List;`
`8`	`9`
`@@ -35,5 +36,8 @@ public RootExecutionResultNode withNewFetchedValueAnalysis(FetchedValueAnalysis`
`35`	`36`	`return assertShouldNeverHappen("not supported at root node");`
`36`	`37`	`}`
`37`	`38`
`38`		`-`
	`39`	`+ @Override`
	`40`	`+ public ExecutionResultNode withNewErrors(List<GraphQLError> errors) {`
	`41`	`+ return new RootExecutionResultNode(getChildren(), new ArrayList<>(errors));`
	`42`	`+ }`
`39`	`43`	`}`