Skip to content

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

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
merged 1 commit into from
Apr 16, 2025
Merged

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

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
3 changes: 3 additions & 0 deletions ...sources/kotlin-client/libraries/jvm-spring-webclient/infrastructure/ApiClient.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap
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) {

protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
Expand Down Expand Up @@ -39,6 +41,7 @@ import reactor.core.publisher.Mono

private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder
.path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query))
Expand Down
3 changes: 3 additions & 0 deletions ...vm-spring-3-webclient/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,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono

private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";

open class ApiClient(protected val client: WebClient) {

protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
Expand Down Expand Up @@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {

private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder
.path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query))
Expand Down
3 changes: 3 additions & 0 deletions ...vm-spring-2-webclient/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,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono

private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";

open class ApiClient(protected val client: WebClient) {

protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
Expand Down Expand Up @@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {

private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder
.path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query))
Expand Down
3 changes: 3 additions & 0 deletions ...vm-spring-3-webclient/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,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
import org.springframework.util.LinkedMultiValueMap
import reactor.core.publisher.Mono

private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";

open class ApiClient(protected val client: WebClient) {

protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
Expand Down Expand Up @@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {

private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
uri { builder ->
attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
builder
.path(requestConfig.path)
.queryParams(LinkedMultiValueMap(requestConfig.query))
Expand Down
Loading