From fcef6c078e29cd9d411cfe2ca1302cbdeccb84d8 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sat, 1 Nov 2008 15:34:21 +0000
Subject: [PATCH] Moved 'outputChannel' configuration into each implementation
 instead of AbstractMethodAnnotationPostProcessor.

---
 .../AbstractMethodAnnotationPostProcessor.java        | 11 -----------
 .../annotation/AggregatorAnnotationPostProcessor.java |  4 ++++
 .../ServiceActivatorAnnotationPostProcessor.java      |  8 +++++++-
 .../annotation/SplitterAnnotationPostProcessor.java   |  8 +++++++-
 .../TransformerAnnotationPostProcessor.java           |  8 +++++++-
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index 450835e821..8fa1543e67 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -34,7 +34,6 @@ import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.MessageConsumer;
-import org.springframework.integration.message.MessageProducer;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -47,8 +46,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 
 	private static final String INPUT_CHANNEL_ATTRIBUTE = "inputChannel";
 
-	private static final String OUTPUT_CHANNEL_ATTRIBUTE = "outputChannel";
-
 
 	protected final GenericBeanFactoryAccessor beanFactoryAccessor;
 
@@ -108,14 +105,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 			else {
 				throw new IllegalArgumentException("unsupported channel type: [" + inputChannel.getClass() + "]");
 			}
-			if (consumer instanceof MessageProducer) {
-				String outputChannelName = (String) AnnotationUtils.getValue(annotation, OUTPUT_CHANNEL_ATTRIBUTE);
-				if (StringUtils.hasText(outputChannelName)) {
-					MessageChannel outputChannel = this.channelResolver.resolveChannelName(outputChannelName);
-					Assert.notNull(outputChannel, "unable to resolve outputChannel '" + outputChannelName + "'");
-					((MessageProducer) consumer).setOutputChannel(outputChannel);
-				}
-			}
 			if (consumer instanceof BeanFactoryAware) {
 				((BeanFactoryAware) consumer).setBeanFactory(this.beanFactoryAccessor.getBeanFactory());
 			}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
index e4ceb47c2a..93e42061c7 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java
@@ -54,6 +54,10 @@ public class AggregatorAnnotationPostProcessor extends AbstractMethodAnnotationP
 			Assert.notNull(discardChannel, "failed to resolve discardChannel '" + discardChannelName + "'");
 			aggregator.setDiscardChannel(discardChannel);
 		}
+		String outputChannelName = annotation.outputChannel();
+		if (StringUtils.hasText(outputChannelName)) {
+			aggregator.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName));
+		}
 		aggregator.setSendTimeout(annotation.sendTimeout());
 		aggregator.setSendPartialResultOnTimeout(annotation.sendPartialResultsOnTimeout());
 		aggregator.setReaperInterval(annotation.reaperInterval());
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
index 0952281daf..b874fc33d9 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.consumer.ServiceActivatingConsumer;
 import org.springframework.integration.message.MessageConsumer;
+import org.springframework.util.StringUtils;
 
 /**
  * Post-processor for Methods annotated with {@link ServiceActivator @ServiceActivator}.
@@ -37,7 +38,12 @@ public class ServiceActivatorAnnotationPostProcessor extends AbstractMethodAnnot
 
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, ServiceActivator annotation) {
-		return new ServiceActivatingConsumer(bean, method);
+		ServiceActivatingConsumer serviceActivator = new ServiceActivatingConsumer(bean, method);
+		String outputChannelName = annotation.outputChannel();
+		if (StringUtils.hasText(outputChannelName)) {
+			serviceActivator.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName));
+		}
+		return serviceActivator;
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java
index fa717b298e..8f8a2e8d02 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
+import org.springframework.util.StringUtils;
 
 /**
  * Post-processor for Methods annotated with {@link Splitter @Splitter}.
@@ -37,7 +38,12 @@ public class SplitterAnnotationPostProcessor extends AbstractMethodAnnotationPos
 
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, Splitter annotation) {
-		return new MethodInvokingSplitter(bean, method);
+		MethodInvokingSplitter splitter = new MethodInvokingSplitter(bean, method);
+		String outputChannelName = annotation.outputChannel();
+		if (StringUtils.hasText(outputChannelName)) {
+			splitter.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName));
+		}
+		return splitter;
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
index 697701bb39..0762e49276 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
@@ -23,6 +23,7 @@ import org.springframework.integration.annotation.Transformer;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.transformer.MethodInvokingTransformer;
 import org.springframework.integration.transformer.MessageTransformingConsumer;
+import org.springframework.util.StringUtils;
 
 /**
  * Post-processor for Methods annotated with {@link Transformer @Transformer}.
@@ -39,7 +40,12 @@ public class TransformerAnnotationPostProcessor extends AbstractMethodAnnotation
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, Transformer annotation) {
 		MethodInvokingTransformer transformer = new MethodInvokingTransformer(bean, method);
-		return new MessageTransformingConsumer(transformer);
+		MessageTransformingConsumer consumer = new MessageTransformingConsumer(transformer);
+		String outputChannelName = annotation.outputChannel();
+		if (StringUtils.hasText(outputChannelName)) {
+			consumer.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName));
+		}
+		return consumer;
 	}
 
 }