loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-20 20:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Spring Framework 7 compatibility in jvm-spring-restclient and jvm-spring-webclient (#22467)

Browse Source 
* Fix Spring Framework 7 compatibility issues

Fixes #22368

* update samples

---------

Co-authored-by: jwalter <joakim.waltersson@gmail.com>
This commit is contained in:
William Cheng
2025-12-01 12:24:37 +08:00
committed by GitHub
parent 7b83462a83
commit 788f67dd01
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ import org.springframework.util.LinkedMultiValueMap
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: RestClient) { {{^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> request(requestConfig: RequestConfig<I>): ResponseEntity<T> {
return prepare(defaults(requestConfig)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

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

@@ -12,7 +12,7 @@ import reactor.core.publisher.Mono
{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: WebClient) { {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: WebClient) {
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> { protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
return prepare(defaults(requestConfig)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

2
samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -10,7 +10,7 @@ import org.springframework.util.LinkedMultiValueMap
open class ApiClient(protected val client: RestClient) { 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)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

2
samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -12,7 +12,7 @@ import reactor.core.publisher.Mono
open class ApiClient(protected val client: WebClient) { open class ApiClient(protected val client: WebClient) {
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> { protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
return prepare(defaults(requestConfig)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

2
samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -12,7 +12,7 @@ import reactor.core.publisher.Mono
open class ApiClient(protected val client: WebClient) { open class ApiClient(protected val client: WebClient) {
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> { protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
return prepare(defaults(requestConfig)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

2
samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -10,7 +10,7 @@ import org.springframework.util.LinkedMultiValueMap
open class ApiClient(protected val client: RestClient) { 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)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})

2
samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -12,7 +12,7 @@ import reactor.core.publisher.Mono
open class ApiClient(protected val client: WebClient) { open class ApiClient(protected val client: WebClient) {
protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> { protected inline fun <reified I : Any, reified T: Any> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
return prepare(defaults(requestConfig)) return prepare(defaults(requestConfig))
.retrieve() .retrieve()
.toEntity(object : ParameterizedTypeReference<T>() {}) .toEntity(object : ParameterizedTypeReference<T>() {})