Merge pull request #568 from jeskew-gov/allow-errors-with-null-paths

Only call GraphqlErrorBuilder with non-null data

Author: oliemansm

graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandler.java

@@ -71,15 +71,13 @@ private Collection<GraphQLError> withThrowable(Throwable throwable, ErrorContext
     Map<String, Object> extensions = Optional.ofNullable(errorContext.getExtensions())
         .orElseGet(HashMap::new);
     extensions.put("type", throwable.getClass().getSimpleName());
-    return singletonList(
-        GraphqlErrorBuilder.newError()
-            .message(throwable.getMessage())
-            .errorType(errorContext.getErrorType())
-            .locations(errorContext.getLocations())
-            .path(errorContext.getPath())
-            .extensions(extensions)
-            .build()
-    );
+    GraphqlErrorBuilder builder = GraphqlErrorBuilder.newError()
+        .extensions(extensions);
+    Optional.ofNullable(throwable.getMessage()).ifPresent(builder::message);
+    Optional.ofNullable(errorContext.getErrorType()).ifPresent(builder::errorType);
+    Optional.ofNullable(errorContext.getLocations()).ifPresent(builder::locations);
+    Optional.ofNullable(errorContext.getPath()).ifPresent(builder::path);
+    return singletonList(builder.build());
   }
 
 }

graphql-kickstart-spring-support/src/test/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandlerTest.java

@@ -0,0 +1,41 @@
+package graphql.kickstart.spring.error;
+
+import graphql.ErrorType;
+import graphql.GraphQLError;
+import graphql.GraphqlErrorException;
+import graphql.language.SourceLocation;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GraphQLErrorFromExceptionHandlerTest {
+  @Test
+  void allows_errors_with_null_path() {
+    GraphQLErrorFromExceptionHandler sut = new GraphQLErrorFromExceptionHandler(new ArrayList<>());
+
+    List<GraphQLError> errors = new ArrayList<>();
+    errors.add(GraphqlErrorException.newErrorException()
+        .message("Error without a path")
+        .sourceLocation(new SourceLocation(0, 0))
+        .build());
+    errors.add(GraphqlErrorException.newErrorException()
+        .message("Error with path")
+        .sourceLocation(new SourceLocation(0, 0))
+        .errorClassification(ErrorType.ValidationError)
+        .path(new ArrayList<>())
+        .build());
+
+    List<GraphQLError> processedErrors = sut.filterGraphQLErrors(errors);
+
+    for (int i = 0; i < errors.size(); i++) {
+      GraphQLError error = errors.get(i);
+      GraphQLError processedError = processedErrors.get(i);
+      assertEquals(error.getMessage(), processedError.getMessage());
+      assertEquals(error.getErrorType(), processedError.getErrorType());
+      assertEquals(error.getLocations(), processedError.getLocations());
+      assertEquals(error.getPath(), processedError.getPath());
+    }
+  }
+}