enrichHeaders with advice

[byrner75]

Bug report

I've been using Spring Integration 4 with Spring Boot 1.5.10 and had the following in a flow

return IntegrationFlows.from(outgoingPayment)
                .enrichHeaders( t ->
                    t.headerFunction(HDR_PEER_ADDRESS,
                        (Function<Message<Maxb.PaymentRequest>, Object>) message ->
                                directoryService.resolvePeerForIBAN(
                                        message.getPayload().getRecipient().getIBAN(),
                                        DirectoryService.Service.PAYMENT).getUri()),
                        e -> e.advice(retryAdvice(outgoingPaymentDeferred))

I just upgraded to Spring Boot 2.0.0 and Spring Integration 5.0.3 and reading the migration notes regarding enrichHeaders I've changed the definition of the flow above to the following

return IntegrationFlows.from(outgoingPayment)
                .enrichHeaders( t -> t
                    .advice(retryAdvice(outgoingPaymentDeferred))
                    .headerFunction(HDR_PEER_ADDRESS,
                        (Function<Message<Maxb.PaymentRequest>, Object>) message ->
                                directoryService.resolvePeerForIBAN(
                                        message.getPayload().getRecipient().getIBAN(),
                                        DirectoryService.Service.PAYMENT).getUri()))

My retryAdvice function looks like

    protected Advice retryAdvice(MessageChannel errorChannel) {
        RequestHandlerRetryAdvice advice = new RequestHandlerRetryAdvice();

        RetryTemplate retryTemplate = new RetryTemplate();
        SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
        retryPolicy.setMaxAttempts(nodeProperties.getRetry().getAttempts());
        retryTemplate.setRetryPolicy(retryPolicy);

        ExponentialBackOffPolicy exponentialBackOffPolicy = new ExponentialBackOffPolicy();
        exponentialBackOffPolicy.setInitialInterval(nodeProperties.getRetry().getInitialInterval());
        exponentialBackOffPolicy.setMultiplier(nodeProperties.getRetry().getBackoffMultiplier());
        exponentialBackOffPolicy.setMaxInterval(nodeProperties.getRetry().getMaxInterval());
        retryTemplate.setBackOffPolicy(exponentialBackOffPolicy);

        advice.setRetryTemplate(retryTemplate);
        advice.setRecoveryCallback(new ErrorMessageSendingRecoverer(errorChannel));

        return advice;
    }

What I'm noticing in SI 5.0.3 is that the message handler is not executing inside the scope of my advice where it did in SI 4. Are my two flow definitions semantically equivalent? or am I missing something?

[artembilan]

Confirmed. It is a bug.

As a workaround I suggest to use a HeaderEnricher @Bean with the @Transformer instead.

Meanwhile we are fixing the problem...

Good catch! Thank you!

[byrner75]

I used the following workaround (sticking with DSL), which I was able to put in place of the enrichHeaders in my IntegrationFlows.

                .<Maxb.PaymentRequest>handle((p, h) -> {
                    URI uri = directoryService.resolvePeerForIBAN(
                            p.getRecipient().getIBAN(),
                            DirectoryService.Service.PAYMENT).getUri();
                    return MessageBuilder
                                .withPayload(p)
                                .setHeader(HDR_PEER_ADDRESS, uri)
                                .copyHeadersIfAbsent(h)
                                .build();