Removed ChannelRegistryAware. The AbstractReplyProducingMessageConsumer now uses a BeanFactoryChannelResolver and is therefore now BeanFactoryAware. The annotation post-processors set the BeanFactoryChannelResolver when creating such a consumer (since it is not created within the ApplicationContext in that case).

org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java

@@ -36,7 +36,6 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.Lifecycle;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.endpoint.MessageEndpoint;
@@ -177,9 +176,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 
 	private void activateEndpoint(MessageEndpoint endpoint) {
 		Assert.notNull(endpoint, "'endpoint' must not be null");
-		if (endpoint instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) endpoint).setChannelRegistry(this);
-		}
 		if (endpoint instanceof TaskSchedulerAware) {
 			((TaskSchedulerAware) endpoint).setTaskScheduler(this.taskScheduler);
 		}

org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusAwareBeanPostProcessor.java

@@ -18,7 +18,6 @@ package org.springframework.integration.bus;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.util.Assert;
 
 /**
@@ -51,9 +50,6 @@ public class MessageBusAwareBeanPostProcessor implements BeanPostProcessor {
 		if (bean instanceof MessageBusAware) {
 			((MessageBusAware) bean).setMessageBus(this.messageBus);
 		}
-		if (bean instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) bean).setChannelRegistry(this.messageBus);
-		}
 		return bean;
 	}
 

org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelRegistryAware.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2002-2008 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.channel;
-
-/**
- * Interface to be implemented by components that need access to the
- * {@link ChannelRegistry}.
- * 
- * @author Mark Fisher
- */
-public interface ChannelRegistryAware {
-
-	void setChannelRegistry(ChannelRegistry channelRegistry);
-
-}

org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java

@@ -18,12 +18,11 @@ package org.springframework.integration.config;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
@@ -40,10 +39,12 @@ import org.springframework.util.Assert;
 /**
  * @author Mark Fisher
  */
-public class ConsumerEndpointFactoryBean implements FactoryBean, ChannelRegistryAware, BeanFactoryAware, InitializingBean {
+public class ConsumerEndpointFactoryBean implements FactoryBean, BeanFactoryAware, BeanNameAware, InitializingBean {
 
 	private final MessageConsumer consumer;
 
+	private volatile String beanName;
+
 	private volatile String inputChannelName;
 
 	private volatile Trigger trigger;
@@ -73,14 +74,12 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, ChannelRegistry
 	}
 
 
-	public void setInputChannelName(String inputChannelName) {
-		this.inputChannelName = inputChannelName;
+	public void setBeanName(String beanName) {
+		this.beanName = beanName;
 	}
 
-	public void setChannelRegistry(ChannelRegistry channelRegistry) {
-		if (this.consumer instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) this.consumer).setChannelRegistry(channelRegistry);
-		}
+	public void setInputChannelName(String inputChannelName) {
+		this.inputChannelName = inputChannelName;
 	}
 
 	public void setTrigger(Trigger trigger) {
@@ -141,11 +140,12 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, ChannelRegistry
 				return;
 			}
 			Assert.isTrue(this.beanFactory.containsBean(this.inputChannelName),
-					"no such input channel '" + this.inputChannelName + "'");
+					"no such input channel '" + this.inputChannelName + "' for endpoint '" + this.beanName + "'");
 			MessageChannel channel = (MessageChannel)
 					this.beanFactory.getBean(this.inputChannelName, MessageChannel.class);
 			if (channel instanceof SubscribableChannel) {
-				Assert.isNull(trigger, "A trigger should not be specified when using a SubscribableChannel");
+				Assert.isNull(trigger, "A trigger should not be specified for endpoint '" + this.beanName
+						+ "', since '" + this.inputChannelName + "' is a SubscribableChannel (not pollable).");
 				this.endpoint = new SubscribingConsumerEndpoint(
 						this.consumer, (SubscribableChannel) channel);
 			}

org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java

@@ -24,12 +24,11 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.annotation.Poller;
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
+import org.springframework.integration.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
-import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.endpoint.AbstractMessageConsumer;
 import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
 import org.springframework.integration.endpoint.MessageEndpoint;
@@ -53,22 +52,18 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 
 	protected final GenericBeanFactoryAccessor beanFactoryAccessor;
 
