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

Fix RequestPredicate.route() implementation 

Issue: SPR-14954
This commit is contained in:
Sebastien Deleuze 2017-02-16 23:34:28 +01:00
parent 305f303d46
commit 4d48fde795
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt
View File

@ -60,7 +60,6 @@ fun RouterFunction<*>.route(request: ServerRequest, configure: Routes.() -> Unit
class Routes {
val children = mutableListOf<Routes>()
val routes = mutableListOf<RouterFunction<ServerResponse>>()
infix fun RequestPredicate.and(other: RequestPredicate): RequestPredicate = this.and(other)
@ -69,8 +68,9 @@ class Routes {
operator fun RequestPredicate.not(): RequestPredicate = this.negate()
fun RequestPredicate.route(routes: Routes.() -> Unit) =
RouterFunctions.nest(this, Routes().apply(routes).router())
fun RequestPredicate.route(r: Routes.() -> Unit) {
routes += RouterFunctions.nest(this, Routes().apply(r).router())
}
operator fun RequestPredicate.invoke(f: (ServerRequest) -> Mono<ServerResponse>) {
routes += RouterFunctions.route(this, HandlerFunction { f(it) })
@ -145,20 +145,11 @@ class Routes {
}
fun router(): RouterFunction<ServerResponse> {
return routes().reduce(RouterFunction<ServerResponse>::and)
return routes.reduce(RouterFunction<ServerResponse>::and)
}
operator fun invoke(request: ServerRequest): Mono<HandlerFunction<ServerResponse>> {
return router().route(request)
}
private fun routes(): List<RouterFunction<ServerResponse>> {
val allRoutes = mutableListOf<RouterFunction<ServerResponse>>()
allRoutes += routes
for (child in children) {
allRoutes += child.routes()
}
return allRoutes
}
}