Browse Source

Fix Kotlin return types to match @Nullable annotations

pull/1468/head
Sebastien Deleuze 9 years ago
parent
commit
7a171c6ae9
  1. 2
      spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt
  2. 12
      spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt

2
spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt

@ -91,7 +91,7 @@ inline fun <reified T : Any> JdbcOperations.queryForList(sql: String, args: Arra @@ -91,7 +91,7 @@ inline fun <reified T : Any> JdbcOperations.queryForList(sql: String, args: Arra
* @author Mario Arias
* @since 5.0
*/
inline fun <reified T : Any> JdbcOperations.query(sql: String, vararg args: Any, crossinline function: (ResultSet) -> T): T =
inline fun <reified T : Any> JdbcOperations.query(sql: String, vararg args: Any, crossinline function: (ResultSet) -> T): T? =
query(sql, ResultSetExtractor { function(it) }, *args)
/**

12
spring-web/src/main/kotlin/org/springframework/web/client/RestOperationsExtensions.kt

@ -31,7 +31,7 @@ import java.net.URI @@ -31,7 +31,7 @@ import java.net.URI
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.getForObject(url: String, vararg uriVariables: Any): T =
inline fun <reified T: Any> RestOperations.getForObject(url: String, vararg uriVariables: Any): T? =
getForObject(url, T::class.java, *uriVariables)
/**
@ -42,7 +42,7 @@ inline fun <reified T: Any> RestOperations.getForObject(url: String, vararg uriV @@ -42,7 +42,7 @@ inline fun <reified T: Any> RestOperations.getForObject(url: String, vararg uriV
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.getForObject(url: String, uriVariables: Map<String, Any?>): T =
inline fun <reified T: Any> RestOperations.getForObject(url: String, uriVariables: Map<String, Any?>): T? =
getForObject(url, T::class.java, uriVariables)
/**
@ -53,7 +53,7 @@ inline fun <reified T: Any> RestOperations.getForObject(url: String, uriVariable @@ -53,7 +53,7 @@ inline fun <reified T: Any> RestOperations.getForObject(url: String, uriVariable
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.getForObject(url: URI): T =
inline fun <reified T: Any> RestOperations.getForObject(url: URI): T? =
getForObject(url, T::class.java)
/**
@ -75,7 +75,7 @@ inline fun <reified T: Any> RestOperations.getForEntity(url: String, vararg uriV @@ -75,7 +75,7 @@ inline fun <reified T: Any> RestOperations.getForEntity(url: String, vararg uriV
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.postForObject(url: String, request: Any, vararg uriVariables: Any): T =
inline fun <reified T: Any> RestOperations.postForObject(url: String, request: Any, vararg uriVariables: Any): T? =
postForObject(url, request, T::class.java, *uriVariables)
/**
@ -86,7 +86,7 @@ inline fun <reified T: Any> RestOperations.postForObject(url: String, request: A @@ -86,7 +86,7 @@ inline fun <reified T: Any> RestOperations.postForObject(url: String, request: A
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.postForObject(url: String, request: Any, uriVariables: Map<String, *>): T =
inline fun <reified T: Any> RestOperations.postForObject(url: String, request: Any, uriVariables: Map<String, *>): T? =
postForObject(url, request, T::class.java, uriVariables)
/**
@ -97,7 +97,7 @@ inline fun <reified T: Any> RestOperations.postForObject(url: String, request: A @@ -97,7 +97,7 @@ inline fun <reified T: Any> RestOperations.postForObject(url: String, request: A
* @since 5.0
*/
@Throws(RestClientException::class)
inline fun <reified T: Any> RestOperations.postForObject(url: URI, request: Any): T =
inline fun <reified T: Any> RestOperations.postForObject(url: URI, request: Any): T? =
postForObject(url, request, T::class.java)
/**

Loading…
Cancel
Save