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

Optional WebSocket engine presence in WebFlux config 

Closes gh-22587
This commit is contained in:
Rossen Stoyanchev 2020-09-02 10:05:58 +01:00
parent 689adb4bd0
commit e02ccc9374
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
View File

@ -65,7 +65,9 @@ import org.springframework.web.reactive.result.method.annotation.ResponseBodyRes
import org.springframework.web.reactive.result.method.annotation.ResponseEntityResultHandler; import org.springframework.web.reactive.result.method.annotation.ResponseEntityResultHandler;
import org.springframework.web.reactive.result.view.ViewResolutionResultHandler; import org.springframework.web.reactive.result.view.ViewResolutionResultHandler;
import org.springframework.web.reactive.result.view.ViewResolver; import org.springframework.web.reactive.result.view.ViewResolver;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.server.WebSocketService; import org.springframework.web.reactive.socket.server.WebSocketService;
import org.springframework.web.reactive.socket.server.support.HandshakeWebSocketService;
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter; import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebExceptionHandler; import org.springframework.web.server.WebExceptionHandler;
@ -435,17 +437,29 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
@Bean @Bean
public WebSocketHandlerAdapter webFluxWebSocketHandlerAdapter() { public WebSocketHandlerAdapter webFluxWebSocketHandlerAdapter() {
WebSocketService service = getWebSocketService(); WebSocketHandlerAdapter adapter = new WebSocketHandlerAdapter(initWebSocketService());
WebSocketHandlerAdapter adapter = (service != null ?
new WebSocketHandlerAdapter(service) : new WebSocketHandlerAdapter());
// For backwards compatibility, lower the (default) priority // Lower the (default) priority for now, for backwards compatibility
int defaultOrder = adapter.getOrder(); int defaultOrder = adapter.getOrder();
adapter.setOrder(defaultOrder + 1); adapter.setOrder(defaultOrder + 1);
return adapter; return adapter;
} }
private WebSocketService initWebSocketService() {
WebSocketService service = getWebSocketService();
if (service == null) {
try {
service = new HandshakeWebSocketService();
}
catch (IllegalStateException ex) {
// Don't fail, test environment perhaps
service = new NoUpgradeStrategyWebSocketService();
}
}
return service;
}
@Nullable @Nullable
protected WebSocketService getWebSocketService() { protected WebSocketService getWebSocketService() {
return null; return null;
@ -535,4 +549,13 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
} }
} }
private static final class NoUpgradeStrategyWebSocketService implements WebSocketService {
@Override
public Mono<Void> handleRequest(ServerWebExchange exchange, WebSocketHandler webSocketHandler) {
return Mono.error(new IllegalStateException("No suitable RequestUpgradeStrategy"));
}
}
} }