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

[BUG][Kotlin][WebClient] ApiClient is not compatible with spring-web 6 Observation API (#21020)

Browse Source
This commit is contained in:
NavruzshoevDaniel 2025-04-16 10:25:22 +03:00 committed by GitHub
parent a94b8f90ca
commit 7a57b80955
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
{{^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>> {
@ -39,6 +41,7 @@ import reactor.core.publisher.Mono
private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) = private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder -> uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder builder
.path(requestConfig.path) .path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query)) .queryParams(LinkedMultiValueMap(requestConfig.query))

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

@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
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>> {
@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) = private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder -> uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder builder
.path(requestConfig.path) .path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query)) .queryParams(LinkedMultiValueMap(requestConfig.query))

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

@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
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>> {
@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) = private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder -> uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder builder
.path(requestConfig.path) .path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query)) .queryParams(LinkedMultiValueMap(requestConfig.query))

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

@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
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>> {
@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) = private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder -> uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder builder
.path(requestConfig.path) .path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query)) .queryParams(LinkedMultiValueMap(requestConfig.query))