From 9ceaaf5684d2fabadcf9851f04cbce59bcfe00aa Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 7 Apr 2021 14:23:14 +0100 Subject: [PATCH] Polishing contribution Closes gh-37 --- .../graphql/boot/GraphQLAutoConfiguration.java | 16 ++++++++++++++-- .../boot/WebFluxGraphQLAutoConfiguration.java | 7 +------ .../boot/WebMvcGraphQLAutoConfiguration.java | 10 ++-------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java index ede15a17..685599cc 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2020 the original author or authors. + * Copyright 2020-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,9 +43,21 @@ import org.springframework.core.io.ResourceLoader; @EnableConfigurationProperties(GraphQLProperties.class) public class GraphQLAutoConfiguration { + + @Configuration + static class GraphQLConfiguration { + + @Bean + public GraphQL graphQL(GraphQL.Builder builder) { + return builder.build(); + } + + } + + @Configuration @ConditionalOnMissingBean(GraphQL.Builder.class) - static class SdlConfiguration { + static class GraphQLBuilderConfiguration { @Bean @ConditionalOnMissingBean diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebFluxGraphQLAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebFluxGraphQLAutoConfiguration.java index a0287fdc..28346502 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebFluxGraphQLAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebFluxGraphQLAutoConfiguration.java @@ -52,17 +52,12 @@ import static org.springframework.web.reactive.function.server.RequestPredicates @Configuration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnClass(GraphQL.class) -@ConditionalOnBean(GraphQL.Builder.class) +@ConditionalOnBean(GraphQL.class) @AutoConfigureAfter(GraphQLAutoConfiguration.class) public class WebFluxGraphQLAutoConfiguration { private static final Log logger = LogFactory.getLog(WebFluxGraphQLAutoConfiguration.class); - @Bean - public GraphQL graphQL(GraphQL.Builder graphQLBuilder) { - return graphQLBuilder.build(); - } - @Bean @ConditionalOnMissingBean public GraphQLHttpHandler graphQLHandler(GraphQL graphQL, ObjectProvider interceptors) { diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebMvcGraphQLAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebMvcGraphQLAutoConfiguration.java index 58b5d5cb..4f8fd61f 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebMvcGraphQLAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/WebMvcGraphQLAutoConfiguration.java @@ -59,21 +59,15 @@ import static org.springframework.web.servlet.function.RequestPredicates.content @Configuration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnClass(GraphQL.class) -@ConditionalOnBean(GraphQL.Builder.class) +@ConditionalOnBean(GraphQL.class) @AutoConfigureAfter(GraphQLAutoConfiguration.class) public class WebMvcGraphQLAutoConfiguration { private static final Log logger = LogFactory.getLog(WebMvcGraphQLAutoConfiguration.class); - @Bean - public GraphQL graphQL(GraphQL.Builder graphQLBuilder) { - return graphQLBuilder.build(); - } - @Bean @ConditionalOnMissingBean - public GraphQLHttpHandler graphQLHandler(GraphQL graphQL, - ObjectProvider interceptors) { + public GraphQLHttpHandler graphQLHandler(GraphQL graphQL, ObjectProvider interceptors) { return new GraphQLHttpHandler(graphQL, interceptors.orderedStream().collect(Collectors.toList())); }