Merge pull request #13 from 1096kc/Feature/custom-resultMapping-and-errorHandling

Change the post method return type to GraphQLResponse

Author: oliemansm

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLResponse.java

@@ -6,7 +6,7 @@
 import lombok.Data;
 
 @Data
-class GraphQLResponse {
+public class GraphQLResponse {
 
   private Map<String, Object> data;
   private List<GraphQLError> errors;

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClient.java

@@ -16,7 +16,7 @@ static GraphQLWebClient newInstance(WebClient webClient, ObjectMapper objectMapp
 
   <T> Mono<T> post(String resource, Map<String, Object> variables, Class<T> returnType);
 
-  <T> Mono<T> post(GraphQLRequest<T> request);
+  Mono<GraphQLResponse> post(GraphQLRequest<?> request);
 
   <T> Flux<T> flux(String resource, Class<T> returnType);
 

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientImpl.java

@@ -35,8 +35,13 @@ private <T> T readValue(Object value, Class<T> returnType) {
   }
 
   @Override
-  public <T> Mono<T> post(GraphQLRequest<T> request) {
-    return execute(request).map(it -> readValue(it, request.getReturnType()));
+  public Mono<GraphQLResponse> post(GraphQLRequest<?> request) {
+    WebClient.RequestBodySpec spec = webClient.post()
+            .contentType(MediaType.APPLICATION_JSON);
+    request.getHeaders().forEach((header, values) -> spec.header(header, values.toArray(new String[0])));
+    return spec.bodyValue(request.getRequestBody())
+            .retrieve()
+            .bodyToMono(GraphQLResponse.class);
   }
 
   @Override

graphql-webclient/src/test/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientTest.java

@@ -72,11 +72,12 @@ void simpleTypeAsRequestSucceeds() {
         .resource("query-simple.graphql")
         .variables(Map.of("id", "my-id"))
         .build();
-    Mono<Simple> response = graphqlClient.post(request);
+    Mono<GraphQLResponse> response = graphqlClient.post(request);
     assertNotNull("response should not be null", response);
-    Simple object = response.block();
+    GraphQLResponse object = response.block();
     assertNotNull(object);
-    assertEquals("response id should equal 'my-id'", "my-id", object.getId());
+    Map<String,Object> simple = (Map<String, Object>) object.getData().get("simple");
+    assertEquals("response id should equal 'my-id'", "my-id", simple.get("id"));
   }
 
   @Test
@@ -107,9 +108,12 @@ void headerIsAdded() {
         .variables(Map.of("name", "my-custom-header"))
         .header("my-custom-header", "my-custom-header-value")
         .build();
-    Mono<String> response = graphqlClient.post(request);
+    Mono<GraphQLResponse> response = graphqlClient.post(request);
     assertNotNull("response should not be null", response);
-    assertEquals("response should equal 'my-custom-header-value'", "my-custom-header-value", response.block());
+    assertNotNull("response should not be null", response);
+    GraphQLResponse object = response.block();
+    assertNotNull(object);
+    assertEquals("response should equal 'my-custom-header-value'", "my-custom-header-value", object.getData().get("header"));
   }
 
 }