root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Check Reactor presence after Undertow for WebSocket 

Issue: SPR-15539
This commit is contained in:
Rossen Stoyanchev 2017-05-24 15:05:59 -04:00
parent df8412bded
commit 9b53b86d24
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
View File

@ -62,14 +62,14 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
"org.eclipse.jetty.websocket.server.WebSocketServerFactory", "org.eclipse.jetty.websocket.server.WebSocketServerFactory",
HandshakeWebSocketService.class.getClassLoader()); HandshakeWebSocketService.class.getClassLoader());
private static final boolean reactorNettyPresent = ClassUtils.isPresent(
"reactor.ipc.netty.http.server.HttpServerResponse",
HandshakeWebSocketService.class.getClassLoader());
private static final boolean undertowPresent = ClassUtils.isPresent( private static final boolean undertowPresent = ClassUtils.isPresent(
"io.undertow.websockets.WebSocketProtocolHandshakeHandler", "io.undertow.websockets.WebSocketProtocolHandshakeHandler",
HandshakeWebSocketService.class.getClassLoader()); HandshakeWebSocketService.class.getClassLoader());
private static final boolean reactorNettyPresent = ClassUtils.isPresent(
"reactor.ipc.netty.http.server.HttpServerResponse",
HandshakeWebSocketService.class.getClassLoader());
protected static final Log logger = LogFactory.getLog(HandshakeWebSocketService.class); protected static final Log logger = LogFactory.getLog(HandshakeWebSocketService.class);
@ -104,12 +104,13 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
else if (jettyPresent) { else if (jettyPresent) {
className = "JettyRequestUpgradeStrategy"; className = "JettyRequestUpgradeStrategy";
} }
else if (reactorNettyPresent) {
className = "ReactorNettyRequestUpgradeStrategy";
}
else if (undertowPresent) { else if (undertowPresent) {
className = "UndertowRequestUpgradeStrategy"; className = "UndertowRequestUpgradeStrategy";
} }
else if (reactorNettyPresent) {
// As late as possible (Reactor Netty commonly used for WebClient)
className = "ReactorNettyRequestUpgradeStrategy";
}
else { else {
throw new IllegalStateException("No suitable default RequestUpgradeStrategy found"); throw new IllegalStateException("No suitable default RequestUpgradeStrategy found");
} }