chore(sonar): remove duplication

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/GraphQLInvokerAutoConfiguration.java

@@ -0,0 +1,31 @@
+package graphql.kickstart.autoconfigure.web;
+
+import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions;
+import graphql.kickstart.execution.BatchedDataLoaderGraphQLBuilder;
+import graphql.kickstart.execution.GraphQLInvoker;
+import graphql.kickstart.execution.config.GraphQLBuilder;
+import java.util.function.Supplier;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GraphQLInvokerAutoConfiguration {
+
+  @Bean
+  @ConditionalOnMissingBean
+  public GraphQLInvoker graphQLInvoker(
+      GraphQLBuilder graphQLBuilder,
+      BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder) {
+    return new GraphQLInvoker(graphQLBuilder, batchedDataLoaderGraphQLBuilder);
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  public BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder(
+      @Autowired(required = false)
+          Supplier<DataLoaderDispatcherInstrumentationOptions> optionsSupplier) {
+    return new BatchedDataLoaderGraphQLBuilder(optionsSupplier);
+  }
+}

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/OnSchemaOrSchemaProviderBean.java renamed to graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/OnSchemaOrSchemaProviderBean.java

@@ -1,11 +1,11 @@
-package graphql.kickstart.autoconfigure.web.servlet;
+package graphql.kickstart.autoconfigure.web;
 
 import graphql.kickstart.execution.config.GraphQLSchemaProvider;
 import graphql.schema.GraphQLSchema;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 
-class OnSchemaOrSchemaProviderBean extends AnyNestedCondition {
+public class OnSchemaOrSchemaProviderBean extends AnyNestedCondition {
 
   public OnSchemaOrSchemaProviderBean() {
     super(ConfigurationPhase.REGISTER_BEAN);

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/GraphQLSpringWebfluxAutoConfiguration.java

@@ -3,9 +3,9 @@
 import static graphql.kickstart.execution.GraphQLObjectMapper.newBuilder;
 import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
 
-import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions;
 import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
-import graphql.kickstart.execution.BatchedDataLoaderGraphQLBuilder;
+import graphql.kickstart.autoconfigure.web.GraphQLInvokerAutoConfiguration;
+import graphql.kickstart.autoconfigure.web.OnSchemaOrSchemaProviderBean;
 import graphql.kickstart.execution.GraphQLInvoker;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.config.DefaultGraphQLSchemaProvider;
@@ -32,16 +32,16 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.reactive.HandlerMapping;
@@ -51,10 +51,14 @@
 
 @Slf4j
 @Configuration
-@ConditionalOnBean(GraphQLSchema.class)
+@Import({
+  GraphQLController.class,
+  ReactiveWebSocketSubscriptionsHandler.class,
+  GraphQLInvokerAutoConfiguration.class
+})
 @ConditionalOnWebApplication(type = REACTIVE)
-@AutoConfigureAfter(GraphQLJavaToolsAutoConfiguration.class)
-@Import({GraphQLController.class, ReactiveWebSocketSubscriptionsHandler.class})
+@Conditional(OnSchemaOrSchemaProviderBean.class)
+@AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class, JacksonAutoConfiguration.class})
 public class GraphQLSpringWebfluxAutoConfiguration {
 
   @Bean
@@ -113,22 +117,6 @@ public GraphQLBuilder graphQLBuilder() {
     return new GraphQLBuilder();
   }
 
-  @Bean
-  @ConditionalOnMissingBean
-  public BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder(
-      @Autowired(required = false)
-          Supplier<DataLoaderDispatcherInstrumentationOptions> optionsSupplier) {
-    return new BatchedDataLoaderGraphQLBuilder(optionsSupplier);
-  }
-
-  @Bean
-  @ConditionalOnMissingBean
-  public GraphQLInvoker graphQLInvoker(
-      GraphQLBuilder graphQLBuilder,
-      BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder) {
-    return new GraphQLInvoker(graphQLBuilder, batchedDataLoaderGraphQLBuilder);
-  }
-
   @Bean
   @ConditionalOnMissingBean
   public ReactiveSubscriptionsProtocolFactory subscriptionProtocolFactory(

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebAutoConfiguration.java

@@ -28,11 +28,11 @@
 import graphql.execution.SubscriptionExecutionStrategy;
 import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.web.GraphQLInvokerAutoConfiguration;
+import graphql.kickstart.autoconfigure.web.OnSchemaOrSchemaProviderBean;
 import graphql.kickstart.autoconfigure.web.servlet.metrics.MetricsInstrumentation;
-import graphql.kickstart.execution.BatchedDataLoaderGraphQLBuilder;
 import graphql.kickstart.execution.GraphQLInvoker;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
@@ -61,7 +61,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.function.Supplier;
 import javax.servlet.MultipartConfigElement;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -80,6 +79,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -92,6 +92,7 @@
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
+@Import(GraphQLInvokerAutoConfiguration.class)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass(DispatcherServlet.class)
 @Conditional(OnSchemaOrSchemaProviderBean.class)
@@ -253,22 +254,6 @@ public GraphQLBuilder graphQLBuilder(
     return graphQLBuilder;
   }
 
-  @Bean
-  @ConditionalOnMissingBean
-  public BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder(
-      @Autowired(required = false)
-          Supplier<DataLoaderDispatcherInstrumentationOptions> optionsSupplier) {
-    return new BatchedDataLoaderGraphQLBuilder(optionsSupplier);
-  }
-
-  @Bean
-  @ConditionalOnMissingBean
-  public GraphQLInvoker graphQLInvoker(
-      GraphQLBuilder graphQLBuilder,
-      BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder) {
-    return new GraphQLInvoker(graphQLBuilder, batchedDataLoaderGraphQLBuilder);
-  }
-
   @Bean
   @ConditionalOnMissingBean
   public GraphQLObjectMapper graphQLObjectMapper(

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebsocketAutoConfiguration.java

@@ -1,6 +1,7 @@
 package graphql.kickstart.autoconfigure.web.servlet;
 
 import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.web.OnSchemaOrSchemaProviderBean;
 import graphql.kickstart.execution.GraphQLInvoker;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionInvocationInputFactory;