Skip to content

Commit 7f2ddc7

Browse files
committed
Fix Spring Framework 7 compatibility issues
Fixes #22368
1 parent 7ce0096 commit 7f2ddc7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.springframework.util.LinkedMultiValueMap
1010

1111
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: RestClient) {
1212
13-
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
13+
protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
1414
return prepare(defaults(requestConfig))
1515
.retrieve()
1616
.toEntity(object : ParameterizedTypeReference<T>() {})

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-webclient/infrastructure/ApiClient.kt.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import org.springframework.http.HttpHeaders
55
import org.springframework.http.HttpMethod
66
import org.springframework.http.MediaType
77
import org.springframework.web.reactive.function.client.WebClient
8-
import org.springframework.http.ResponseEntity
8+
import org.springframework.http.ResponseEntitypom
99
import org.springframework.http.client.MultipartBodyBuilder
1010
import org.springframework.util.LinkedMultiValueMap
1111
import reactor.core.publisher.Mono
1212

1313
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: WebClient) {
1414
15-
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
15+
protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
1616
return prepare(defaults(requestConfig))
1717
.retrieve()
1818
.toEntity(object : ParameterizedTypeReference<T>() {})

0 commit comments

Comments
 (0)