From 7a171c6ae9e3f99562a7d14a993a7ca695338885 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 4 Jul 2017 11:27:45 +0200 Subject: [PATCH] Fix Kotlin return types to match @Nullable annotations --- .../jdbc/core/JdbcOperationsExtensions.kt | 2 +- .../web/client/RestOperationsExtensions.kt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt index 34b4c248e1..ca9367ed7e 100644 --- a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt +++ b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt @@ -91,7 +91,7 @@ inline fun JdbcOperations.queryForList(sql: String, args: Arra * @author Mario Arias * @since 5.0 */ -inline fun JdbcOperations.query(sql: String, vararg args: Any, crossinline function: (ResultSet) -> T): T = +inline fun JdbcOperations.query(sql: String, vararg args: Any, crossinline function: (ResultSet) -> T): T? = query(sql, ResultSetExtractor { function(it) }, *args) /** diff --git a/spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt b/spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt index a0aa696165..8bee027689 100644 --- a/spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt +++ b/spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt @@ -31,7 +31,7 @@ import java.net.URI * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.getForObject(url: String, vararg uriVariables: Any): T = +inline fun RestOperations.getForObject(url: String, vararg uriVariables: Any): T? = getForObject(url, T::class.java, *uriVariables) /** @@ -42,7 +42,7 @@ inline fun RestOperations.getForObject(url: String, vararg uriV * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.getForObject(url: String, uriVariables: Map): T = +inline fun RestOperations.getForObject(url: String, uriVariables: Map): T? = getForObject(url, T::class.java, uriVariables) /** @@ -53,7 +53,7 @@ inline fun RestOperations.getForObject(url: String, uriVariable * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.getForObject(url: URI): T = +inline fun RestOperations.getForObject(url: URI): T? = getForObject(url, T::class.java) /** @@ -75,7 +75,7 @@ inline fun RestOperations.getForEntity(url: String, vararg uriV * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.postForObject(url: String, request: Any, vararg uriVariables: Any): T = +inline fun RestOperations.postForObject(url: String, request: Any, vararg uriVariables: Any): T? = postForObject(url, request, T::class.java, *uriVariables) /** @@ -86,7 +86,7 @@ inline fun RestOperations.postForObject(url: String, request: A * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.postForObject(url: String, request: Any, uriVariables: Map): T = +inline fun RestOperations.postForObject(url: String, request: Any, uriVariables: Map): T? = postForObject(url, request, T::class.java, uriVariables) /** @@ -97,7 +97,7 @@ inline fun RestOperations.postForObject(url: String, request: A * @since 5.0 */ @Throws(RestClientException::class) -inline fun RestOperations.postForObject(url: URI, request: Any): T = +inline fun RestOperations.postForObject(url: URI, request: Any): T? = postForObject(url, request, T::class.java) /**