Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify return type of subProtocolWebSocketHandler bean

Browse Source 
The @Bean method now returns WebSocketHandler allowing it to be
decorated via WebSocketHandlerDecorator.
This commit is contained in:
Rossen Stoyanchev
2013-09-03 15:24:58 -04:00
parent 542b5b2029
commit 30d2f783a7
5 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-messaging/src/test/java/org/springframework/messaging/simp/config/AbstractStompEndpointRegistrationTests.java
View File

@@ -25,6 +25,7 @@ import org.mockito.Mockito;
import org.springframework.messaging.handler.websocket.SubProtocolWebSocketHandler;
import org.springframework.messaging.support.channel.ExecutorSubscribableChannel;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.DefaultHandshakeHandler;
import org.springframework.web.socket.server.HandshakeHandler;
import org.springframework.web.socket.sockjs.SockJsService;
@@ -122,13 +123,13 @@ public class AbstractStompEndpointRegistrationTests {
@Override
protected void addSockJsServiceMapping(List<Mapping> mappings, SockJsService sockJsService,
SubProtocolWebSocketHandler wsHandler, String pathPattern) {
WebSocketHandler wsHandler, String pathPattern) {
mappings.add(new Mapping(wsHandler, pathPattern, sockJsService));
}
@Override
protected void addWebSocketHandlerMapping(List<Mapping> mappings, SubProtocolWebSocketHandler wsHandler,
protected void addWebSocketHandlerMapping(List<Mapping> mappings, WebSocketHandler wsHandler,
HandshakeHandler handshakeHandler, String path) {
mappings.add(new Mapping(wsHandler, path, handshakeHandler));
@@ -137,7 +138,7 @@ public class AbstractStompEndpointRegistrationTests {
private static class Mapping {
private final SubProtocolWebSocketHandler webSocketHandler;
private final WebSocketHandler webSocketHandler;
private final String path;
@@ -145,14 +146,14 @@ public class AbstractStompEndpointRegistrationTests {
private final DefaultSockJsService sockJsService;
public Mapping(SubProtocolWebSocketHandler handler, String path, SockJsService sockJsService) {
public Mapping(WebSocketHandler handler, String path, SockJsService sockJsService) {
this.webSocketHandler = handler;
this.path = path;
this.handshakeHandler = null;
this.sockJsService = (DefaultSockJsService) sockJsService;
}
public Mapping(SubProtocolWebSocketHandler h, String path, HandshakeHandler hh) {
public Mapping(WebSocketHandler h, String path, HandshakeHandler hh) {
this.webSocketHandler = h;
this.path = path;
this.handshakeHandler = hh;