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

Improve RouterFunction composition

Browse Source 
This commit changes the way two RouterFunctions are composed in
WebFlux.fn. Prior to this commit, two were composed with
`switchIfEmpty()`, switching from the first to the second route if the
first did not provide an element.
After this commit, two router functions are compose using `concat`,
which results in a smaller stack trace.

See gh-24652
This commit is contained in:
Arjen Poutsma
2020-03-13 16:02:42 +01:00
parent f4ce22f6ba
commit 54e2df2e0e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import java.util.function.Supplier;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.core.io.Resource;
@@ -778,8 +779,8 @@ public abstract class RouterFunctions {
@Override
public Mono<HandlerFunction<T>> route(ServerRequest request) {
return this.first.route(request)
.switchIfEmpty(Mono.defer(() -> this.second.route(request)));
return Flux.concat(this.first.route(request), Mono.defer(() -> this.second.route(request)))
.next();
}
@Override
@@ -808,9 +809,9 @@ public abstract class RouterFunctions {
@Override
public Mono<HandlerFunction<ServerResponse>> route(ServerRequest request) {
return this.first.route(request)
.map(this::cast)
.switchIfEmpty(Mono.defer(() -> this.second.route(request).map(this::cast)));
return Flux.concat(this.first.route(request), Mono.defer(() -> this.second.route(request)))
.next()
.map(this::cast);
}
@SuppressWarnings("unchecked")