Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix generics for customizeMonoReply()

Browse Source 
Related to: https://stackoverflow.com/questions/68637283/how-to-customize-response-in-spring-integration-using-webflux-when-a-specific-er

The function provided for the `ConsumerEndpointSpec.customizeMonoReply()` may convert
incoming value to something else.
With wildcards it cannot be compiled without casting.

* Add `<T, V>` generic arg for the `customizeMonoReply()` to conform in and out types carrying.
* Modify `WebFluxDslTests` to demonstrate the problem and confirm the fix

**Cherry-pick to `5.4.x` & `5.3.x`**
This commit is contained in:
Artem Bilan
2021-08-09 09:49:51 -04:00
committed by Gary Russell
parent 1a73151114
commit f28819bbae
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java
View File

@@ -201,12 +201,16 @@ public abstract class ConsumerEndpointSpec<S extends ConsumerEndpointSpec<S, H>,
/**
* Specify a {@link BiFunction} for customizing {@link Mono} replies via {@link ReactiveRequestHandlerAdvice}.
* @param replyCustomizer the {@link BiFunction} to propagate into {@link ReactiveRequestHandlerAdvice}.
* @param <T> inbound reply payload.
* @param <V> outbound reply payload.
* @return the spec.
* @since 5.3
* @see ReactiveRequestHandlerAdvice
*/
public S customizeMonoReply(BiFunction<Message<?>, Mono<?>, Publisher<?>> replyCustomizer) {
return advice(new ReactiveRequestHandlerAdvice(replyCustomizer));
@SuppressWarnings({ "unchecked", "rawtypes"})
public <T, V> S customizeMonoReply(BiFunction<Message<?>, Mono<T>, Publisher<V>> replyCustomizer) {
return advice(new ReactiveRequestHandlerAdvice(
(BiFunction<Message<?>, Mono<?>, Publisher<?>>) (BiFunction) replyCustomizer));
}
/**

9
spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java
View File

@@ -91,6 +91,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.reactive.config.EnableWebFlux;
import org.springframework.web.reactive.config.WebFluxConfigurer;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import org.springframework.web.util.UriComponentsBuilder;
import reactor.core.publisher.Flux;
@@ -418,8 +419,12 @@ public class WebFluxDslTests {
.id("webFluxWithReplyPayloadToFlux")
.customizeMonoReply(
(message, mono) ->
mono.timeout(Duration.ofMillis(100))
.retry()));
mono.
timeout(Duration.ofMillis(100))
.retry()
.onErrorResume(
WebClientResponseException.NotFound.class,
ex -> Mono.just("Not Found"))));
}
@Bean