feat: fix unit tests

Author: oliemansm

graphql-spring-boot-autoconfigure/build.gradle

@@ -21,11 +21,11 @@ dependencies {
     api "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
     api(project(":graphql-kickstart-spring-support"))
     api(project(':graphql-kickstart-spring-webflux'))
-    implementation "org.springframework.boot:spring-boot-autoconfigure"
     api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER"
     api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
     // annotations
     api "io.github.graphql-java:graphql-java-annotations:$LIB_GRAPHQL_ANNOTATIONS_VER"
     implementation "org.reflections:reflections:$LIB_REFLECTIONS_VER"

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

@@ -25,14 +25,13 @@
 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;
 import org.springframework.web.socket.server.standard.ServerEndpointRegistration;
 
 @Configuration
 @RequiredArgsConstructor
 @ConditionalOnWebApplication(type = Type.SERVLET)
-@ConditionalOnClass(DispatcherServlet.class)
+@ConditionalOnClass({ServerContainer.class})
 @Conditional(OnSchemaOrSchemaProviderBean.class)
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @ConditionalOnProperty(
@@ -75,14 +74,14 @@ private Optional<SubscriptionConnectionListener> keepAliveListener() {
   }
 
   @Bean
-  @ConditionalOnClass(ServerContainer.class)
+  @ConditionalOnClass(ServerEndpointRegistration.class)
   public ServerEndpointRegistration serverEndpointRegistration(GraphQLWebsocketServlet servlet) {
     return new GraphQLWsServerEndpointRegistration(websocketProperties.getPath(), servlet);
   }
 
   @Bean
   @ConditionalOnMissingBean
-  @ConditionalOnClass(ServerContainer.class)
+  @ConditionalOnClass(ServerEndpointExporter.class)
   public ServerEndpointExporter serverEndpointExporter() {
     return new ServerEndpointExporter();
   }

graphql-spring-boot-test/build.gradle

@@ -25,6 +25,7 @@ dependencies {
     compileOnly("com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER")
     compileOnly("com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER")
     testImplementation("org.springframework.boot:spring-boot-starter-web")
+    testImplementation "org.springframework.boot:spring-boot-starter-websocket"
     testImplementation project(":graphql-spring-boot-starter")
     testImplementation "io.reactivex.rxjava2:rxjava"
 }