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

Improve parity between Java and Kotlin router DSL

Browse Source 
This commit adds variants with pattern + predicate to
Kotlin router DSLs, and vararg where necessary.

Closes gh-23524
This commit is contained in:
Sebastien Deleuze
2019-09-16 21:47:24 +02:00
parent 848804a227
commit 5a0216d657
7 changed files with 379 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/RouterFunctionDslTests.kt
View File

@@ -55,6 +55,15 @@ class RouterFunctionDslTests {
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun acceptAndPOSTWithRequestPredicate() {
val servletRequest = MockHttpServletRequest("POST", "/api/bar/")
servletRequest.addHeader(ACCEPT, APPLICATION_JSON_VALUE)
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_JSON_VALUE)
val request = DefaultServerRequest(servletRequest, emptyList())
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun contentType() {
val servletRequest = MockHttpServletRequest("GET", "/content")
@@ -120,6 +129,7 @@ class RouterFunctionDslTests {
(GET("/foo/") or GET("/foos/")) { req -> handle(req) }
"/api".nest {
POST("/foo/", ::handleFromClass)
POST("/bar/", contentType(APPLICATION_JSON), ::handleFromClass)
PUT("/foo/", :: handleFromClass)
PATCH("/foo/") {
ok().build()
@@ -148,10 +158,10 @@ class RouterFunctionDslTests {
path("/baz", ::handle)
GET("/rendering") { RenderingResponse.create("index").build() }
}
@Suppress("UNUSED_PARAMETER")
private fun handleFromClass(req: ServerRequest) = ServerResponse.ok().build()
}
@Suppress("UNUSED_PARAMETER")
private fun handleFromClass(req: ServerRequest) = ServerResponse.ok().build()
@Suppress("UNUSED_PARAMETER")
private fun handle(req: ServerRequest) = ServerResponse.ok().build()