diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java index f7782aa552d..94264479c91 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java @@ -39,6 +39,7 @@ import org.springframework.web.reactive.socket.adapter.JettyWebSocketSession; /** * A {@link WebSocketClient} implementation for use with Jetty * {@link org.eclipse.jetty.websocket.client.WebSocketClient}. + * Only supported on Jetty 11, superseded by {@link StandardWebSocketClient}. * *

Note: the Jetty {@code WebSocketClient} requires * lifecycle management and must be started and stopped. This is automatically @@ -49,7 +50,9 @@ import org.springframework.web.reactive.socket.adapter.JettyWebSocketSession; * @author Rossen Stoyanchev * @author Juergen Hoeller * @since 5.0 + * @deprecated as of 6.0.3, in favor of {@link StandardWebSocketClient} */ +@Deprecated(since = "6.0.3", forRemoval = true) public class JettyWebSocketClient implements WebSocketClient, Lifecycle { private static final Log logger = LogFactory.getLog(JettyWebSocketClient.class); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java index 71a081c0aef..55ad014c274 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -91,6 +91,7 @@ abstract class AbstractWebSocketIntegrationTests { static Stream arguments() throws IOException { + @SuppressWarnings("removal") WebSocketClient[] clients = new WebSocketClient[] { new TomcatWebSocketClient(), new JettyWebSocketClient(), diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java index 96d0854c3ad..c893ba9baea 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java @@ -45,7 +45,8 @@ import org.springframework.web.socket.client.AbstractWebSocketClient; /** * Initiates WebSocket requests to a WebSocket server programmatically - * through the Jetty WebSocket API. + * through the Jetty WebSocket API. Only supported on Jetty 11, superseded by + * {@link org.springframework.web.socket.client.standard.StandardWebSocketClient}. * *

As of 4.1 this class implements {@link Lifecycle} rather than * {@link org.springframework.context.SmartLifecycle}. Use @@ -55,7 +56,10 @@ import org.springframework.web.socket.client.AbstractWebSocketClient; * @author Rossen Stoyanchev * @author Juergen Hoeller * @since 4.0 + * @deprecated as of 6.0.3, in favor of + * {@link org.springframework.web.socket.client.standard.StandardWebSocketClient} */ +@Deprecated(since = "6.0.3", forRemoval = true) public class JettyWebSocketClient extends AbstractWebSocketClient implements Lifecycle { private final org.eclipse.jetty.websocket.client.WebSocketClient client; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index cb15cdb557c..3c6374a37e0 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -65,6 +65,7 @@ public abstract class AbstractWebSocketIntegrationTests { upgradeStrategyConfigTypes.put(UndertowTestServer.class, UndertowUpgradeStrategyConfig.class); } + @SuppressWarnings("removal") static Stream argumentsFactory() { return Stream.of( arguments(named("Jetty", new JettyWebSocketTestServer()), named("Jetty", new JettyWebSocketClient())), diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java index 22c82188988..343503f614e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java @@ -42,6 +42,7 @@ class JettySockJsIntegrationTests extends AbstractSockJsIntegrationTests { return new JettyWebSocketTestServer(); } + @SuppressWarnings("removal") @Override protected Transport createWebSocketTransport() { return new WebSocketTransport(new JettyWebSocketClient());