From 69238ba66f19279de7e1a0e2ddd69fbb9fd0de05 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 2 Dec 2013 16:53:11 -0500 Subject: [PATCH] Move WebSocketExtension to top-level package --- .../web/socket/{support => }/WebSocketExtension.java | 2 +- .../java/org/springframework/web/socket/WebSocketSession.java | 1 - .../web/socket/adapter/JettyWebSocketSession.java | 2 +- .../web/socket/adapter/StandardWebSocketSession.java | 2 +- .../web/socket/client/AbstractWebSocketClient.java | 2 +- .../web/socket/client/endpoint/StandardWebSocketClient.java | 2 +- .../web/socket/client/jetty/JettyWebSocketClient.java | 2 +- .../web/socket/server/RequestUpgradeStrategy.java | 2 +- .../socket/server/support/AbstractStandardUpgradeStrategy.java | 2 +- .../web/socket/server/support/DefaultHandshakeHandler.java | 2 +- .../server/support/GlassFish40RequestUpgradeStrategy.java | 2 +- .../web/socket/server/support/JettyRequestUpgradeStrategy.java | 2 +- .../sockjs/transport/session/AbstractHttpSockJsSession.java | 2 +- .../sockjs/transport/session/WebSocketServerSockJsSession.java | 2 +- .../web/socket/support/WebSocketHttpHeaders.java | 1 + .../springframework/web/socket/WebSocketExtensionTests.java | 3 +-- .../web/socket/server/DefaultHandshakeHandlerTests.java | 2 +- .../web/socket/sockjs/transport/session/TestSockJsSession.java | 2 +- .../web/socket/support/TestWebSocketSession.java | 1 + .../web/socket/support/WebSocketHttpHeadersTests.java | 1 + 20 files changed, 19 insertions(+), 18 deletions(-) rename spring-websocket/src/main/java/org/springframework/web/socket/{support => }/WebSocketExtension.java (99%) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java similarity index 99% rename from spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java rename to spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java index 4802e2ee0b..580b9dbe49 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketExtension.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.support; +package org.springframework.web.socket; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java index 7d5d1a5e4d..a4634ddc39 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import org.springframework.http.HttpHeaders; -import org.springframework.web.socket.support.WebSocketExtension; /** * A WebSocket session abstraction. Allows sending messages over a WebSocket connection diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSession.java index 62b5b9cd54..9ceca8dc66 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSession.java @@ -32,7 +32,7 @@ import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PingMessage; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketSession; /** diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java index a7592e0df5..771aea2c7e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java @@ -36,7 +36,7 @@ import org.springframework.web.socket.PingMessage; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; /** * A {@link WebSocketSession} for use with the standard WebSocket for Java API. diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java index 6a0236e162..546f6ecb29 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java @@ -30,7 +30,7 @@ import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.support.WebSocketHttpHeaders; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java index 2d668b8d59..78173064cf 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java @@ -40,7 +40,7 @@ import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.adapter.StandardWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.StandardWebSocketSession; import org.springframework.web.socket.client.AbstractWebSocketClient; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; /** * Initiates WebSocket requests to a WebSocket server programatically through the standard 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 c3663ab9f9..c2f7e28f1b 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 @@ -38,7 +38,7 @@ import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.adapter.JettyWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.JettyWebSocketSession; import org.springframework.web.socket.client.AbstractWebSocketClient; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java index 7c58b921db..cf5d298813 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java @@ -21,7 +21,7 @@ import java.util.Map; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; /** diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractStandardUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractStandardUpgradeStrategy.java index 09c7e0184b..b8952cc1bf 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractStandardUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractStandardUpgradeStrategy.java @@ -33,7 +33,7 @@ import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.Assert; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.adapter.StandardWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.StandardWebSocketSession; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java index e9136ea3fb..dc1ff0575d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java @@ -38,7 +38,7 @@ import org.springframework.web.socket.server.HandshakeFailureException; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.support.SubProtocolCapable; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.support.WebSocketHandlerDecorator; import org.springframework.web.socket.support.WebSocketHttpHeaders; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFish40RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFish40RequestUpgradeStrategy.java index 98a331fbd9..cd7d88336b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFish40RequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFish40RequestUpgradeStrategy.java @@ -26,7 +26,7 @@ import org.glassfish.tyrus.core.EndpointWrapper; import org.glassfish.tyrus.spi.SPIEndpoint; import org.glassfish.tyrus.websockets.WebSocketApplication; import org.springframework.util.ClassUtils; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; /** * Extension of the {@link AbstractGlassFishRequestUpgradeStrategy} that provides support diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java index fdf44850dc..b92889f339 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java @@ -40,7 +40,7 @@ import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.adapter.JettyWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.JettyWebSocketSession; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java index 04b1336859..c93074dd84 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java @@ -37,7 +37,7 @@ import org.springframework.web.socket.sockjs.SockJsException; import org.springframework.web.socket.sockjs.SockJsTransportFailureException; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame.FrameFormat; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; /** * An abstract base class for use with HTTP transport based SockJS sessions. diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java index b5137f91a4..e66af40e7e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java @@ -28,7 +28,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.adapter.NativeWebSocketSession; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java index 18fe7c679d..9b88f6178a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java @@ -25,6 +25,7 @@ import java.util.Set; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; +import org.springframework.web.socket.WebSocketExtension; /** * An {@link org.springframework.http.HttpHeaders} variant that adds support for diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java index f6d3306920..ea9f663ec6 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java @@ -20,12 +20,11 @@ import java.util.List; import org.hamcrest.Matchers; import org.junit.Test; -import org.springframework.web.socket.support.WebSocketExtension; import static org.junit.Assert.*; /** - * Test fixture for {@link org.springframework.web.socket.support.WebSocketExtension} + * Test fixture for {@link WebSocketExtension} * @author Brian Clozel */ public class WebSocketExtensionTests { diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java index 859853f958..db8021c757 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java @@ -28,7 +28,7 @@ import org.mockito.MockitoAnnotations; import org.springframework.web.socket.AbstractHttpRequestTests; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.support.SubProtocolCapable; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter; import org.springframework.web.socket.support.WebSocketHttpHeaders; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java index 730c12cdcd..7f60c86474 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java @@ -26,7 +26,7 @@ import java.util.Map; import org.springframework.http.HttpHeaders; import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.support.WebSocketExtension; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/support/TestWebSocketSession.java b/spring-websocket/src/test/java/org/springframework/web/socket/support/TestWebSocketSession.java index 7c8775cfc7..dd8f90817e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/support/TestWebSocketSession.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/support/TestWebSocketSession.java @@ -27,6 +27,7 @@ import java.util.Map; import org.springframework.http.HttpHeaders; import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java index f0b59b084d..58161b9bfd 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHttpHeadersTests.java @@ -22,6 +22,7 @@ import java.util.List; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; +import org.springframework.web.socket.WebSocketExtension; import static org.junit.Assert.*;