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

INT-4545: Fix RPMHWrapper registration for `@SA

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4545

Improve the logic in the `AbstractMethodAnnotationPostProcessor` to
check for existing `MessageHandler` and be sure that we need to register
a `ReplyProducingMessageHandlerWrapper` bean

**Cherry-pick to 5.0.x**
This commit is contained in:
Artem Bilan
2018-10-18 17:39:52 -04:00
committed by Gary Russell
parent 743afafa97
commit 40ba72b84a
3 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
View File

@@ -135,9 +135,11 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
}
}
boolean handlerExists = false;
Object sourceHandler = null;
if (beanAnnotationAware() && AnnotatedElementUtils.isAnnotated(method, Bean.class.getName())) {
handlerExists = MessageHandler.class.isAssignableFrom(method.getReturnType());
if (MessageHandler.class.isAssignableFrom(method.getReturnType())) {
sourceHandler = resolveTargetBeanFromMethodWithBeanAnnotation(method);
}
}
MessageHandler handler = createHandler(bean, method, annotations);
@@ -167,7 +169,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
}
}
if (!handlerExists) {
if (handler != sourceHandler) {
String handlerBeanName = generateHandlerBeanName(beanName, method);
if (handler instanceof ReplyProducingMessageHandlerWrapper
&& StringUtils.hasText(MessagingAnnotationUtils.endpointIdValue(method))) {

6
spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyProducingMessageHandlerWrapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017 the original author or authors.
* Copyright 2017-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@ package org.springframework.integration.handler;
import org.springframework.context.Lifecycle;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.util.Assert;
/**
* The {@link AbstractReplyProducingMessageHandler} wrapper around raw {@link MessageHandler}
* for request-reply scenarios, e.g. {@code @ServiceActivator} annotation configuration.
* <p>
* This class is used internally by Framework in cased when request-reply is important
* This class is used internally by Framework in cases when request-reply is important
* and there is no other way to apply advice chain.
* <p>
* The lifecycle control is delegated to the {@code target} {@link MessageHandler}.
@@ -39,6 +40,7 @@ public class ReplyProducingMessageHandlerWrapper extends AbstractReplyProducingM
private final MessageHandler target;
public ReplyProducingMessageHandlerWrapper(MessageHandler target) {
Assert.notNull(target, "'target' must not be null");
this.target = target;
}