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

Polishing 

See gh-28595
This commit is contained in:
rstoyanchev 2022-06-14 09:35:17 +01:00
parent 52d0681ca1
commit d28d603081
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java
View File

@ -154,35 +154,20 @@ public class RouterFunctionMapping extends AbstractHandlerMapping implements Ini
* current application context. * current application context.
*/ */
private void initRouterFunctions() { private void initRouterFunctions() {
List<RouterFunction<?>> routerFunctions = routerFunctions(); List<RouterFunction<?>> routerFunctions = new ArrayList<>();
detectRouterFunctions(obtainApplicationContext(), routerFunctions);
this.routerFunction = routerFunctions.stream().reduce(RouterFunction::andOther).orElse(null); this.routerFunction = routerFunctions.stream().reduce(RouterFunction::andOther).orElse(null);
logRouterFunctions(routerFunctions); logRouterFunctions(routerFunctions);
} }
private List<RouterFunction<?>> routerFunctions() { private void detectRouterFunctions(ApplicationContext context, List<RouterFunction<?>> routerFunctions) {
List<RouterFunction<?>> routerFunctions = new ArrayList<>(); if (this.detectHandlerFunctionsInAncestorContexts && context.getParent() != null) {
if (this.detectHandlerFunctionsInAncestorContexts) { detectRouterFunctions(context.getParent(), routerFunctions);
detectRouterFunctionsInAncestorContexts(obtainApplicationContext(), routerFunctions);
} }
obtainApplicationContext() context.getBeanProvider(RouterFunction.class)
.getBeanProvider(RouterFunction.class)
.orderedStream() .orderedStream()
.map(router -> (RouterFunction<?>) router) .map(router -> (RouterFunction<?>) router)
.collect(Collectors.toCollection(() -> routerFunctions)); .collect(Collectors.toCollection(() -> routerFunctions));
return routerFunctions;
}
private void detectRouterFunctionsInAncestorContexts(
ApplicationContext applicationContext, List<RouterFunction<?>> routerFunctions) {
ApplicationContext parentContext = applicationContext.getParent();
if (parentContext != null) {
detectRouterFunctionsInAncestorContexts(parentContext, routerFunctions);
parentContext.getBeanProvider(RouterFunction.class)
.orderedStream()
.map(router -> (RouterFunction<?>) router)
.collect(Collectors.toCollection(() -> routerFunctions));
}
} }
private void logRouterFunctions(List<RouterFunction<?>> routerFunctions) { private void logRouterFunctions(List<RouterFunction<?>> routerFunctions) {