-	protected final ChannelRegistry channelRegistry;
+	protected final ChannelResolver channelResolver;
 
 
 	public AbstractMethodAnnotationPostProcessor(ListableBeanFactory beanFactory) {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		this.beanFactoryAccessor = new GenericBeanFactoryAccessor(beanFactory);
-		this.channelRegistry = this.beanFactoryAccessor.getBean(
-				MessageBusParser.MESSAGE_BUS_BEAN_NAME, ChannelRegistry.class);
+		this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
 	}
 
 
 	public Object postProcess(Object bean, String beanName, Method method, T annotation) {
 		MessageConsumer consumer = this.createConsumer(bean, method, annotation);
-		if (consumer instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) consumer).setChannelRegistry(this.channelRegistry);
-		}
 		Poller pollerAnnotation = AnnotationUtils.findAnnotation(method, Poller.class);
 		MessageEndpoint endpoint = this.createEndpoint(consumer, annotation, pollerAnnotation);
 		if (endpoint != null) {
@@ -94,8 +89,8 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 		MessageEndpoint endpoint = null;
 		String inputChannelName = (String) AnnotationUtils.getValue(annotation, INPUT_CHANNEL_ATTRIBUTE);
 		if (StringUtils.hasText(inputChannelName)) {
-			MessageChannel inputChannel = this.channelRegistry.lookupChannel(inputChannelName);
-			Assert.notNull(inputChannel, "unable to resolve inputChannel '" + inputChannelName + "'");
+			MessageChannel inputChannel = this.channelResolver.resolveChannelName(inputChannelName);
+			Assert.notNull(inputChannel, "failed to resolve inputChannel '" + inputChannelName + "'");
 			if (consumer instanceof AbstractMessageConsumer) {
 				if (inputChannel instanceof PollableChannel) {
 					PollingConsumerEndpoint pollingEndpoint = new PollingConsumerEndpoint(
@@ -119,10 +114,11 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 			if (consumer instanceof AbstractReplyProducingMessageConsumer) {
 				String outputChannelName = (String) AnnotationUtils.getValue(annotation, OUTPUT_CHANNEL_ATTRIBUTE);
 				if (StringUtils.hasText(outputChannelName)) {
-					MessageChannel outputChannel = this.channelRegistry.lookupChannel(outputChannelName);
+					MessageChannel outputChannel = this.channelResolver.resolveChannelName(outputChannelName);
 					Assert.notNull(outputChannel, "unable to resolve outputChannel '" + outputChannelName + "'");
 					((AbstractReplyProducingMessageConsumer) consumer).setOutputChannel(outputChannel);
 				}
+				((AbstractReplyProducingMessageConsumer) consumer).setChannelResolver(this.channelResolver);
 			}
 		}
 		return endpoint;

org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java

@@ -50,8 +50,8 @@ public class AggregatorAnnotationPostProcessor extends AbstractMethodAnnotationP
 		this.configureCompletionStrategy(bean, aggregator);
 		String discardChannelName = annotation.discardChannel();
 		if (StringUtils.hasText(discardChannelName)) {
-			MessageChannel discardChannel = this.channelRegistry.lookupChannel(discardChannelName);
-			Assert.notNull(discardChannel, "unable to resolve discardChannel '" + discardChannelName + "'");
+			MessageChannel discardChannel = this.channelResolver.resolveChannelName(discardChannelName);
+			Assert.notNull(discardChannel, "failed to resolve discardChannel '" + discardChannelName + "'");
 			aggregator.setDiscardChannel(discardChannel);
 		}
 		aggregator.setSendTimeout(annotation.sendTimeout());

org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java

@@ -40,7 +40,6 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.annotation.Transformer;
 import org.springframework.integration.bus.MessageBus;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.stereotype.Component;
@@ -118,9 +117,6 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Bean
 				}
 			}
 		});
-		if (bean instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) bean).setChannelRegistry(messageBus);
-		}
 		return bean;
 	}
 

org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java

