diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java index 9352a7a474..8f109fd3ec 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java @@ -54,7 +54,7 @@ import org.springframework.util.Assert; * @author Mark Fisher * @author Marius Bogoevici */ -public class DefaultMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener, DisposableBean { +public class ApplicationContextMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener, DisposableBean { public static final String ERROR_CHANNEL_BEAN_NAME = "errorChannel"; @@ -287,25 +287,25 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A public void preStart() { for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) { - messageBusInterceptor.preStart(DefaultMessageBus.this); + messageBusInterceptor.preStart(ApplicationContextMessageBus.this); } } public void postStart() { for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) { - messageBusInterceptor.postStart(DefaultMessageBus.this); + messageBusInterceptor.postStart(ApplicationContextMessageBus.this); } } public void preStop() { for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) { - messageBusInterceptor.preStop(DefaultMessageBus.this); + messageBusInterceptor.preStop(ApplicationContextMessageBus.this); } } public void postStop() { for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) { - messageBusInterceptor.postStop(DefaultMessageBus.this); + messageBusInterceptor.postStop(ApplicationContextMessageBus.this); } } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java index 32045ba125..059a0be907 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java @@ -36,7 +36,7 @@ public class DefaultErrorChannel extends RendezvousChannel { public DefaultErrorChannel() { this.addInterceptor(new ErrorLoggingInterceptor()); - this.setBeanName(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME); + this.setBeanName(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java index 459c160da3..a9b06c00e4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java @@ -38,7 +38,7 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.MessageBusAwareBeanPostProcessor; import org.springframework.integration.channel.QueueChannel; @@ -84,7 +84,7 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { @Override protected Class getBeanClass(Element element) { - return DefaultMessageBus.class; + return ApplicationContextMessageBus.class; } @Override @@ -100,10 +100,10 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { super.doParse(element, parserContext, builder); String taskSchedulerRef = element.getAttribute(TASK_SCHEDULER_ATTRIBUTE); TaskExecutor taskExecutor= null; - if (!parserContext.getRegistry().containsBeanDefinition(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME)) { + if (!parserContext.getRegistry().containsBeanDefinition(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME)) { RootBeanDefinition errorChannelDef = new RootBeanDefinition(QueueChannel.class); BeanDefinitionHolder errorChannelHolder = new BeanDefinitionHolder( - errorChannelDef, DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME); + errorChannelDef, ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME); BeanDefinitionReaderUtils.registerBeanDefinition(errorChannelHolder, parserContext.getRegistry()); } if (StringUtils.hasText(taskSchedulerRef)) { diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index 3db2494e05..10c0a50a88 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -76,7 +76,7 @@ public class DefaultMessageBusTests { endpoint.afterPropertiesSet(); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); context.refresh(); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); context.getBeanFactory().registerSingleton(MessageBusParser.MESSAGE_BUS_BEAN_NAME, bus); bus.setApplicationContext(context); @@ -89,7 +89,7 @@ public class DefaultMessageBusTests { @Test public void channelsWithoutHandlers() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); QueueChannel sourceChannel = new QueueChannel(); @@ -148,7 +148,7 @@ public class DefaultMessageBusTests { endpoint2.afterPropertiesSet(); context.getBeanFactory().registerSingleton("testEndpoint1", endpoint1); context.getBeanFactory().registerSingleton("testEndpoint2", endpoint2); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); @@ -190,7 +190,7 @@ public class DefaultMessageBusTests { SubscribingConsumerEndpoint endpoint2 = new SubscribingConsumerEndpoint(consumer2, inputChannel); context.getBeanFactory().registerSingleton("testEndpoint1", endpoint1); context.getBeanFactory().registerSingleton("testEndpoint2", endpoint2); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); @@ -218,7 +218,7 @@ public class DefaultMessageBusTests { channelAdapter.setOutputChannel(outputChannel); channelAdapter.setBeanName("testChannel"); context.getBeanFactory().registerSingleton("testChannel", channelAdapter); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); @@ -241,8 +241,8 @@ public class DefaultMessageBusTests { public void consumerSubscribedToErrorChannel() throws InterruptedException { GenericApplicationContext context = new GenericApplicationContext(); QueueChannel errorChannel = new QueueChannel(); - errorChannel.setBeanName(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME); - context.getBeanFactory().registerSingleton(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME, errorChannel); + errorChannel.setBeanName(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME); + context.getBeanFactory().registerSingleton(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME, errorChannel); final CountDownLatch latch = new CountDownLatch(1); AbstractReplyProducingMessageConsumer consumer = new AbstractReplyProducingMessageConsumer() { public void onMessage(Message message, ReplyMessageHolder replyHolder) { @@ -252,7 +252,7 @@ public class DefaultMessageBusTests { PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(consumer, errorChannel); endpoint.afterPropertiesSet(); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); @@ -267,7 +267,7 @@ public class DefaultMessageBusTests { QueueChannel testChannel = new QueueChannel(); testChannel.setBeanName("testChannel"); context.getBeanFactory().registerSingleton("testChannel", testChannel); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); messageBus.setApplicationContext(context); MessageChannel lookedUpChannel = messageBus.lookupChannel("testChannel"); assertNotNull(testChannel); @@ -277,7 +277,7 @@ public class DefaultMessageBusTests { @Test public void lookupNonRegisteredChannel() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); messageBus.setApplicationContext(context); MessageChannel noSuchChannel = messageBus.lookupChannel("noSuchChannel"); assertNull(noSuchChannel); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index c2ae272605..c36a5f3213 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -45,7 +45,7 @@ public class DirectChannelSubscriptionTests { private GenericApplicationContext context = new GenericApplicationContext(); - private DefaultMessageBus bus = new DefaultMessageBus(); + private ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); private DirectChannel sourceChannel = new DirectChannel(); @@ -110,9 +110,9 @@ public class DirectChannelSubscriptionTests { @Test(expected = MessagingException.class) public void exceptionThrownFromAnnotatedEndpoint() { QueueChannel errorChannel = new QueueChannel(); - errorChannel.setBeanName(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME); + errorChannel.setBeanName(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME); context.getBeanFactory().registerSingleton( - DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME, errorChannel); + ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME, errorChannel); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(); postProcessor.setBeanFactory(context.getBeanFactory()); postProcessor.afterPropertiesSet(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java index 8477aae7b8..21ee6deca1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusInterceptorTests.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.util.TestUtils; @@ -33,7 +33,7 @@ public class MessageBusInterceptorTests { @Test public void testStart() { - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); messageBus.setApplicationContext(new GenericApplicationContext()); TestMessageBusStartInterceptor startInterceptor = new TestMessageBusStartInterceptor(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml index 915d7a485e..fce8d6085e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java index 2189b9be27..aacd8c38d1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; @@ -62,7 +62,7 @@ public class MessageChannelTemplateTests { GenericApplicationContext context = new GenericApplicationContext(); context.getBeanFactory().registerSingleton("requestChannel", requestChannel); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index fd2fdb1923..d2df0ac339 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -30,7 +30,7 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SyncTaskExecutor; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.MessageBusInterceptorTests; import org.springframework.integration.bus.TestMessageBusAwareImpl; @@ -51,8 +51,8 @@ public class MessageBusParserTests { public void testErrorChannelReference() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithErrorChannel.xml", this.getClass()); - DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); - MessageChannel channel = bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME); + ApplicationContextMessageBus bus = (ApplicationContextMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + MessageChannel channel = bus.lookupChannel(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME); assertEquals(context.getBean("errorChannel"), channel); } @@ -60,9 +60,9 @@ public class MessageBusParserTests { public void testDefaultErrorChannel() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithDefaults.xml", this.getClass()); - DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + ApplicationContextMessageBus bus = (ApplicationContextMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); assertNotNull("parser should have created a default error channel", - bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME)); + bus.lookupChannel(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME)); } @Test diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java index f92c57ff3f..a96276406f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.config.xml.MessageBusParser; @@ -50,7 +50,7 @@ public class ServiceActivatorAnnotationPostProcessorTests { beanDefinition.getConstructorArgumentValues().addGenericArgumentValue(latch); context.registerBeanDefinition("testBean", beanDefinition); String busBeanName = MessageBusParser.MESSAGE_BUS_BEAN_NAME; - RootBeanDefinition busBeanDefinition = new RootBeanDefinition(DefaultMessageBus.class); + RootBeanDefinition busBeanDefinition = new RootBeanDefinition(ApplicationContextMessageBus.class); busBeanDefinition.getPropertyValues().addPropertyValue("taskScheduler", TestUtils.createTaskScheduler(10)); context.registerBeanDefinition(busBeanName, busBeanDefinition); RootBeanDefinition postProcessorDef = new RootBeanDefinition(MessagingAnnotationPostProcessor.class); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index 0ea089eee0..2a5164b6b8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -37,7 +37,7 @@ import org.springframework.integration.annotation.MessageEndpoint; 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.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.DirectChannel; @@ -65,7 +65,7 @@ public class MessagingAnnotationPostProcessorTests { QueueChannel inputChannel = new QueueChannel(); inputChannel.setBeanName("inputChannel"); context.getBeanFactory().registerSingleton("inputChannel", inputChannel); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); messageBus.setApplicationContext(context); @@ -132,7 +132,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void targetAnnotation() throws InterruptedException { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); @@ -178,7 +178,7 @@ public class MessagingAnnotationPostProcessorTests { outputChannel.setBeanName("outputChannel"); context.getBeanFactory().registerSingleton("inputChannel", inputChannel); context.getBeanFactory().registerSingleton("outputChannel", outputChannel); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); @@ -199,7 +199,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testProxiedMessageEndpointAnnotation() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -226,7 +226,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInherited() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -251,7 +251,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedWithProxy() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -278,7 +278,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterface() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -303,7 +303,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterfaceWithAutoCreatedChannels() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -328,7 +328,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterfaceWithProxy() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel inputChannel = new QueueChannel(); @@ -355,7 +355,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testEndpointWithPollerAnnotation() { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); QueueChannel testChannel = new QueueChannel(); @@ -380,7 +380,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testChannelAdapterAnnotation() throws InterruptedException { GenericApplicationContext context = new GenericApplicationContext(); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton( MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); @@ -417,7 +417,7 @@ public class MessagingAnnotationPostProcessorTests { QueueChannel outputChannel = new QueueChannel(); outputChannel.setBeanName("outputChannel"); context.getBeanFactory().registerSingleton("outputChannel", outputChannel); - DefaultMessageBus messageBus = new DefaultMessageBus(); + ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); context.getBeanFactory().registerSingleton(MessageBusParser.MESSAGE_BUS_BEAN_NAME, messageBus); messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); messageBus.setApplicationContext(context); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java index c86e237511..613ed05ccf 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Router; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; @@ -39,7 +39,7 @@ public class RouterAnnotationPostProcessorTests { private GenericApplicationContext context = new GenericApplicationContext(); - private DefaultMessageBus messageBus = new DefaultMessageBus(); + private ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); private DirectChannel inputChannel = new DirectChannel(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java index 1c8fb6d8a4..6c065eaa4f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Splitter; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; @@ -41,7 +41,7 @@ public class SplitterAnnotationPostProcessorTests { private GenericApplicationContext context = new GenericApplicationContext(); - private DefaultMessageBus messageBus = new DefaultMessageBus(); + private ApplicationContextMessageBus messageBus = new ApplicationContextMessageBus(); private DirectChannel inputChannel = new DirectChannel(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java index df61db7232..7b872a6cbc 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; @@ -86,7 +86,7 @@ public class MethodInvokingConsumerTests { MethodInvokingConsumer consumer = new MethodInvokingConsumer(testBean, "foo"); PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(consumer, channel); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); - DefaultMessageBus bus = new DefaultMessageBus(); + ApplicationContextMessageBus bus = new ApplicationContextMessageBus(); bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start();