fix: change ExecutionResult to return Map type using toSpecification() (#71)

Author: igdianov

graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/web/GraphQLController.java

@@ -82,9 +82,10 @@ public GraphQLController(GraphQLExecutor graphQLExecutor, ObjectMapper mapper) {
     @PostMapping(value = PATH,
             consumes = {MediaType.APPLICATION_JSON_VALUE},
             produces = MediaType.APPLICATION_JSON_VALUE)
-    public ExecutionResult postJson(@RequestBody @Valid final GraphQLQueryRequest queryRequest) throws IOException
+    public Map<String, Object> postJson(@RequestBody @Valid final GraphQLQueryRequest queryRequest) throws IOException
     {
-        return graphQLExecutor.execute(queryRequest.getQuery(), queryRequest.getVariables());
+        return graphQLExecutor.execute(queryRequest.getQuery(), queryRequest.getVariables())
+                              .toSpecification();
     }
 
     /**
@@ -103,13 +104,14 @@ public ExecutionResult postJson(@RequestBody @Valid final GraphQLQueryRequest qu
     @GetMapping(value = PATH,
             consumes = {APPLICATION_GRAPHQL_VALUE},
             produces=MediaType.APPLICATION_JSON_VALUE)
-    public ExecutionResult getQuery(
+    public  Map<String, Object> getQuery(
             @RequestParam(name="query") final String query,
             @RequestParam(name="variables", required = false) final  String variables) throws IOException
     {
         Map<String, Object> variablesMap = variablesStringToMap(variables);
 
-        return graphQLExecutor.execute(query, variablesMap);
+        return graphQLExecutor.execute(query, variablesMap)
+                              .toSpecification();
     }
 
     /**
@@ -127,13 +129,14 @@ public ExecutionResult getQuery(
     @PostMapping(value = PATH,
             consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces=MediaType.APPLICATION_JSON_VALUE)
-    public ExecutionResult postForm(
+    public  Map<String, Object> postForm(
             @RequestParam(name="query") final String query,
             @RequestParam(name="variables", required = false) final String variables) throws IOException
     {
         Map<String, Object> variablesMap = variablesStringToMap(variables);
 
-        return graphQLExecutor.execute(query, variablesMap);
+        return graphQLExecutor.execute(query, variablesMap)
+                              .toSpecification();
     }
 
     /**
@@ -148,10 +151,11 @@ public ExecutionResult postForm(
     @PostMapping(value = PATH,
             consumes = APPLICATION_GRAPHQL_VALUE,
             produces=MediaType.APPLICATION_JSON_VALUE)
-    public ExecutionResult postApplicationGraphQL(
+    public  Map<String, Object> postApplicationGraphQL(
             @RequestBody final String query) throws IOException
     {
-        return graphQLExecutor.execute(query, null);
+        return graphQLExecutor.execute(query, null)
+                              .toSpecification();
     }
 
     /**

graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/web/GraphQLControllerIT.java

@@ -20,6 +20,12 @@
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.introproventures.graphql.jpa.query.web.GraphQLController.GraphQLQueryRequest;
+import graphql.ExecutionResult;
+import graphql.GraphQLError;
+import lombok.Value;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,14 +39,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.introproventures.graphql.jpa.query.web.GraphQLController.GraphQLQueryRequest;
-
-import graphql.ExecutionResult;
-import graphql.GraphQLError;
-import lombok.Value;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class GraphQLControllerIT {
@@ -62,7 +60,7 @@ public void testGraphql() {
 
 		Result result = entity.getBody();
 		Assert.assertNotNull(result);
-		Assert.assertTrue(result.getErrors().toString(), result.getErrors().isEmpty());
+		Assert.assertNull(result.getErrors());
 		Assert.assertEquals("{Books={select=[{title=War and Peace, genre=NOVEL}]}}", result.getData().toString());
 	}
 
@@ -81,7 +79,7 @@ public void testGraphqlArguments() throws JsonParseException, JsonMappingExcepti
 
 		Result result = entity.getBody();
 		Assert.assertNotNull(result);
-		Assert.assertTrue(result.getErrors().toString(), result.getErrors().isEmpty());
+        Assert.assertNull(result.getErrors());
 		Assert.assertEquals("{Books={select=[{title=War and Peace, genre=NOVEL}]}}", result.getData().toString());
 	}
 }