update graphql

Author: tvd12

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/controller/GraphQLController.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tvd12.ezyfox.builder.EzyBuilder;
 import com.tvd12.ezyfox.util.EzyMapBuilder;
+import com.tvd12.ezyhttp.core.exception.HttpBadRequestException;
+import com.tvd12.ezyhttp.core.exception.HttpInternalServerErrorException;
 import com.tvd12.ezyhttp.core.exception.HttpNotAcceptableException;
 import com.tvd12.ezyhttp.core.exception.HttpNotFoundException;
 import com.tvd12.ezyhttp.server.core.annotation.*;
@@ -12,7 +14,6 @@
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLDataFilter;
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLField;
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLRequest;
-import com.tvd12.ezyhttp.server.graphql.exception.GraphQLObjectMapperException;
 import com.tvd12.ezyhttp.server.graphql.fetcher.GraphQLDataFetcher;
 import com.tvd12.ezyhttp.server.graphql.fetcher.GraphQLDataFetcherManager;
 import com.tvd12.ezyhttp.server.graphql.interceptor.GraphQLInterceptor;
@@ -81,7 +82,7 @@ public Object doGet(
                     Map.class
                 );
             } catch (Exception e) {
-                throw new GraphQLObjectMapperException(
+                throw new HttpBadRequestException(
                     singletonMap("variables", "invalid"),
                     e
                 );
@@ -118,7 +119,7 @@ public Object doPost(
         );
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked", "MethodLength"})
+    @SuppressWarnings("MethodLength")
     private Object fetch(
         RequestArguments arguments,
         String query,
@@ -127,15 +128,14 @@ private Object fetch(
         GraphQLSchema schema = schemaParser.parseQuery(query, variables);
         List<GraphQLQueryDefinition> queryDefinitions = schema
             .getQueryDefinitions();
-        Map answer = new HashMap<>();
-
+        Map<String, Object> answer = new HashMap<>();
         for (GraphQLQueryDefinition queryDefinition : queryDefinitions) {
             String queryName = queryDefinition.getName();
             GraphQLDataFetcher dataFetcher = dataFetcherManager
                 .getDataFetcher(queryName);
             if (dataFetcher == null) {
                 throw new HttpNotFoundException(
-                    "not found data fetcher with queryName: " + queryName
+                    singletonMap("dataFetcher", "notFound")
                 );
             }
             List<GraphQLInterceptor> interceptors = interceptorManager
@@ -177,15 +177,11 @@ private Object fetch(
                 arguments,
                 queryDefinition
             );
-            try {
-                Object currentResponse = mapToResponse(
-                    data,
-                    queryDefinition
-                );
-                answer.put(queryName, currentResponse);
-            } catch (GraphQLObjectMapperException e) {
-                answer.put(queryName, data);
-            }
+            Object currentResponse = mapToResponse(
+                data,
+                queryDefinition
+            );
+            answer.put(queryName, currentResponse);
             for (GraphQLInterceptor interceptor : interceptors) {
                 interceptor.postHandle(
                     arguments,
@@ -209,8 +205,9 @@ private Map mapToResponse(
         try {
             dataMap = objectMapper.convertValue(data, Map.class);
         } catch (Exception e) {
-            throw new GraphQLObjectMapperException(
-                singletonMap("response", "invalid")
+            throw new HttpInternalServerErrorException(
+                singletonMap("response", "invalid"),
+                e
             );
         }
         return filterDataMap(dataMap, queryDefinition);

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/controller/GraphQLExceptionHandler.java

@@ -0,0 +1,30 @@
+package com.tvd12.ezyhttp.server.graphql.controller;
+
+import com.tvd12.ezyfox.util.EzyLoggable;
+import com.tvd12.ezyhttp.server.core.annotation.ExceptionHandler;
+import com.tvd12.ezyhttp.server.core.annotation.TryCatch;
+import com.tvd12.ezyhttp.server.graphql.exception.GraphQLFetcherException;
+import com.tvd12.ezyhttp.server.graphql.exception.GraphQLInvalidSchemeException;
+import com.tvd12.ezyhttp.server.graphql.exception.GraphQLObjectMapperException;
+
+@ExceptionHandler
+public class GraphQLExceptionHandler extends EzyLoggable {
+
+    @TryCatch(GraphQLFetcherException.class)
+    public Object handle(GraphQLFetcherException e) {
+        logger.info("{}({})", e.getClass().getSimpleName(), e.getMessage());
+        return e.toDataMap();
+    }
+
+    @TryCatch(GraphQLInvalidSchemeException.class)
+    public Object handle(GraphQLInvalidSchemeException e) {
+        logger.info("{}({})", e.getClass().getSimpleName(), e.getMessage());
+        return e.getErrors();
+    }
+
+    @TryCatch(GraphQLObjectMapperException.class)
+    public Object handle(GraphQLObjectMapperException e) {
+        logger.info("{}({})", e.getClass().getSimpleName(), e.getMessage());
+        return e.getErrors();
+    }
+}

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLDataFilter.java

@@ -1,12 +1,12 @@
 package com.tvd12.ezyhttp.server.graphql.data;
 
+import com.tvd12.ezyfox.util.EzyMapBuilder;
 import com.tvd12.ezyhttp.server.graphql.exception.GraphQLInvalidSchemeException;
 import lombok.AllArgsConstructor;
 
 import java.util.*;
 
 import static com.tvd12.ezyhttp.server.graphql.constants.GraphQLConstants.ALL_FIELDS;
-import static java.util.Collections.singletonMap;
 
 public class GraphQLDataFilter {
 
@@ -58,8 +58,10 @@ public Map filter(
                     );
                 } else {
                     throw new GraphQLInvalidSchemeException(
-                        singletonMap("schema", "invalid"),
-                        "invalid schema at field: " + fieldName
+                        EzyMapBuilder.mapBuilder()
+                            .put("schema", "invalid")
+                            .put("field", fieldName)
+                            .toMap()
                     );
                 }
             }

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLError.java

@@ -0,0 +1,16 @@
+package com.tvd12.ezyhttp.server.graphql.data;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Builder
+public class GraphQLError {
+    private String message;
+    private List<Map<String, Object>> locations;
+    private List<String> path;
+    private Map<String, Object> extensions;
+}

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/exception/GraphQLFetcherException.java

@@ -0,0 +1,39 @@
+package com.tvd12.ezyhttp.server.graphql.exception;
+
+import com.tvd12.ezyhttp.server.graphql.data.GraphQLError;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+public class GraphQLFetcherException extends RuntimeException {
+
+    private final Map<String, Object> data;
+    private final List<GraphQLError> errors;
+
+    public GraphQLFetcherException(
+        List<GraphQLError> errors
+    ) {
+        this(null, errors);
+    }
+
+    public GraphQLFetcherException(
+        Map<String, Object> data,
+        List<GraphQLError> errors
+    ) {
+        super("data: " + data + ", errors: " + errors);
+        this.data = data;
+        this.errors = errors;
+    }
+
+    public Map<String, Object> toDataMap() {
+        Map<String, Object> answer = new HashMap<>();
+        if (data != null) {
+            answer.put("data", data);
+        }
+        answer.put("errors", errors);
+        return answer;
+    }
+}

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/exception/GraphQLObjectMapperException.java

@@ -8,20 +8,6 @@ public class GraphQLObjectMapperException extends IllegalArgumentException {
 
     private final Object errors;
 
-    public GraphQLObjectMapperException(
-        Object errors
-    ) {
-        this(errors, errors.toString());
-    }
-
-    public GraphQLObjectMapperException(
-        Object errors,
-        String message
-    ) {
-        super(message);
-        this.errors = errors;
-    }
-
     public GraphQLObjectMapperException(
         Object errors,
         Throwable cause

ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/scheme/GraphQLSchemaParser.java

@@ -1,6 +1,7 @@
 package com.tvd12.ezyhttp.server.graphql.scheme;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.tvd12.ezyfox.util.EzyMapBuilder;
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLField;
 import com.tvd12.ezyhttp.server.graphql.exception.GraphQLObjectMapperException;
 import com.tvd12.ezyhttp.server.graphql.query.GraphQLQueryDefinition;
@@ -10,7 +11,6 @@
 import java.util.Stack;
 
 import static com.tvd12.ezyfox.io.EzyStrings.EMPTY_STRING;
-import static java.util.Collections.singletonMap;
 
 @AllArgsConstructor
 public final class GraphQLSchemaParser {
@@ -70,8 +70,10 @@ public GraphQLSchema parseQuery(
                     );
                 } catch (Exception e) {
                     throw new GraphQLObjectMapperException(
-                        singletonMap("arguments", "invalid"),
-                        "invalid arguments json: " + arguments,
+                        EzyMapBuilder.mapBuilder()
+                            .put("arguments", "invalid")
+                            .put("message", e.getMessage())
+                            .toMap(),
                         e
                     );
                 }

ezyhttp-server-graphql/src/test/java/com/tvd12/ezyhttp/server/graphql/test/controller/GraphQLControllerTest.java

@@ -2,14 +2,15 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tvd12.ezyfox.exception.EzyNotImplementedException;
+import com.tvd12.ezyhttp.core.exception.HttpBadRequestException;
+import com.tvd12.ezyhttp.core.exception.HttpInternalServerErrorException;
 import com.tvd12.ezyhttp.core.exception.HttpNotAcceptableException;
 import com.tvd12.ezyhttp.core.exception.HttpNotFoundException;
 import com.tvd12.ezyhttp.server.core.request.RequestArguments;
 import com.tvd12.ezyhttp.server.graphql.controller.GraphQLController;
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLDataFilter;
 import com.tvd12.ezyhttp.server.graphql.data.GraphQLRequest;
 import com.tvd12.ezyhttp.server.graphql.exception.GraphQLInvalidSchemeException;
-import com.tvd12.ezyhttp.server.graphql.exception.GraphQLObjectMapperException;
 import com.tvd12.ezyhttp.server.graphql.fetcher.GraphQLDataFetcher;
 import com.tvd12.ezyhttp.server.graphql.fetcher.GraphQLDataFetcherManager;
 import com.tvd12.ezyhttp.server.graphql.interceptor.GraphQLInterceptor;
@@ -74,12 +75,14 @@ public void test() throws Exception {
 
         // when
         Object meResult = controller.doPost(arguments, meRequest);
-        Object heroResult = controller.doGet(arguments, heroQuery, null);
+        Throwable e = Asserts.assertThrows(() ->
+            controller.doGet(arguments, heroQuery, null)
+        );
 
         // then
         Asserts.assertFalse(controller.isAuthenticated());
         Asserts.assertEquals(meResult.toString(), "{me={bank={id=100}, name=Dzung, friends=[{name=Foo}, {name=Bar}]}}");
-        Asserts.assertEquals(heroResult.toString(), "{hero=Hero 007}");
+        Asserts.assertEqualsType(e, HttpInternalServerErrorException.class);
 
         verify(interceptorManager, times(2)).getRequestInterceptors();
         verifyNoMoreInteractions(interceptorManager);
@@ -91,7 +94,7 @@ public void test() throws Exception {
             any(GraphQLQueryDefinition.class),
             any(GraphQLDataFetcher.class)
         );
-        verify(interceptor, times(2)).postHandle(
+        verify(interceptor, times(1)).postHandle(
             any(RequestArguments.class),
             any(String.class),
             any(String.class),
@@ -230,12 +233,14 @@ public void getAllFriendFields() {
 
         // when
         Object meResult = controller.doPost(arguments, meRequest);
-        Object heroResult = controller.doGet(arguments, heroQuery, null);
+        Throwable e = Asserts.assertThrows(() ->
+            controller.doGet(arguments, heroQuery, null)
+        );
 
         // then
         Asserts.assertFalse(controller.isAuthenticated());
         Asserts.assertEquals(meResult.toString(), "{me={bank={id=100}, name=Dzung, friends=[{name=Foo, id=1}, {name=Bar, id=1}]}}");
-        Asserts.assertEquals(heroResult.toString(), "{hero=Hero 007}");
+        Asserts.assertEqualsType(e, HttpInternalServerErrorException.class);
 
         verify(interceptorManager, times(2)).getRequestInterceptors();
         verifyNoMoreInteractions(interceptorManager);
@@ -247,7 +252,7 @@ public void getAllFriendFields() {
             any(GraphQLQueryDefinition.class),
             any(GraphQLDataFetcher.class)
         );
-        verify(interceptor, times(2)).postHandle(
+        verify(interceptor, times(1)).postHandle(
             any(RequestArguments.class),
             any(String.class),
             any(String.class),
@@ -401,34 +406,26 @@ public void testQueryWithVariables() {
         welcomeRequest.setVariables(variables);
 
         // when
-        Object welcomeResult1 = controller.doGet(arguments, welcomeQuery, variablesString);
-        Object welcomeResult2 = controller.doPost(arguments, welcomeRequest);
+        Throwable e = Asserts.assertThrows(() ->
+            controller.doGet(arguments, welcomeQuery, variablesString)
+        );
 
         // then
-        Asserts.assertEquals(welcomeResult1.toString(), "{welcome=Welcome Foo}");
-        Asserts.assertEquals(welcomeResult2.toString(), "{welcome=Welcome Foo}");
+        Asserts.assertEqualsType(e, HttpInternalServerErrorException.class);
 
-        verify(interceptorManager, times(2)).getRequestInterceptors();
+        verify(interceptorManager, times(1)).getRequestInterceptors();
         verifyNoMoreInteractions(interceptorManager);
 
-        verify(interceptor, times(2)).preHandle(
-            any(RequestArguments.class),
-            any(String.class),
-            any(String.class),
-            any(GraphQLQueryDefinition.class),
-            any(GraphQLDataFetcher.class)
-        );
-        verify(interceptor, times(2)).postHandle(
+        verify(interceptor, times(1)).preHandle(
             any(RequestArguments.class),
             any(String.class),
             any(String.class),
             any(GraphQLQueryDefinition.class),
-            any(Object.class),
             any(GraphQLDataFetcher.class)
         );
         verifyNoMoreInteractions(interceptor);
 
-        verify(arguments, times(6)).setArgument(
+        verify(arguments, times(3)).setArgument(
             any(Object.class),
             any(Object.class)
         );
@@ -609,6 +606,6 @@ public void doGetTestException() {
         Throwable e = Asserts.assertThrows(() -> controller.doGet(arguments, heroQuery, "abc"));
 
         // then
-        Asserts.assertEqualsType(e, GraphQLObjectMapperException.class);
+        Asserts.assertEqualsType(e, HttpBadRequestException.class);
     }
 }