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

DSL-140: Improve Logic for outputChannel in DSL

Browse Source 
Fixes spring-projects/spring-integration-java-dsl#140

Allow to provide any custom `MessageProducer` impl for the `.handle()`, not only `AbstractReplyProducingMessageHandler` extension

Polishing
This commit is contained in:
Artem Bilan
2017-01-30 13:19:01 -05:00
committed by Gary Russell
parent 3276353bde
commit 63e715a685
2 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
View File

@@ -45,6 +45,7 @@ import org.springframework.integration.config.ConsumerEndpointFactoryBean;
import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.GenericSelector;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.MessageSelector;
import org.springframework.integration.dsl.channel.MessageChannelSpec;
import org.springframework.integration.dsl.channel.WireTapSpec;
@@ -117,7 +118,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
private static final SpelExpressionParser PARSER = new SpelExpressionParser();
private static final Set<MessageHandler> REFERENCED_REPLY_PRODUCERS = new HashSet<>();
private static final Set<MessageProducer> REFERENCED_REPLY_PRODUCERS = new HashSet<>();
protected final Set<Object> integrationComponents = new LinkedHashSet<>();
@@ -2821,12 +2822,22 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
currentComponent = extractProxyTarget(currentComponent);
}
if (currentComponent instanceof AbstractMessageProducingHandler) {
AbstractMessageProducingHandler messageProducer =
(AbstractMessageProducingHandler) currentComponent;
if (currentComponent instanceof MessageProducer) {
MessageProducer messageProducer =
(MessageProducer) currentComponent;
checkReuse(messageProducer);
if (channelName != null) {
messageProducer.setOutputChannelName(channelName);
if (messageProducer instanceof AbstractMessageProducingHandler) {
((AbstractMessageProducingHandler) messageProducer).setOutputChannelName(channelName);
}
else {
throw new BeanCreationException("The 'currentComponent' (" + currentComponent
+ ") must extend 'AbstractMessageProducingHandler' "
+ "for message channel resolution by name.\n"
+ "Your handler should extend 'AbstractMessageProducingHandler', "
+ "its subclass 'AbstractReplyProducingMessageHandler', or you should "
+ "reference a 'MessageChannel' bean instead of its name.");
}
}
else {
messageProducer.setOutputChannel(outputChannel);
@@ -2927,10 +2938,10 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
}
}
private void checkReuse(AbstractMessageProducingHandler replyHandler) {
private void checkReuse(MessageProducer replyHandler) {
Assert.isTrue(!REFERENCED_REPLY_PRODUCERS.contains(replyHandler),
"An AbstractMessageProducingHandler may only be referenced once ("
+ replyHandler.getComponentName()
"A reply MessageProducer may only be referenced once ("
+ replyHandler
+ ") - use @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) on @Bean definition.");
REFERENCED_REPLY_PRODUCERS.add(replyHandler);
}