Browse Source

Polishing

pull/22737/head
Sebastien Deleuze 7 years ago
parent
commit
40e4c8068d
  1. 4
      spring-webmvc/src/main/kotlin/org/springframework/web/servlet/function/ServerRequestExtensions.kt
  2. 1
      spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/ServerRequestExtensionsTests.kt

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

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

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

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

Loading…
Cancel
Save