Support simple return type

Author: oliemansm

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

@@ -11,8 +11,8 @@ class GraphQLResponse {
   private Map<String, Object> data;
   private List<String> errors;
 
-  <T> T getFirstObject(Class<T> type) {
-    return (T) data.entrySet().stream().findFirst().map(Entry::getValue).orElseThrow();
+  Object getFirstObject() {
+    return data.entrySet().stream().findFirst().map(Entry::getValue).orElseThrow();
   }
 
 }

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

@@ -1,9 +1,9 @@
 package graphql.kickstart.spring.webclient.boot;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -20,6 +20,7 @@
 class GraphQLWebClientImpl implements GraphQLWebClient {
 
   private final WebClient webClient;
+  private final ObjectMapper objectMapper;
 
   @Override
   public <T> Mono<T> query(String resource, Map<String, Object> variables, Class<T> returnType) {
@@ -34,12 +35,18 @@ public <T> Mono<T> query(String resource, Map<String, Object> variables, Class<T
         .bodyValue(request)
         .retrieve()
         .bodyToMono(GraphQLResponse.class)
-        .map(it -> it.getFirstObject(returnType));
+        .map(GraphQLResponse::getFirstObject)
+        .map(it -> readValue(it, returnType));
+  }
+
+  @SneakyThrows
+  private <T> T readValue(Object value, Class<T> returnType) {
+    log.debug("Read value: '{}'", value);
+    return objectMapper.convertValue(value, returnType);
   }
 
   @SneakyThrows
   private String loadQuery(String path) {
-//    Resource resource = resourceLoader.getResource("classpath:" + location);
     return loadResource(new ClassPathResource(path));
   }
 

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

@@ -3,7 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.kickstart.spring.webclient.testapp.Simple;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -24,14 +29,37 @@ void beforeEach() {
     WebClient webClient = WebClient.builder()
         .baseUrl("http://localhost:" + randomServerPort)
         .build();
-    graphqlClient = new GraphQLWebClientImpl(webClient);
+    graphqlClient = new GraphQLWebClientImpl(webClient, new ObjectMapper());
   }
 
   @Test
+  @DisplayName("Query test without variables and returning String")
   void queryWithoutVariablesSucceeds() {
     Mono<String> response = graphqlClient.query("query-test.graphql", null, String.class);
     assertNotNull("response should not be null", response);
     assertEquals("response should equal 'test'", "test", response.block());
   }
 
+  @Test
+  @DisplayName("Query echo with String variable and returning String")
+  void echoStringSucceeds() {
+    Map<String, Object> variables = new HashMap<>();
+    variables.put("value", "echo echo echo");
+    Mono<String> response = graphqlClient.query("query-echo.graphql", variables, String.class);
+    assertNotNull("response should not be null", response);
+    assertEquals("response should equal 'echo echo echo'", "echo echo echo", response.block());
+  }
+
+  @Test
+  @DisplayName("Query simple return type")
+  void simpleTypeSucceeds() {
+    Map<String, Object> variables = new HashMap<>();
+    variables.put("id", "my-id");
+    Mono<Simple> response = graphqlClient.query("query-simple.graphql", variables, Simple.class);
+    assertNotNull("response should not be null", response);
+    Simple object = response.block();
+    assertNotNull(object);
+    assertEquals("response id should equal 'my-id'", "my-id", object.getId());
+  }
+
 }

graphql-webclient/src/test/java/graphql/kickstart/spring/webclient/testapp/Query.java

@@ -14,4 +14,8 @@ String echo(String value) {
     return value;
   }
 
+  Simple simple(String id) {
+    return new Simple(id);
+  }
+
 }

graphql-webclient/src/test/java/graphql/kickstart/spring/webclient/testapp/Simple.java

@@ -0,0 +1,14 @@
+package graphql.kickstart.spring.webclient.testapp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Simple {
+
+  private String id;
+
+}

graphql-webclient/src/test/resources/query-echo.graphql

@@ -0,0 +1,3 @@
+query echo($value: String!) {
+    echo(value: $value)
+}

graphql-webclient/src/test/resources/query-simple.graphql

@@ -0,0 +1,5 @@
+query simple($id: ID!) {
+    simple(id: $id) {
+        id
+    }
+}

graphql-webclient/src/test/resources/schema.graphqls

@@ -1,4 +1,9 @@
 type Query {
     test: String!
     echo(value: String!): String!
+    simple(id: ID!): Simple!
+}
+
+type Simple {
+    id: ID!
 }