Skip to content

Preserve generic type info in awaitEntity() #36834

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

Open
wushiyuanmaimob wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −3
Open

Preserve generic type info in awaitEntity() #36834

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
2 changes: 1 addition & 1 deletion ...x/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ inline fun <reified T : Any> WebClient.ResponseSpec.toEntityFlux(): Mono<Respons
suspend inline fun <reified T : Any> WebClient.ResponseSpec.awaitEntity(): ResponseEntity<T> {
val context = currentCoroutineContext().minusKey(Job.Key)
return withContext(context.toReactorContext()) {
toEntity(T::class.java).awaitSingle()
toEntity<T>().awaitSingle()
}
}

Expand Down
12 changes: 10 additions & 2 deletions .../test/kotlin/org/springframework/web/reactive/function/client/WebClientExtensionsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,14 @@ class WebClientExtensionsTests {
verify { responseSpec.toEntityFlux(object : ParameterizedTypeReference<List<Foo>>() {}) }
}

@Test
suspend fun `awaitEntity preserves generic type information`() {
val spec = mockk<WebClient.ResponseSpec>()
val entity = mockk<ResponseEntity<List<Foo>>>()
every { spec.toEntity(any<ParameterizedTypeReference<List<Foo>>>()) } returns Mono.just(entity)
assertThat(spec.awaitEntity<List<Foo>>()).isEqualTo(entity)
}

@Test
fun `ResponseSpec#awaitEntity with coroutine context propagation`() {
val exchangeFunction = mockk<ExchangeFunction>()
Expand All @@ -230,7 +238,7 @@ class WebClientExtensionsTests {
every { mockResponse.statusCode() } returns HttpStatus.OK
every { mockResponse.headers() } returns mockClientHeaders
every { mockClientHeaders.asHttpHeaders() } returns HttpHeaders()
every { mockResponse.bodyToMono(Foo::class.java) } returns Mono.just(foo)
every { mockResponse.bodyToMono(any<ParameterizedTypeReference<Foo>>()) } returns Mono.just(foo)
runBlocking(FooContextElement(foo)) {
val responseEntity = WebClient.builder()
.exchangeFunction(exchangeFunction)
Expand Down Expand Up @@ -258,7 +266,7 @@ class WebClientExtensionsTests {
every { mockResponse.statusCode() } returns HttpStatus.OK
every { mockResponse.headers() } returns mockClientHeaders
every { mockClientHeaders.asHttpHeaders() } returns HttpHeaders()
every { mockResponse.bodyToMono(Foo::class.java) } returns Mono.just(foo)
every { mockResponse.bodyToMono(any<ParameterizedTypeReference<Foo>>()) } returns Mono.just(foo)
runBlocking {
val responseEntity = WebClient.builder()
.exchangeFunction(exchangeFunction)
Expand Down