Add support for Flux responses

Author: oliemansm

graphql-webclient-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientAutoConfiguration.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -28,11 +29,11 @@ public class GraphQLWebClientAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean
-  public WebClient webClient(ReactiveClientRegistrationRepository clientRegistrations) {
+  public WebClient webClient(@Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrations) {
     WebClient.Builder clientBuilder = WebClient.builder()
         .baseUrl(graphqlClientProperties.getUrl());
 
-    if (clientRegistrations.findByRegistrationId("graphql").blockOptional().isPresent()) {
+    if (clientRegistrations != null && clientRegistrations.findByRegistrationId("graphql").blockOptional().isPresent()) {
       ServerOAuth2AuthorizedClientExchangeFilterFunction oauth =
           new ServerOAuth2AuthorizedClientExchangeFilterFunction(
               clientRegistrations,

graphql-webclient-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/webclient/boot/OAuth2ClientRegistrationRepositoryConfiguration.java

@@ -1,12 +1,10 @@
 package graphql.kickstart.spring.webclient.boot;
 
-import java.util.Collections;
 import java.util.List;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 
@@ -17,10 +15,10 @@ class OAuth2ClientRegistrationRepositoryConfiguration {
   @Bean
   @ConditionalOnMissingBean({ReactiveClientRegistrationRepository.class})
   InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(OAuth2ClientRegistrationProperties properties) {
-    List<ClientRegistration> registrations = properties.getClientRegistration()
+    return properties.getClientRegistration()
         .map(List::of)
-        .orElseGet(Collections::emptyList);
-    return new InMemoryReactiveClientRegistrationRepository(registrations);
+        .map(InMemoryReactiveClientRegistrationRepository::new)
+        .orElse(null);
   }
 
 }

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

@@ -1,6 +1,7 @@
 package graphql.kickstart.spring.webclient.boot;
 
 import java.util.Map;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public interface GraphQLWebClient {
@@ -9,4 +10,8 @@ public interface GraphQLWebClient {
 
   <T> Mono<T> post(String resource, Map<String, Object> variables, Class<T> returnType);
 
+  <T> Flux<T> flux(String resource, Class<T> returnType);
+
+  <T> Flux<T> flux(String resource, Map<String, Object> variables, Class<T> returnType);
+
 }

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

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -13,6 +14,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @Slf4j
@@ -29,23 +31,12 @@ public <T> Mono<T> post(String resource, Class<T> returnType) {
 
   @Override
   public <T> Mono<T> post(String resource, Map<String, Object> variables, Class<T> returnType) {
-    GraphQLRequest request = GraphQLRequest.builder()
-        .query(loadQuery(resource))
-        .variables(variables)
-        .build();
-
-    return webClient.post()
-        .contentType(MediaType.APPLICATION_JSON)
-        .bodyValue(request)
-        .retrieve()
-        .bodyToMono(GraphQLResponse.class)
-        .flatMap(it -> Mono.justOrEmpty(it.getFirstObject()))
-        .map(it -> readValue(it, returnType));
+    return execute(resource, variables).map(it -> readValue(it, returnType));
   }
 
   @SneakyThrows
   private <T> T readValue(Object value, Class<T> returnType) {
-    log.debug("Read value: '{}'", value);
+    log.trace("Read value: {}", value);
     return objectMapper.convertValue(value, returnType);
   }
 
@@ -60,4 +51,33 @@ private String loadResource(Resource resource) throws IOException {
     }
   }
 
+  @Override
+  public <T> Flux<T> flux(String resource, Class<T> returnType) {
+    return flux(resource, null, returnType);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public <T> Flux<T> flux(String resource, Map<String, Object> variables, Class<T> returnType) {
+    Mono<Object> responseObject = execute(resource, variables);
+
+    return responseObject.map(List.class::cast)
+        .flatMapMany(Flux::fromIterable)
+        .map(it -> readValue(it, returnType));
+  }
+
+  private Mono<Object> execute(String resource, Map<String, Object> variables) {
+    GraphQLRequest request = GraphQLRequest.builder()
+        .query(loadQuery(resource))
+        .variables(variables)
+        .build();
+
+    return webClient.post()
+        .contentType(MediaType.APPLICATION_JSON)
+        .bodyValue(request)
+        .retrieve()
+        .bodyToMono(GraphQLResponse.class)
+        .flatMap(it -> Mono.justOrEmpty(it.getFirstObject()));
+  }
+
 }

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

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.kickstart.spring.webclient.testapp.Simple;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
@@ -17,6 +18,7 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -77,4 +79,11 @@ void noResponseSucceeds() {
     assertTrue("response should be empty", noResponse.isEmpty());
   }
 
+  @Test
+  void listSucceeds() {
+    Flux<Simple> response = graphqlClient.flux("query-list.graphql", Simple.class);
+    List<Simple> list = response.collectList().block();
+    assertEquals(1, list.size());
+  }
+
 }

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

@@ -1,6 +1,9 @@
 package graphql.kickstart.spring.webclient.testapp;
 
+import static java.util.Collections.singletonList;
+
 import graphql.kickstart.tools.GraphQLQueryResolver;
+import java.util.List;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -22,4 +25,8 @@ Simple simple(String id) {
     return new Simple(id);
   }
 
+  List<Simple> list() {
+    return singletonList(simple("1"));
+  }
+
 }

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

@@ -0,0 +1,5 @@
+query list {
+    list {
+        id
+    }
+}

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

@@ -3,6 +3,7 @@ type Query {
     noResponse: String
     echo(value: String!): String!
     simple(id: ID!): Simple!
+    list: [Simple!]!
 }
 
 type Simple {