Fix for upstream Spring 4.0 changes

Author: Phillip Webb

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java

@@ -23,9 +23,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
 
-public class SimpleClientWebSocketHandler extends TextWebSocketHandlerAdapter {
+public class SimpleClientWebSocketHandler extends TextWebSocketHandler {
 
 	protected Log logger = LogFactory.getLog(SimpleClientWebSocketHandler.class);
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java

@@ -29,7 +29,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.support.PerConnectionWebSocketHandler;
+import org.springframework.web.socket.handler.PerConnectionWebSocketHandler;
 
 @Configuration
 @EnableAutoConfiguration

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java

@@ -23,12 +23,12 @@
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
 
 /**
  * Echo messages by implementing a Spring {@link WebSocketHandler} abstraction.
  */
-public class EchoWebSocketHandler extends TextWebSocketHandlerAdapter {
+public class EchoWebSocketHandler extends TextWebSocketHandler {
 
 	private static Logger logger = LoggerFactory.getLogger(EchoWebSocketHandler.class);
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java

@@ -25,9 +25,9 @@
 import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
 
-public class SnakeWebSocketHandler extends TextWebSocketHandlerAdapter {
+public class SnakeWebSocketHandler extends TextWebSocketHandler {
 
 	public static final int PLAYFIELD_WIDTH = 640;
 	public static final int PLAYFIELD_HEIGHT = 480;

spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java

@@ -37,7 +37,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
-import org.springframework.web.socket.client.endpoint.StandardWebSocketClient;
+import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
 import static org.junit.Assert.assertEquals;