@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.Router;
-import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.router.MethodInvokingRouter;
@@ -42,10 +41,10 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, Router annotation) {
 		MethodInvokingRouter router = new MethodInvokingRouter(bean, method);
-		router.setChannelResolver(new BeanFactoryChannelResolver(this.beanFactoryAccessor.getBeanFactory()));
+		router.setChannelResolver(this.channelResolver);
 		String defaultOutputChannelName = annotation.defaultOutputChannel();
 		if (StringUtils.hasText(defaultOutputChannelName)) {
-			MessageChannel defaultOutputChannel = this.channelRegistry.lookupChannel(defaultOutputChannelName);
+			MessageChannel defaultOutputChannel = this.channelResolver.resolveChannelName(defaultOutputChannelName);
 			Assert.notNull(defaultOutputChannel, "unable to resolve defaultOutputChannel '" + defaultOutputChannelName + "'");
 			router.setDefaultOutputChannel(defaultOutputChannel);
 		}

org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java

@@ -19,8 +19,10 @@ package org.springframework.integration.endpoint;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.integration.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.message.CompositeMessage;
@@ -38,14 +40,14 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public abstract class AbstractReplyProducingMessageConsumer extends AbstractMessageConsumer implements ChannelRegistryAware {
+public abstract class AbstractReplyProducingMessageConsumer extends AbstractMessageConsumer implements BeanFactoryAware {
 
 	public static final long DEFAULT_SEND_TIMEOUT = 1000;
 
 
 	private MessageChannel outputChannel;
 
-	private volatile ChannelRegistry channelRegistry;
+	private volatile ChannelResolver channelResolver;
 
 	private volatile MessageSelector selector;
 
@@ -75,8 +77,9 @@ public abstract class AbstractReplyProducingMessageConsumer extends AbstractMess
 		this.channelTemplate.setSendTimeout(sendTimeout);
 	}
 
-	public void setChannelRegistry(ChannelRegistry channelRegistry) {
-		this.channelRegistry = channelRegistry;
+	public void setChannelResolver(ChannelResolver channelResolver) {
+		Assert.notNull(channelResolver, "channelResolver must not be null");
+		this.channelResolver = channelResolver;
 	}
 
 	public void setSelector(MessageSelector selector) {
@@ -87,6 +90,11 @@ public abstract class AbstractReplyProducingMessageConsumer extends AbstractMess
 		this.requiresReply = requiresReply;
 	}
 
+	public void setBeanFactory(BeanFactory beanFactory) {
+		if (this.channelResolver == null) {
+			this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
+		}
+	}
 
 	@Override
 	protected final void onMessageInternal(Message<?> message) {
@@ -175,9 +183,9 @@ public abstract class AbstractReplyProducingMessageConsumer extends AbstractMess
 					replyChannel = (MessageChannel) returnAddress;
 				}
 				else if (returnAddress instanceof String) {
-					Assert.state(this.channelRegistry != null,
-							"ChannelRegistry is required for resolving a reply channel by name");
-					replyChannel = this.channelRegistry.lookupChannel((String) returnAddress);
+					Assert.state(this.channelResolver != null,
+							"ChannelResolver is required for resolving a reply channel by name");
+					replyChannel = this.channelResolver.resolveChannelName((String) returnAddress);
 				}
 				else {
 					throw new MessagingException("expected a MessageChannel or String for 'returnAddress', but type is ["

org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java

@@ -71,6 +71,7 @@ public class DefaultMessageBusTests {
 				return message;
 			}
 		};
+		consumer.setBeanFactory(context);
 		PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(consumer, sourceChannel);
 		endpoint.afterPropertiesSet();
 		context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
@@ -79,7 +80,6 @@ public class DefaultMessageBusTests {
 		bus.setTaskScheduler(TestUtils.createTaskScheduler(10));
 		context.getBeanFactory().registerSingleton(MessageBusParser.MESSAGE_BUS_BEAN_NAME, bus);
 		bus.setApplicationContext(context);
-		consumer.setChannelRegistry(bus);
 		bus.start();
 		Message<?> result = targetChannel.receive(3000);
 		assertEquals("test", result.getPayload());

org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java

@@ -18,7 +18,6 @@ package org.springframework.integration.config.annotation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
@@ -39,8 +38,6 @@ import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.annotation.Transformer;
 import org.springframework.integration.bus.DefaultMessageBus;
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
@@ -48,6 +45,7 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.endpoint.PollingConsumerEndpoint;
 import org.springframework.integration.message.Message;
+import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.IntervalTrigger;
@@ -179,24 +177,29 @@ public class MessagingAnnotationPostProcessorTests {
 	}
 
 	@Test
-	public void testChannelRegistryAwareBean() {
+	public void testChannelResolution() {
 		GenericApplicationContext context = new GenericApplicationContext();
-		QueueChannel inputChannel = new QueueChannel();
+		DirectChannel inputChannel = new DirectChannel();
+		QueueChannel outputChannel = new QueueChannel();
 		inputChannel.setBeanName("inputChannel");
+		outputChannel.setBeanName("outputChannel");
 		context.getBeanFactory().registerSingleton("inputChannel", inputChannel);
+		context.getBeanFactory().registerSingleton("outputChannel", outputChannel);
 		DefaultMessageBus messageBus = new DefaultMessageBus();
+		messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10));
 		context.getBeanFactory().registerSingleton(
 				MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus);
 		messageBus.setApplicationContext(context);
 		MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor();
 		postProcessor.setBeanFactory(context.getBeanFactory());
 		postProcessor.afterPropertiesSet();
-		ChannelRegistryAwareTestBean testBean = new ChannelRegistryAwareTestBean();
-		assertNull(testBean.getChannelRegistry());
-		postProcessor.postProcessAfterInitialization(testBean, "testBean");
-		ChannelRegistry channelRegistry = testBean.getChannelRegistry();
-		assertNotNull(channelRegistry);
-		assertEquals(messageBus, channelRegistry);
+		messageBus.start();
+		ServiceActivatorAnnotatedBean bean = new ServiceActivatorAnnotatedBean();
+		postProcessor.postProcessAfterInitialization(bean, "testBean");
+		Message<?> message = MessageBuilder.withPayload("test").setReturnAddress("outputChannel").build();
+		inputChannel.send(message);
+		Message<?> reply = outputChannel.receive(0);
+		assertNotNull(reply);
 	}
 
 	@Test
@@ -459,26 +462,6 @@ public class MessagingAnnotationPostProcessorTests {
 	}
 
 
-	@MessageEndpoint
-	private static class ChannelRegistryAwareTestBean implements ChannelRegistryAware {
-
-		private ChannelRegistry channelRegistry;
-
-		public void setChannelRegistry(ChannelRegistry channelRegistry) {
-			this.channelRegistry = channelRegistry;
-		}
-
-		public ChannelRegistry getChannelRegistry() {
-			return this.channelRegistry;
-		}
-
-		@ServiceActivator(inputChannel="inputChannel")
-		public Message<?> handle(Message<?> message) {
-			return null;
-		}
-	}
-
-
 	private static class SimpleAnnotatedEndpointSubclass extends SimpleAnnotatedEndpoint {
 	}
 

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java

@@ -22,17 +22,14 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.channel.TestChannelResolver;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
@@ -91,10 +88,10 @@ public class ServiceActivatorEndpointTests {
 	public void returnAddressHeaderWithChannelName() {
 		QueueChannel channel = new QueueChannel(1);
 		channel.setBeanName("testChannel");
-		TestChannelRegistry channelRegistry = new TestChannelRegistry();
-		channelRegistry.registerChannel(channel);
+		TestChannelResolver channelResolver = new TestChannelResolver();
+		channelResolver.addChannel(channel);
 		ServiceActivatorEndpoint endpoint = this.createEndpoint();
-		endpoint.setChannelRegistry(channelRegistry);
+		endpoint.setChannelResolver(channelResolver);
 		Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress("testChannel").build();
 		endpoint.onMessage(message);
 		Message<?> reply = channel.receive(0);
@@ -114,9 +111,9 @@ public class ServiceActivatorEndpointTests {
 			}
 		};
 		ServiceActivatorEndpoint endpoint = new ServiceActivatorEndpoint(handler, "handle");
-		TestChannelRegistry channelRegistry = new TestChannelRegistry();
-		channelRegistry.registerChannel(replyChannel2);
-		endpoint.setChannelRegistry(channelRegistry);
+		TestChannelResolver channelResolver = new TestChannelResolver();
+		channelResolver.addChannel(replyChannel2);
+		endpoint.setChannelResolver(channelResolver);
 		Message<String> testMessage1 = MessageBuilder.withPayload("bar")
 				.setReturnAddress(replyChannel1).build();
 		endpoint.onMessage(testMessage1);
@@ -359,18 +356,4 @@ public class ServiceActivatorEndpointTests {
 		}
 	}
 
-
-	private static class TestChannelRegistry implements ChannelRegistry {
-
-		private final Map<String, MessageChannel> channels = new HashMap<String, MessageChannel>();
-
-		public MessageChannel lookupChannel(String channelName) {
-			return this.channels.get(channelName);
-		}
-
-		public void registerChannel(MessageChannel channel) {
-			this.channels.put(channel.getName(), channel);
-		}
-	}
-
 }

org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java

@@ -27,8 +27,6 @@ import java.util.List;
 import org.junit.Test;
 
 import org.springframework.integration.annotation.Header;
-import org.springframework.integration.channel.ChannelRegistry;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.TestChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
@@ -610,22 +608,4 @@ public class MethodInvokingRouterTests {
 		}
 	}
 
-
-	public static class ChannelRegistryAwareTestBean implements ChannelRegistryAware {
-
-		private ChannelRegistry channelRegistry;
-
-		public void setChannelRegistry(ChannelRegistry channelRegistry) {
-			this.channelRegistry = channelRegistry;
-		}
-
-		public ChannelRegistry getChannelRegistry() {
-			return this.channelRegistry;
-		}
-
-		public MessageChannel route(String channelName) {
-			return this.channelRegistry.lookupChannel(channelName);
-		}
-	}
-
 }