Move WebSocketExtension to top-level package

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 {

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;

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;
 

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;
 

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.*;