Skip to content
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.

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

Still emit response if return type is Void #8367

Merged
merged 2 commits into from Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -1490,10 +1490,6 @@ private <I, O, E> void sendRequestThroughChannel(
new FullHttpResponseHandler<>(responsePromise, poolHandle, secure, finalRequest, bodyType, errorType));
poolHandle.notifyRequestPipelineBuilt();
Publisher<HttpResponse<O>> publisher = new NettyFuturePublisher<>(responsePromise, true);
if (bodyType != null && bodyType.isVoid()) {
// don't emit response if bodyType is void
publisher = Flux.from(publisher).filter(r -> false);
}
publisher.subscribe(new ForwardingSubscriber<>(emitter));

requestWriter.write(channel, secure, emitter);
Expand Down
Expand Up @@ -17,6 +17,7 @@ package io.micronaut.http.client.aop

import io.micronaut.context.ApplicationContext
import io.micronaut.context.annotation.Requires
import io.micronaut.core.async.annotation.SingleResult
import io.micronaut.http.HttpResponse
import io.micronaut.http.HttpVersion
import io.micronaut.http.MediaType
Expand All @@ -32,8 +33,9 @@ import io.micronaut.http.filter.ClientFilterChain
import io.micronaut.http.filter.HttpClientFilter
import io.micronaut.runtime.server.EmbeddedServer
import org.reactivestreams.Publisher
import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Specification

/**
Expand Down Expand Up @@ -267,4 +269,46 @@ class ClientFilterSpec extends Specification{
throw new RuntimeException("from filter")
}
}

void "filter always observes a response"() {
given:
ObservesResponseClient client = context.getBean(ObservesResponseClient)
ObservesResponseFilter filter = context.getBean(ObservesResponseFilter)

when:
Mono.from(client.monoVoid()).block() == null
then:
filter.observedResponse != null
}

@Requires(property = 'spec.name', value = "ClientFilterSpec")
@Client('/observes-response')
static interface ObservesResponseClient {

@Get
@SingleResult
Publisher<Void> monoVoid()
}

@Requires(property = 'spec.name', value = "ClientFilterSpec")
@Filter("/observes-response/**")
static class ObservesResponseFilter implements HttpClientFilter {
HttpResponse<?> observedResponse

@Override
Publisher<? extends HttpResponse<?>> doFilter(MutableHttpRequest<?> request, ClientFilterChain chain) {
return Flux.from(chain.proceed(request)).doOnNext(r -> {
observedResponse = r
})
}
}

@Requires(property = 'spec.name', value = "ClientFilterSpec")
@Controller('/observes-response')
static class ObservesResponseController {
@Get
String index() {
return ""
}
}
}