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

Replace RouterFunction.route() by a router() Kotlin helper

This commit is contained in:
Sebastien Deleuze 2017-03-15 17:08:15 +01:00
parent 1a49de3204
commit abc0c6e3e8
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,8 +57,10 @@ import reactor.core.publisher.Mono
typealias Routes = RouterDsl.() -> Unit typealias Routes = RouterDsl.() -> Unit
fun RouterFunction<*>.route(request: ServerRequest, configure: Routes) = /**
RouterDsl().apply(configure).invoke(request) * Allow to create easily a [RouterFunction] from [Routes]
*/
fun router(routes: Routes) = RouterDsl().apply(routes).router()
class RouterDsl { class RouterDsl {

74
spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensionsTests.kt
View File

@ -32,7 +32,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun header() { fun header() {
val request = builder().header("bar", "bar").build() val request = builder().header("bar", "bar").build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -40,7 +40,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun accept() { fun accept() {
val request = builder().header(ACCEPT, APPLICATION_ATOM_XML_VALUE).build() val request = builder().header(ACCEPT, APPLICATION_ATOM_XML_VALUE).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -48,7 +48,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun acceptAndPOST() { fun acceptAndPOST() {
val request = builder().method(POST).uri(URI("/api/foo/")).header(ACCEPT, APPLICATION_JSON_VALUE).build() val request = builder().method(POST).uri(URI("/api/foo/")).header(ACCEPT, APPLICATION_JSON_VALUE).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -56,7 +56,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun contentType() { fun contentType() {
val request = builder().header(CONTENT_TYPE, APPLICATION_OCTET_STREAM_VALUE).build() val request = builder().header(CONTENT_TYPE, APPLICATION_OCTET_STREAM_VALUE).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -64,7 +64,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun resourceByPath() { fun resourceByPath() {
val request = builder().uri(URI("/org/springframework/web/reactive/function/response.txt")).build() val request = builder().uri(URI("/org/springframework/web/reactive/function/response.txt")).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -72,7 +72,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun method() { fun method() {
val request = builder().method(PATCH).build() val request = builder().method(PATCH).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -80,7 +80,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun path() { fun path() {
val request = builder().uri(URI("/baz")).build() val request = builder().uri(URI("/baz")).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -88,7 +88,7 @@ class RouterFunctionExtensionsTests {
@Test @Test
fun resource() { fun resource() {
val request = builder().uri(URI("/response.txt")).build() val request = builder().uri(URI("/response.txt")).build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.expectNextCount(1) .expectNextCount(1)
.verifyComplete() .verifyComplete()
} }
@ -100,43 +100,41 @@ class RouterFunctionExtensionsTests {
.header(ACCEPT, APPLICATION_PDF_VALUE) .header(ACCEPT, APPLICATION_PDF_VALUE)
.header(CONTENT_TYPE, APPLICATION_PDF_VALUE) .header(CONTENT_TYPE, APPLICATION_PDF_VALUE)
.build() .build()
StepVerifier.create(FooController().route(request)) StepVerifier.create(sampleRouter().route(request))
.verifyComplete() .verifyComplete()
} }
class FooController : RouterFunction<ServerResponse> {
override fun route(req: ServerRequest) = route(req) { fun sampleRouter() = router {
(GET("/foo/") or GET("/foos/")) { handle(req) } (GET("/foo/") or GET("/foos/")) { req -> handle(req) }
"/api".route { "/api".route {
POST("/foo/") { handleFromClass(req) } POST("/foo/", ::handleFromClass)
PUT("/foo/") { handleFromClass(req) } PUT("/foo/", :: handleFromClass)
"/foo/" { handleFromClass(req) } "/foo/" { handleFromClass(it) }
}
accept(APPLICATION_ATOM_XML, ::handle)
contentType(APPLICATION_OCTET_STREAM) { handle(req) }
method(PATCH) { handle(req) }
headers({ it.accept().contains(APPLICATION_JSON) }).route {
GET("/api/foo/", ::handle)
}
headers({ it.header("bar").isNotEmpty() }, ::handle)
resources("/org/springframework/web/reactive/function/**",
ClassPathResource("/org/springframework/web/reactive/function/response.txt"))
resources {
if (it.path() == "/response.txt") {
Mono.just(ClassPathResource("/org/springframework/web/reactive/function/response.txt"))
}
else {
Mono.empty()
}
}
path("/baz") { handle(req) }
} }
accept(APPLICATION_ATOM_XML, ::handle)
@Suppress("UNUSED_PARAMETER") contentType(APPLICATION_OCTET_STREAM, ::handle)
fun handleFromClass(req: ServerRequest) = ok().build() method(PATCH, ::handle)
headers({ it.accept().contains(APPLICATION_JSON) }).route {
GET("/api/foo/", ::handle)
}
headers({ it.header("bar").isNotEmpty() }, ::handle)
resources("/org/springframework/web/reactive/function/**",
ClassPathResource("/org/springframework/web/reactive/function/response.txt"))
resources {
if (it.path() == "/response.txt") {
Mono.just(ClassPathResource("/org/springframework/web/reactive/function/response.txt"))
}
else {
Mono.empty()
}
}
path("/baz", ::handle)
} }
} }
@Suppress("UNUSED_PARAMETER")
fun handleFromClass(req: ServerRequest) = ok().build()
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
fun handle(req: ServerRequest) = ok().build() fun handle(req: ServerRequest) = ok().build()