Skip to content

[Kotlin][jvm-spring-restclient] make nullableReturnType type bound conditional in ApiClient #23657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Apr 30, 2026
Merged

[Kotlin][jvm-spring-restclient] make nullableReturnType type bound conditional in ApiClient #23657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import org.springframework.util.LinkedMultiValueMap

{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: RestClient) {

protected inline fun <reified I : Any?, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
protected inline fun <reified I : Any, reified T: Any{{#nullableReturnType}}?{{/nullableReturnType}}> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
return prepare(defaults(requestConfig))
.retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {})
}

protected fun <I : Any?> prepare(requestConfig: RequestConfig<I>) =
protected fun <I : Any> prepare(requestConfig: RequestConfig<I>) =
client.method(requestConfig)
.uri(requestConfig)
.headers(requestConfig)
Expand Down Expand Up @@ -45,7 +45,7 @@ import org.springframework.util.LinkedMultiValueMap
private fun <I> RestClient.RequestBodySpec.headers(requestConfig: RequestConfig<I>) =
apply { requestConfig.headers.forEach { (name, value) -> header(name, value) } }

private fun <I : Any?> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
private fun <I : Any> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
when {
requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
val parts = LinkedMultiValueMap<String, Any>()
Expand All @@ -59,7 +59,7 @@ import org.springframework.util.LinkedMultiValueMap
}

else -> {
return apply { if (requestConfig.body != null) body(requestConfig.body as Any) }
return apply { if (requestConfig.body != null) body(requestConfig.body) }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...m-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import org.springframework.util.LinkedMultiValueMap

open class ApiClient(protected val client: RestClient) {

protected inline fun <reified I : Any?, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
return prepare(defaults(requestConfig))
.retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {})
}

protected fun <I : Any?> prepare(requestConfig: RequestConfig<I>) =
protected fun <I : Any> prepare(requestConfig: RequestConfig<I>) =
client.method(requestConfig)
.uri(requestConfig)
.headers(requestConfig)
Expand Down Expand Up @@ -45,7 +45,7 @@ open class ApiClient(protected val client: RestClient) {
private fun <I> RestClient.RequestBodySpec.headers(requestConfig: RequestConfig<I>) =
apply { requestConfig.headers.forEach { (name, value) -> header(name, value) } }

private fun <I : Any?> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
private fun <I : Any> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
when {
requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
val parts = LinkedMultiValueMap<String, Any>()
Expand All @@ -59,7 +59,7 @@ open class ApiClient(protected val client: RestClient) {
}

else -> {
return apply { if (requestConfig.body != null) body(requestConfig.body as Any) }
return apply { if (requestConfig.body != null) body(requestConfig.body) }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...lient-nullable-return/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import org.springframework.util.LinkedMultiValueMap

open class ApiClient(protected val client: RestClient) {

protected inline fun <reified I : Any?, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
return prepare(defaults(requestConfig))
.retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {})
}

protected fun <I : Any?> prepare(requestConfig: RequestConfig<I>) =
protected fun <I : Any> prepare(requestConfig: RequestConfig<I>) =
client.method(requestConfig)
.uri(requestConfig)
.headers(requestConfig)
Expand Down Expand Up @@ -45,7 +45,7 @@ open class ApiClient(protected val client: RestClient) {
private fun <I> RestClient.RequestBodySpec.headers(requestConfig: RequestConfig<I>) =
apply { requestConfig.headers.forEach { (name, value) -> header(name, value) } }

private fun <I : Any?> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
private fun <I : Any> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
when {
requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
val parts = LinkedMultiValueMap<String, Any>()
Expand All @@ -59,7 +59,7 @@ open class ApiClient(protected val client: RestClient) {
}

else -> {
return apply { if (requestConfig.body != null) body(requestConfig.body as Any) }
return apply { if (requestConfig.body != null) body(requestConfig.body) }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...m-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import org.springframework.util.LinkedMultiValueMap

open class ApiClient(protected val client: RestClient) {

protected inline fun <reified I : Any?, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
return prepare(defaults(requestConfig))
.retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {})
}

protected fun <I : Any?> prepare(requestConfig: RequestConfig<I>) =
protected fun <I : Any> prepare(requestConfig: RequestConfig<I>) =
client.method(requestConfig)
.uri(requestConfig)
.headers(requestConfig)
Expand Down Expand Up @@ -45,7 +45,7 @@ open class ApiClient(protected val client: RestClient) {
private fun <I> RestClient.RequestBodySpec.headers(requestConfig: RequestConfig<I>) =
apply { requestConfig.headers.forEach { (name, value) -> header(name, value) } }

private fun <I : Any?> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
private fun <I : Any> RestClient.RequestBodySpec.nullableBody(requestConfig: RequestConfig<I>): RestClient.RequestBodySpec {
when {
requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
val parts = LinkedMultiValueMap<String, Any>()
Expand All @@ -59,7 +59,7 @@ open class ApiClient(protected val client: RestClient) {
}

else -> {
return apply { if (requestConfig.body != null) body(requestConfig.body as Any) }
return apply { if (requestConfig.body != null) body(requestConfig.body) }
}
}
}
Expand Down
Loading