@@ -34,24 +34,17 @@ public class ResultNodesUtil {
3434
3535 public static ExecutionResult toExecutionResult (RootExecutionResultNode root ) {
3636 ExecutionResultData executionResultData = toDataImpl (root );
37- List <GraphQLError > allErrors = new ArrayList <>();
38- allErrors .addAll (executionResultData .errors );
39- allErrors .addAll (root .getErrors ());
4037 return ExecutionResultImpl .newExecutionResult ()
4138 .data (executionResultData .data )
42- .errors (allErrors )
39+ .errors (executionResultData . errors )
4340 .build ();
4441 }
4542
4643 private static class ExecutionResultData {
4744 Object data ;
48- List <GraphQLError > errors = new ArrayList <>() ;
45+ List <GraphQLError > errors ;
4946
5047
51- public ExecutionResultData (Object data ) {
52- this .data = data ;
53- }
54-
5548 public ExecutionResultData (Object data , List <GraphQLError > errors ) {
5649 this .data = data ;
5750 this .errors = errors ;
@@ -60,7 +53,10 @@ public ExecutionResultData(Object data, List<GraphQLError> errors) {
6053
6154
6255 private static ExecutionResultData data (Object data , ExecutionResultNode executionResultNode ) {
63- return new ExecutionResultData (data , executionResultNode .getFetchedValueAnalysis ().getErrors ());
56+ List <GraphQLError > allErrors = new ArrayList <>();
57+ allErrors .addAll (executionResultNode .getFetchedValueAnalysis ().getErrors ());
58+ allErrors .addAll (executionResultNode .getErrors ());
59+ return new ExecutionResultData (data , allErrors );
6460 }
6561
6662 private static ExecutionResultData data (Object data , List <GraphQLError > errors ) {
@@ -76,14 +72,15 @@ private static ExecutionResultData toDataImpl(ExecutionResultNode root) {
7672 return root .getFetchedValueAnalysis ().isNullValue () ? data (null , root ) : data (((LeafExecutionResultNode ) root ).getValue (), root );
7773 }
7874 if (root instanceof ListExecutionResultNode ) {
79- Optional <NonNullableFieldWasNullException > childNonNullableException = (( ListExecutionResultNode ) root ) .getChildNonNullableException ();
75+ Optional <NonNullableFieldWasNullException > childNonNullableException = root .getChildNonNullableException ();
8076 if (childNonNullableException .isPresent ()) {
8177 return data (null , childNonNullableException .get ());
8278 }
8379 List <ExecutionResultData > list = map (root .getChildren (), ResultNodesUtil ::toDataImpl );
8480 List <Object > data = map (list , erd -> erd .data );
8581 List <GraphQLError > errors = new ArrayList <>();
8682 list .forEach (erd -> errors .addAll (erd .errors ));
83+ errors .addAll (root .getErrors ());
8784 return data (data , errors );
8885 }
8986
@@ -92,7 +89,7 @@ private static ExecutionResultData toDataImpl(ExecutionResultNode root) {
9289 return data ("Not resolved : " + fetchedValueAnalysis .getExecutionStepInfo ().getPath () + " with field " + fetchedValueAnalysis .getField (), emptyList ());
9390 }
9491 if (root instanceof ObjectExecutionResultNode ) {
95- Optional <NonNullableFieldWasNullException > childrenNonNullableException = (( ObjectExecutionResultNode ) root ) .getChildNonNullableException ();
92+ Optional <NonNullableFieldWasNullException > childrenNonNullableException = root .getChildNonNullableException ();
9693 if (childrenNonNullableException .isPresent ()) {
9794 return data (null , childrenNonNullableException .get ());
9895 }
@@ -103,6 +100,7 @@ private static ExecutionResultData toDataImpl(ExecutionResultNode root) {
103100 resultMap .put (child .getMergedField ().getResultKey (), executionResultData .data );
104101 errors .addAll (executionResultData .errors );
105102 });
103+ errors .addAll (root .getErrors ());
106104 return data (resultMap , errors );
107105 }
108106 throw new RuntimeException ("Unexpected root " + root );
0 commit comments