feat: fix unit tests

Author: oliemansm

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

@@ -63,10 +63,7 @@ public GraphQLWebsocketServlet graphQLWebsocketServlet(
     }
     keepAliveListener().ifPresent(listeners::add);
     return new GraphQLWebsocketServlet(
-        graphQLInvoker,
-        invocationInputFactory,
-        graphQLObjectMapper,
-        listeners);
+        graphQLInvoker, invocationInputFactory, graphQLObjectMapper, listeners);
   }
 
   private Optional<SubscriptionConnectionListener> keepAliveListener() {
@@ -96,7 +93,10 @@ public WsCsrfTokenRepository wsCsrfTokenRepository() {
   public ServerEndpointRegistration serverEndpointRegistration(
       GraphQLWebsocketServlet servlet, WsCsrfFilter csrfFilter) {
     return new GraphQLWsServerEndpointRegistration(
-        websocketProperties.getPath(), servlet, csrfFilter);
+        websocketProperties.getPath(),
+        servlet,
+        csrfFilter,
+        websocketProperties.getAllowedOrigins());
   }
 
   @Bean

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

@@ -18,9 +18,13 @@ public class GraphQLWsServerEndpointRegistration extends ServerEndpointRegistrat
   private static final String ALL = "*";
   private final GraphQLWebsocketServlet servlet;
   private final WsCsrfFilter csrfFilter;
+  private final List<String> allowedOrigins;
 
   public GraphQLWsServerEndpointRegistration(
-      String path, GraphQLWebsocketServlet servlet, WsCsrfFilter csrfFilter, List<String> allowedOrigins) {
+      String path,
+      GraphQLWebsocketServlet servlet,
+      WsCsrfFilter csrfFilter,
+      List<String> allowedOrigins) {
     super(path, servlet);
     this.servlet = servlet;
     if (allowedOrigins == null || allowedOrigins.isEmpty()) {

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWsServerEndpointRegistrationTest.java

@@ -16,28 +16,36 @@ class GraphQLWsServerEndpointRegistrationTest {
   private static final String PATH = "/subscriptions";
 
   @Mock private GraphQLWebsocketServlet servlet;
+  @Mock private WsCsrfFilter csrfFilter;
 
   @ParameterizedTest
-  @CsvSource(value = {"https://trusted.com", "NULL", "' '"}, nullValues = {"NULL"})
+  @CsvSource(
+      value = {"https://trusted.com", "NULL", "' '"},
+      nullValues = {"NULL"})
   void givenDefaultAllowedOrigins_whenCheckOrigin_thenReturnTrue(String origin) {
     var registration = createRegistration();
     var allowed = registration.checkOrigin("null".equals(origin) ? null : origin);
     assertThat(allowed).isTrue();
   }
 
   private GraphQLWsServerEndpointRegistration createRegistration(String... allowedOrigins) {
-    return new GraphQLWsServerEndpointRegistration(PATH, servlet, List.of(allowedOrigins));
+    return new GraphQLWsServerEndpointRegistration(
+        PATH, servlet, csrfFilter, List.of(allowedOrigins));
   }
 
   @ParameterizedTest(name = "{index} => allowedOrigin=''{0}'', originToCheck=''{1}''")
-  @CsvSource(delimiterString = "|", textBlock = """
+  @CsvSource(
+      delimiterString = "|",
+      textBlock =
+          """
     *                    | https://trusted.com
     https://trusted.com  | https://trusted.com
     https://trusted.com/ | https://trusted.com
     https://trusted.com/ | https://trusted.com/
     https://trusted.com  | https://trusted.com/
 """)
-  void givenAllowedOrigins_whenCheckOrigin_thenReturnTrue(String allowedOrigin, String originToCheck) {
+  void givenAllowedOrigins_whenCheckOrigin_thenReturnTrue(
+      String allowedOrigin, String originToCheck) {
     var registration = createRegistration(allowedOrigin);
     var allowed = registration.checkOrigin(originToCheck);
     assertThat(allowed).isTrue();

graphql-spring-boot-test/build.gradle

@@ -17,6 +17,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
+    compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+    compileOnly 'jakarta.websocket:jakarta.websocket-api:2.1.0'
+    compileOnly 'jakarta.websocket:jakarta.websocket-client-api:2.1.0'
     implementation "org.springframework:spring-web"
     implementation "org.springframework.boot:spring-boot-starter-test"
     implementation "com.fasterxml.jackson.core:jackson-databind"
@@ -27,4 +30,5 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-websocket"
     testImplementation project(":graphql-spring-boot-starter")
     testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
+
 }