Clean up configuration

Author: oliemansm

.gitignore

@@ -14,3 +14,6 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 /graphql-spring-webclient.iml
 /.idea/
+/graphql-webclient/build/
+/graphql-webclient-spring-boot-autoconfigure/build/
+/graphql-webclient-spring-boot-starter/build/

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

@@ -1,27 +1,37 @@
 package graphql.kickstart.spring.webclient.boot;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Slf4j
 @Configuration
+@AutoConfigureAfter(JacksonAutoConfiguration.class)
 @ComponentScan(basePackageClasses = GraphQLWebClientImpl.class)
 public class GraphQLWebClientAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean
   public WebClient webClient() {
-    return null;
+    return WebClient.builder().build();
   }
 
   @Bean
   @ConditionalOnMissingBean
-  public GraphQLWebClient graphQLWebClient(WebClient webClient) {
-    return new GraphQLWebClientImpl(webClient);
+  public ObjectMapper objectMapper() {
+    return new ObjectMapper();
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  public GraphQLWebClient graphQLWebClient(WebClient webClient, ObjectMapper objectMapper) {
+    return new GraphQLWebClientImpl(webClient, objectMapper);
   }
 
 }

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

@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
@@ -22,14 +23,17 @@ class GraphQLWebClientTest {
   @LocalServerPort
   private int randomServerPort;
 
+  @Autowired
+  private ObjectMapper objectMapper;
+
   private GraphQLWebClient graphqlClient;
 
   @BeforeEach
   void beforeEach() {
     WebClient webClient = WebClient.builder()
         .baseUrl("http://localhost:" + randomServerPort)
         .build();
-    graphqlClient = new GraphQLWebClientImpl(webClient, new ObjectMapper());
+    graphqlClient = new GraphQLWebClientImpl(webClient, objectMapper);
   }
 
   @Test