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

Align with breaking API changes in latest Spring Framework snapshots

Browse Source
This commit is contained in:
Andy Wilkinson
2017-05-23 09:40:14 +01:00
parent b60d3fb4cb
commit 3def99ad7b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java
View File

@@ -38,7 +38,7 @@ import org.springframework.web.reactive.function.server.RouterFunction;
import org.springframework.web.reactive.function.server.RouterFunctions;
import org.springframework.web.reactive.result.view.ViewResolver;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebHandler;
import org.springframework.web.server.adapter.HttpWebHandlerAdapter;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import org.springframework.web.server.session.WebSessionManager;
@@ -108,15 +108,19 @@ public class HttpHandlerAutoConfiguration {
if (this.handlerStrategiesBuilder == null) {
this.handlerStrategiesBuilder = HandlerStrategies.builder();
}
if (this.webFilters != null) {
this.webFilters.forEach(this.handlerStrategiesBuilder::webFilter);
}
if (this.viewResolvers != null) {
this.viewResolvers.forEach(this.handlerStrategiesBuilder::viewResolver);
}
WebHandler webHandler = RouterFunctions.toHttpHandler(routerFunction,
HttpHandler httpHandler = RouterFunctions.toHttpHandler(routerFunction,
this.handlerStrategiesBuilder.build());
WebHttpHandlerBuilder builder = WebHttpHandlerBuilder.webHandler(webHandler)
.sessionManager(this.webSessionManager);
builder.filters(this.webFilters);
return builder.build();
if (this.webSessionManager != null) {
((HttpWebHandlerAdapter) httpHandler)
.setSessionManager(this.webSessionManager);
}
return httpHandler;
}
}