Merge branch 'master' into query_invoker_refactor

Author: jmccaull

examples/osgi/apache-karaf-feature/pom.xml

@@ -13,7 +13,7 @@
     <packaging>feature</packaging>
 
     <properties>
-        <jackson.version>2.9.8</jackson.version>
+        <jackson.version>2.9.9</jackson.version>
     </properties>
 
 

src/main/java/graphql/servlet/core/DefaultGraphQLErrorHandler.java

@@ -26,20 +26,22 @@ public List<GraphQLError> processErrors(List<GraphQLError> errors) {
 
             errors.stream()
                     .filter(error -> !isClientError(error))
-                    .forEach(error -> {
-                        if (error instanceof Throwable) {
-                            log.error("Error executing query!", (Throwable) error);
-                        } else if (error instanceof ExceptionWhileDataFetching) {
-                            log.error("Error executing query {}", error.getMessage(), ((ExceptionWhileDataFetching) error).getException());
-                        } else {
-                            log.error("Error executing query ({}): {}", error.getClass().getSimpleName(), error.getMessage());
-                        }
-                    });
+                    .forEach(this::logError);
         }
 
         return clientErrors;
     }
 
+    protected void logError(GraphQLError error) {
+        if (error instanceof Throwable) {
+            log.error("Error executing query!", (Throwable) error);
+        } else if (error instanceof ExceptionWhileDataFetching) {
+            log.error("Error executing query {}", error.getMessage(), ((ExceptionWhileDataFetching) error).getException());
+        } else {
+            log.error("Error executing query ({}): {}", error.getClass().getSimpleName(), error.getMessage());
+        }
+    }
+
     protected List<GraphQLError> filterGraphQLErrors(List<GraphQLError> errors) {
         return errors.stream()
                 .filter(this::isClientError)