From f7f53e4e64fa5dbf493d16788f852b56ed604035 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 3 Dec 2013 11:51:51 -0800 Subject: [PATCH] Fix for upstream Spring 4.0 changes --- .../websocket/client/SimpleClientWebSocketHandler.java | 4 ++-- .../samples/websocket/config/SampleWebSocketsApplication.java | 2 +- .../boot/samples/websocket/echo/EchoWebSocketHandler.java | 4 ++-- .../boot/samples/websocket/snake/SnakeWebSocketHandler.java | 4 ++-- .../websocket/echo/SampleWebSocketsApplicationTests.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java index 9eb379e97a3..2f0fdc7782f 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java @@ -23,9 +23,9 @@ import org.apache.commons.logging.LogFactory; 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); diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java index d6c261528c2..34044c406cc 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java +++ b/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.boot.web.SpringBootServletInitializer; 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 diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java index bc8bad81fbf..d610b59ba35 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java +++ b/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.CloseStatus; 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); diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java index 48442a1547a..022eaff380d 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java @@ -25,9 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger; 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; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java index 346ec076bb6..16d8ec6bd35 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java +++ b/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.ConfigurableApplicationContext; 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;