Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit d865b8c

Browse files
committed
Add conditional when loading graphql webflux autoconfig fixes #396
1 parent 4a0d390 commit d865b8c

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.beans.factory.annotation.Autowired;
3838
import org.springframework.beans.factory.annotation.Value;
3939
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
40+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4041
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4142
import org.springframework.context.annotation.Bean;
4243
import org.springframework.context.annotation.ComponentScan;
@@ -48,6 +49,7 @@
4849

4950
@Slf4j
5051
@Configuration
52+
@ConditionalOnBean({GraphQLSchema.class})
5153
@AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class})
5254
@ComponentScan(basePackageClasses = GraphQLController.class)
5355
public class GraphQLSpringWebfluxAutoConfiguration {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,7 @@ public GraphQLInvocationInputFactory invocationInputFactory(GraphQLSchemaServlet
226226

227227
@Bean
228228
@ConditionalOnMissingBean
229-
public GraphQLQueryInvoker queryInvoker(
230-
ExecutionStrategyProvider executionStrategyProvider
231-
) {
229+
public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrategyProvider) {
232230
GraphQLQueryInvoker.Builder builder = GraphQLQueryInvoker.newBuilder()
233231
.withExecutionStrategyProvider(executionStrategyProvider);
234232

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package graphql.kickstart.spring.web.boot;
22

33
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
4+
import org.apache.tomcat.websocket.PerMessageDeflate;
45
import org.springframework.context.Lifecycle;
56
import org.springframework.web.socket.server.standard.ServerEndpointRegistration;
67

0 commit comments

Comments
 (0)