From 305f303d46eb0c6da03e7dd2a14317797bb07706 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Thu, 16 Feb 2017 17:19:11 +0100 Subject: [PATCH] Rename RouterDsl to Routes --- .../function/server/RouterFunctionExtensions.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt index dd7ddfb9a9..116f10b85b 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt @@ -55,12 +55,12 @@ import reactor.core.publisher.Mono * @author Sebastien Deleuze * @author Yevhenii Melnyk */ -fun RouterFunction<*>.route(request: ServerRequest, configure: RouterDsl.() -> Unit) = - RouterDsl().apply(configure).invoke(request) +fun RouterFunction<*>.route(request: ServerRequest, configure: Routes.() -> Unit) = + Routes().apply(configure).invoke(request) -class RouterDsl { +class Routes { - val children = mutableListOf() + val children = mutableListOf() val routes = mutableListOf>() infix fun RequestPredicate.and(other: RequestPredicate): RequestPredicate = this.and(other) @@ -69,8 +69,8 @@ class RouterDsl { operator fun RequestPredicate.not(): RequestPredicate = this.negate() - fun RequestPredicate.route(routes: RouterDsl.() -> Unit) = - RouterFunctions.nest(this, RouterDsl().apply(routes).router()) + fun RequestPredicate.route(routes: Routes.() -> Unit) = + RouterFunctions.nest(this, Routes().apply(routes).router()) operator fun RequestPredicate.invoke(f: (ServerRequest) -> Mono) { routes += RouterFunctions.route(this, HandlerFunction { f(it) })