Skip to content

Commit 58d65d7

Browse files
committed
Refine auto-configurations conditions
Prior to this commit, auto-configurations were only checking for the presence of GraphQL Java classes as guards, assuming that Spring GraphQL classes were always on the classpath. Auto-configurations are meant to be moved to the Spring Boot project in the future, so this commit adds the relevant condition class checks to reflect that spring-graphql might not be on the classpath.
1 parent 69c2d08 commit 58d65d7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @since 1.0.0
4747
*/
4848
@Configuration(proxyBeanMethods = false)
49-
@ConditionalOnClass(GraphQL.class)
49+
@ConditionalOnClass({GraphQL.class, GraphQlSource.class})
5050
@ConditionalOnMissingBean(GraphQlSource.class)
5151
@EnableConfigurationProperties(GraphQlProperties.class)
5252
public class GraphQlAutoConfiguration {

graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlServiceAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @since 1.0.0
3737
*/
3838
@Configuration(proxyBeanMethods = false)
39-
@ConditionalOnClass(GraphQL.class)
39+
@ConditionalOnClass({GraphQL.class, GraphQlService.class})
4040
@ConditionalOnMissingBean(GraphQlService.class)
4141
@AutoConfigureAfter(GraphQlAutoConfiguration.class)
4242
public class GraphQlServiceAutoConfiguration {

graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
*/
6767
@Configuration(proxyBeanMethods = false)
6868
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
69-
@ConditionalOnClass(GraphQL.class)
69+
@ConditionalOnClass({GraphQL.class, GraphQlHttpHandler.class})
7070
@ConditionalOnBean(GraphQlSource.class)
7171
@AutoConfigureAfter(GraphQlServiceAutoConfiguration.class)
7272
public class GraphQlWebFluxAutoConfiguration {

graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
*/
7474
@Configuration(proxyBeanMethods = false)
7575
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
76-
@ConditionalOnClass(GraphQL.class)
76+
@ConditionalOnClass({GraphQL.class, GraphQlHttpHandler.class})
7777
@ConditionalOnBean(GraphQlSource.class)
7878
@AutoConfigureAfter(GraphQlServiceAutoConfiguration.class)
7979
public class GraphQlWebMvcAutoConfiguration {

0 commit comments

Comments
 (0)