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

Remove infix qualifier from ResultActionsDsl methods

Browse Source 
The infix form limits the extensibility of the API and
prevents calling `andReturn()`.

See gh-1951
This commit is contained in:
Sebastien Deleuze
2019-03-04 19:15:12 +01:00
parent 0c332286f1
commit 9e873af6ab
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/kotlin/org/springframework/test/web/servlet/ResultActionsDsl.kt
View File

@@ -12,7 +12,7 @@ class ResultActionsDsl(private val actions: ResultActions) {
* Provide access to [MockMvcResultMatchersDsl] Kotlin DSL.
* @see MockMvcResultMatchersDsl.match
*/
infix fun andExpect(dsl: MockMvcResultMatchersDsl.() -> Unit): ResultActionsDsl {
fun andExpect(dsl: MockMvcResultMatchersDsl.() -> Unit): ResultActionsDsl {
MockMvcResultMatchersDsl(actions).dsl()
return this
}
@@ -21,7 +21,7 @@ class ResultActionsDsl(private val actions: ResultActions) {
* Provide access to [MockMvcResultHandlersDsl] Kotlin DSL.
* @see MockMvcResultHandlersDsl.handle
*/
infix fun andDo(dsl: MockMvcResultHandlersDsl.() -> Unit): ResultActionsDsl {
fun andDo(dsl: MockMvcResultHandlersDsl.() -> Unit): ResultActionsDsl {
MockMvcResultHandlersDsl(actions).dsl()
return this
}