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

Rename RouterDsl to RouterFunctionDsl

This commit is contained in:
Sebastien Deleuze 2017-04-10 10:25:58 +02:00
parent 18d8876dc8
commit 9b85c5b636
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,14 +50,14 @@ import reactor.core.publisher.Mono
* @see <a href="https://youtrack.jetbrains.com/issue/KT-15667">Kotlin issue about supporting ::foo for member functions</a>
*/
typealias Routes = RouterDsl.() -> Unit
typealias Routes = RouterFunctionDsl.() -> Unit
/**
* Allow to create easily a [RouterFunction] from [Routes]
*/
fun router(routes: Routes) = RouterDsl().apply(routes).router()
fun router(routes: Routes) = RouterFunctionDsl().apply(routes).router()
class RouterDsl {
class RouterFunctionDsl {
val routes = mutableListOf<RouterFunction<ServerResponse>>()
@ -76,11 +76,11 @@ class RouterDsl {
operator fun RequestPredicate.not(): RequestPredicate = this.negate()
fun RequestPredicate.nest(r: Routes) {
routes += RouterFunctions.nest(this, RouterDsl().apply(r).router())
routes += RouterFunctions.nest(this, RouterFunctionDsl().apply(r).router())
}
fun String.nest(r: Routes) {
routes += RouterFunctions.nest(path(this), RouterDsl().apply(r).router())
routes += RouterFunctions.nest(path(this), RouterFunctionDsl().apply(r).router())
}
operator fun RequestPredicate.invoke(f: (ServerRequest) -> Mono<ServerResponse>) {