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

Add Tomcat WebSocket integration tests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-09-01 16:01:15 -04:00
parent e21bbdd933
commit fee3148b0f
12 changed files with 349 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java
View File

@@ -17,7 +17,6 @@
package org.springframework.web.socket.server.support;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
@@ -27,17 +26,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.Endpoint;
import javax.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.websocket.server.WsHandshakeRequest;
import org.apache.tomcat.websocket.server.WsHttpUpgradeHandler;
import org.apache.tomcat.websocket.server.WsServerContainer;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.springframework.web.socket.server.HandshakeFailureException;
import org.springframework.web.socket.server.endpoint.ServerEndpointRegistration;
import org.springframework.web.socket.server.endpoint.ServletServerContainerFactoryBean;
@@ -71,17 +66,6 @@ public class TomcatRequestUpgradeStrategy extends AbstractStandardUpgradeStrateg
Assert.isTrue(response instanceof ServletServerHttpResponse);
HttpServletResponse servletResponse = ((ServletServerHttpResponse) response).getServletResponse();
if (hasDoUpgrade) {
doUpgrade(servletRequest, servletResponse, acceptedProtocol, endpoint);
}
else {
upgradeTomcat80RC1(servletRequest, acceptedProtocol, endpoint);
}
}
private void doUpgrade(HttpServletRequest servletRequest, HttpServletResponse servletResponse,
String acceptedProtocol, Endpoint endpoint) {
StringBuffer requestUrl = servletRequest.getRequestURL();
String path = servletRequest.getRequestURI(); // shouldn't matter
Map<String, String> pathParams = Collections.<String, String> emptyMap();
@@ -108,36 +92,4 @@ public class TomcatRequestUpgradeStrategy extends AbstractStandardUpgradeStrateg
return (WsServerContainer) servletContext.getAttribute(attribute);
}
// FIXME: Remove this after RC2 is out
private void upgradeTomcat80RC1(HttpServletRequest request, String protocol, Endpoint endpoint) {
WsHttpUpgradeHandler upgradeHandler;
try {
upgradeHandler = request.upgrade(WsHttpUpgradeHandler.class);
}
catch (Exception e) {
throw new HandshakeFailureException("Unable to create UpgardeHandler", e);
}
WsHandshakeRequest webSocketRequest = new WsHandshakeRequest(request);
try {
Method method = ReflectionUtils.findMethod(WsHandshakeRequest.class, "finished");
ReflectionUtils.makeAccessible(method);
method.invoke(webSocketRequest);
}
catch (Exception ex) {
throw new HandshakeFailureException("Failed to upgrade HttpServletRequest", ex);
}
ServerEndpointConfig endpointConfig = new ServerEndpointRegistration("/shouldntmatter", endpoint);
upgradeHandler.preInit(endpoint, endpointConfig, getContainer(request), webSocketRequest,
protocol, Collections.<String, String> emptyMap(), request.isSecure());
}
private static boolean hasDoUpgrade = (ReflectionUtils.findMethod(WsServerContainer.class,
"doUpgrade", HttpServletRequest.class, HttpServletResponse.class,
ServerEndpointConfig.class, Map.class) != null);
}