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

Polishing

This commit is contained in:
Sebastien Deleuze 2019-04-04 12:06:24 +02:00
parent 9217f0b63e
commit 40e4c8068d
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/kotlin/org/springframework/web/servlet/function/ServerRequestExtensions.kt
View File

@ -39,7 +39,6 @@ fun ServerRequest.remoteAddressOrNull(): InetSocketAddress? = remoteAddress().or
*/ */
inline fun <reified T : Any> ServerRequest.body(): T = body(object : ParameterizedTypeReference<T>() {}) inline fun <reified T : Any> ServerRequest.body(): T = body(object : ParameterizedTypeReference<T>() {})
/** /**
* Nullable variant of [ServerRequest.attribute] * Nullable variant of [ServerRequest.attribute]
* *
@ -79,6 +78,3 @@ fun ServerRequest.Headers.contentLengthOrNull(): Long? = contentLength().let { i
* @since 5.2 * @since 5.2
*/ */
fun ServerRequest.Headers.contentTypeOrNull(): MediaType? = contentType().orElse(null) fun ServerRequest.Headers.contentTypeOrNull(): MediaType? = contentType().orElse(null)

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

@ -133,7 +133,6 @@ class ServerRequestExtensionsTests {
@Test @Test
fun `contentTypeOrNull with null`() { fun `contentTypeOrNull with null`() {
val contentType = mockk<MediaType>()
every { headers.contentType() } returns Optional.empty() every { headers.contentType() } returns Optional.empty()
assertNull(headers.contentTypeOrNull()) assertNull(headers.contentTypeOrNull())
verify { headers.contentType() } verify { headers.contentType() }