Browse Source

Check Reactor presence after Undertow for WebSocket

Issue: SPR-15539
pull/1325/merge
Rossen Stoyanchev 8 years ago
parent
commit
9b53b86d24
  1. 15
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java

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

@ -62,14 +62,14 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle { @@ -62,14 +62,14 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
"org.eclipse.jetty.websocket.server.WebSocketServerFactory",
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(
"io.undertow.websockets.WebSocketProtocolHandshakeHandler",
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);
@ -104,12 +104,13 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle { @@ -104,12 +104,13 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
else if (jettyPresent) {
className = "JettyRequestUpgradeStrategy";
}
else if (reactorNettyPresent) {
className = "ReactorNettyRequestUpgradeStrategy";
}
else if (undertowPresent) {
className = "UndertowRequestUpgradeStrategy";
}
else if (reactorNettyPresent) {
// As late as possible (Reactor Netty commonly used for WebClient)
className = "ReactorNettyRequestUpgradeStrategy";
}
else {
throw new IllegalStateException("No suitable default RequestUpgradeStrategy found");
}

Loading…
Cancel
Save