Merge pull request #259 from Blemicek/master

Allowed auto configuration with custom schema provider (fixes #192)

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

@@ -51,7 +51,6 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -60,6 +59,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -83,7 +83,7 @@
 @Configuration
 @ConditionalOnWebApplication
 @ConditionalOnClass(DispatcherServlet.class)
-@ConditionalOnBean({GraphQLSchema.class})
+@Conditional(OnSchemaOrSchemaProviderBean.class)
 @ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
 @AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class, JacksonAutoConfiguration.class})
 @EnableConfigurationProperties({GraphQLServletProperties.class})

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebsocketAutoConfiguration.java

@@ -1,6 +1,5 @@
 package com.oembedler.moon.graphql.boot;
 
-import graphql.schema.GraphQLSchema;
 import graphql.servlet.ApolloSubscriptionConnectionListener;
 import graphql.servlet.GraphQLInvocationInputFactory;
 import graphql.servlet.GraphQLObjectMapper;
@@ -13,6 +12,7 @@
 import org.springframework.boot.autoconfigure.condition.*;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@@ -26,7 +26,7 @@
 @Configuration
 @ConditionalOnWebApplication
 @ConditionalOnClass(DispatcherServlet.class)
-@ConditionalOnBean({GraphQLSchema.class})
+@Conditional(OnSchemaOrSchemaProviderBean.class)
 @ConditionalOnProperty(value = "graphql.servlet.websocket.enabled", havingValue = "true", matchIfMissing = true)
 @AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class})
 @EnableConfigurationProperties(GraphQLSubscriptionApolloProperties.class)

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/OnSchemaOrSchemaProviderBean.java

@@ -0,0 +1,20 @@
+package com.oembedler.moon.graphql.boot;
+
+import graphql.schema.GraphQLSchema;
+import graphql.servlet.GraphQLSchemaProvider;
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+
+class OnSchemaOrSchemaProviderBean extends AnyNestedCondition {
+    public OnSchemaOrSchemaProviderBean() {
+        super(ConfigurationPhase.REGISTER_BEAN);
+    }
+
+    @ConditionalOnBean(GraphQLSchema.class)
+    static class OnSchema {
+    }
+
+    @ConditionalOnBean(GraphQLSchemaProvider.class)
+    static class OnSchemaProvider {
+    }
+}

graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/test/web/GraphQLWebAutoConfigurationTest.java

@@ -10,6 +10,8 @@
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.AbstractGraphQLHttpServlet;
+import graphql.servlet.DefaultGraphQLSchemaProvider;
+import graphql.servlet.GraphQLSchemaProvider;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.annotation.Bean;
@@ -25,12 +27,14 @@ public GraphQLWebAutoConfigurationTest() {
         super(AnnotationConfigWebApplicationContext.class, GraphQLWebAutoConfiguration.class);
     }
 
+    private static final GraphQLSchema SCHEMA = GraphQLSchema.newSchema().query(GraphQLObjectType.newObject().name("Query").build()).build();
+
     @Configuration
     static class SimpleConfiguration {
 
         @Bean
         GraphQLSchema schema() {
-            return GraphQLSchema.newSchema().query(GraphQLObjectType.newObject().name("Query").build()).build();
+            return SCHEMA;
         }
 
     }
@@ -143,4 +147,19 @@ public void appContextLoadsWithMultipleInstrumentations() {
 
         Assert.assertNotNull(this.getContext().getBean(AbstractGraphQLHttpServlet.class));
     }
+
+    @Configuration
+    static class SchemaProviderConfiguration {
+        @Bean
+        GraphQLSchemaProvider schemaProvider() {
+            return new DefaultGraphQLSchemaProvider(SCHEMA);
+        }
+    }
+
+    @Test
+    public void appContextLoadsWithCustomSchemaProvider() {
+        load(SchemaProviderConfiguration.class);
+
+        Assert.assertNotNull(this.getContext().getBean(AbstractGraphQLHttpServlet.class));
+    }
 }