Merge remote-tracking branch 'origin/master'

Author: oliemansm

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

@@ -1,16 +1,25 @@
 package graphql.kickstart.spring.error;
 
+import graphql.ErrorClassification;
 import graphql.language.SourceLocation;
 
 import java.util.List;
+import java.util.Map;
 
 public class ErrorContext {
     private final List<SourceLocation> locations;
     private final List<Object> path;
+    private final Map<String, Object> extensions;
+    private final ErrorClassification errorType;
 
-    public ErrorContext(List<SourceLocation> locations, List<Object> path) {
+    public ErrorContext(List<SourceLocation> locations,
+                        List<Object> path,
+                        Map<String, Object> extensions,
+                        ErrorClassification errorType) {
         this.locations = locations;
         this.path = path;
+        this.extensions = extensions;
+        this.errorType = errorType;
     }
 
     public List<SourceLocation> getLocations() {
@@ -20,4 +29,12 @@ public List<SourceLocation> getLocations() {
     public List<Object> getPath() {
         return path;
     }
+
+    public Map<String, Object> getExtensions() {
+        return extensions;
+    }
+
+    public ErrorClassification getErrorType() {
+        return errorType;
+    }
 }

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

@@ -32,7 +32,12 @@ protected List<GraphQLError> filterGraphQLErrors(List<GraphQLError> errors) {
   }
 
   private Collection<GraphQLError> transform(GraphQLError error) {
-    ErrorContext errorContext = new ErrorContext(error.getLocations(), error.getPath());
+    ErrorContext errorContext = new ErrorContext(
+            error.getLocations(),
+            error.getPath(),
+            error.getExtensions(),
+            error.getErrorType()
+    );
     return extractException(error).map(throwable -> transform(throwable, errorContext))
         .orElse(singletonList(new GenericGraphQLError(error.getMessage())));
   }