diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java index 88ddf9f7b9..3bb2553c35 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * 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. @@ -25,10 +25,10 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.StringMessage; /** @@ -37,6 +37,7 @@ import org.springframework.integration.message.StringMessage; public class ApplicationEventTargetTests { @Test + @SuppressWarnings("unchecked") public void testSendingEvent() throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); ApplicationEventPublisher publisher = new ApplicationEventPublisher() { @@ -47,7 +48,7 @@ public class ApplicationEventTargetTests { MessageChannel channel = new QueueChannel(); ApplicationEventTarget adapter = new ApplicationEventTarget(); adapter.setApplicationEventPublisher(publisher); - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); bus.registerChannel("channel", channel); bus.registerTarget("adapter", adapter, channel, null); bus.start(); diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml index f21582fdfd..85fd0da692 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java index 936d699367..2311280cf2 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java @@ -31,6 +31,7 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.Conventions; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.MessageBusAwareBeanPostProcessor; import org.springframework.util.StringUtils; @@ -47,8 +48,6 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { public static final String MESSAGE_BUS_AWARE_POST_PROCESSOR_BEAN_NAME = "internal.MessageBusAwareBeanPostProcessor"; - private static final Class MESSAGE_BUS_CLASS = MessageBus.class; - private static final String ERROR_CHANNEL_ATTRIBUTE = "error-channel"; private static final String CHANNEL_FACTORY_ATTRIBUTE = "channel-factory"; @@ -64,7 +63,7 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { if (parserContext.getRegistry().containsBeanDefinition(MESSAGE_BUS_BEAN_NAME)) { - throw new ConfigurationException("Only one instance of '" + MESSAGE_BUS_CLASS.getSimpleName() + throw new ConfigurationException("Only one instance of '" + MessageBus.class.getSimpleName() + "' is allowed per ApplicationContext."); } return MESSAGE_BUS_BEAN_NAME; @@ -72,7 +71,7 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { @Override protected Class getBeanClass(Element element) { - return MESSAGE_BUS_CLASS; + return DefaultMessageBus.class; } @Override diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml index 4499ac92d2..660c2cf12f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java similarity index 95% rename from org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index 95b681a5dd..fb06d19977 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -43,11 +43,11 @@ import org.springframework.integration.scheduling.PollingSchedule; /** * @author Mark Fisher */ -public class MessageBusTests { +public class DefaultMessageBusTests { @Test public void testRegistrationWithInputChannelReference() { - MessageBus bus = new MessageBus(); + DefaultMessageBus bus = new DefaultMessageBus(); MessageChannel sourceChannel = new QueueChannel(); MessageChannel targetChannel = new QueueChannel(); bus.registerChannel("sourceChannel", sourceChannel); @@ -69,7 +69,7 @@ public class MessageBusTests { @Test public void testRegistrationWithInputChannelName() { - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); MessageChannel sourceChannel = new QueueChannel(); MessageChannel targetChannel = new QueueChannel(); bus.registerChannel("sourceChannel", sourceChannel); @@ -91,7 +91,7 @@ public class MessageBusTests { @Test public void testChannelsWithoutHandlers() { - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); MessageChannel sourceChannel = new QueueChannel(); sourceChannel.send(new StringMessage("123", "test")); MessageChannel targetChannel = new QueueChannel(); @@ -133,7 +133,7 @@ public class MessageBusTests { return message; } }; - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); bus.registerChannel("input", inputChannel); bus.registerChannel("output1", outputChannel1); bus.registerChannel("output2", outputChannel2); @@ -167,7 +167,7 @@ public class MessageBusTests { return message; } }; - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); bus.registerChannel("input", inputChannel); bus.registerChannel("output1", outputChannel1); bus.registerChannel("output2", outputChannel2); @@ -186,7 +186,7 @@ public class MessageBusTests { @Test public void testErrorChannelWithFailedDispatch() throws InterruptedException { - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); CountDownLatch latch = new CountDownLatch(1); SourceEndpoint sourceEndpoint = new SourceEndpoint(new FailingSource(latch)); sourceEndpoint.setOutputChannel(new QueueChannel()); @@ -210,7 +210,7 @@ public class MessageBusTests { @Test public void testErrorChannelRegistration() { MessageChannel errorChannel = new QueueChannel(); - MessageBus bus = new MessageBus(); + DefaultMessageBus bus = new DefaultMessageBus(); bus.setErrorChannel(errorChannel); assertEquals(errorChannel, bus.getErrorChannel()); } @@ -218,7 +218,7 @@ public class MessageBusTests { @Test public void testHandlerSubscribedToErrorChannel() throws InterruptedException { MessageChannel errorChannel = new QueueChannel(); - MessageBus bus = new MessageBus(); + DefaultMessageBus bus = new DefaultMessageBus(); bus.setErrorChannel(errorChannel); final CountDownLatch latch = new CountDownLatch(1); MessageHandler handler = new MessageHandler() { @@ -241,6 +241,7 @@ public class MessageBusTests { assertTrue(messageBusAwareBean.getMessageBus() == context.getBean("bus")); } + private static class FailingSource implements MessageSource { private CountDownLatch latch; 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 3042de94d3..baae295d65 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 @@ -39,7 +39,7 @@ import org.springframework.integration.message.StringMessage; */ public class DirectChannelSubscriptionTests { - private MessageBus bus = new MessageBus(); + private DefaultMessageBus bus = new DefaultMessageBus(); private MessageChannel sourceChannel = new DirectChannel(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java index 4a34ecb885..1b6750a114 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/interceptor/MessageBusInterceptorTests.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; /** @@ -30,7 +31,7 @@ public class MessageBusInterceptorTests { @Test public void testStart() { - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); TestMessageBusStartInterceptor startInterceptor = new TestMessageBusStartInterceptor(); TestMessageBusStopInterceptor stopInterceptor = new TestMessageBusStopInterceptor(); // add all interceptors 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 4577d9ed87..6ce111ef9d 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/factory/ChannelFactoryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java index ff3aab396b..4a532f63d6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java @@ -32,7 +32,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.integration.bus.DefaultChannelFactoryBean; -import org.springframework.integration.bus.MessageBus; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.DispatcherPolicy; @@ -107,11 +107,11 @@ public class ChannelFactoryTests { @Test public void testDefaultChannelFactoryBean() throws Exception{ - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); ChannelFactory channelFactory = new StubChannelFactory(); messageBus.setChannelFactory(channelFactory); StaticApplicationContext applicationContext = new StaticApplicationContext(); - BeanDefinitionBuilder messageBusDefinitionBuilder = BeanDefinitionBuilder.rootBeanDefinition(MessageBus.class); + BeanDefinitionBuilder messageBusDefinitionBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultMessageBus.class); messageBusDefinitionBuilder.getBeanDefinition().getPropertyValues().addPropertyValue("channelFactory", channelFactory); applicationContext.registerBeanDefinition("messageBus", messageBusDefinitionBuilder.getBeanDefinition()); DefaultChannelFactoryBean channelFactoryBean = new DefaultChannelFactoryBean(dispatcherPolicy); 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 97c5adf48f..8ee5c0e137 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 @@ -31,6 +31,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.TestMessageBusAwareImpl; import org.springframework.integration.bus.interceptor.MessageBusInterceptorTests; @@ -51,7 +52,7 @@ public class MessageBusParserTests { public void testErrorChannelReference() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithErrorChannelReference.xml", this.getClass()); - MessageBus bus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); bus.initialize(); assertEquals(context.getBean("testErrorChannel"), bus.getErrorChannel()); } @@ -60,7 +61,7 @@ public class MessageBusParserTests { public void testDefaultErrorChannel() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithDefaults.xml", this.getClass()); - MessageBus bus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); bus.initialize(); assertNotNull("bus should have created a default error channel", bus.getErrorChannel()); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java index 103b1dbf94..d09d8cadac 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * 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. @@ -32,7 +32,7 @@ import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.annotation.Subscriber; -import org.springframework.integration.bus.MessageBus; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.SubscriberAnnotationPostProcessor; @@ -52,7 +52,7 @@ public class SubscriberAnnotationPostProcessorTests { subscriberDef.getConstructorArgumentValues().addGenericArgumentValue(latch); context.registerBeanDefinition("testBean", subscriberDef); String busBeanName = MessageBusParser.MESSAGE_BUS_BEAN_NAME; - context.registerBeanDefinition(busBeanName, new RootBeanDefinition(MessageBus.class)); + context.registerBeanDefinition(busBeanName, new RootBeanDefinition(DefaultMessageBus.class)); RootBeanDefinition postProcessorDef = new RootBeanDefinition(SubscriberAnnotationPostProcessor.class); postProcessorDef.getPropertyValues().addPropertyValue("messageBus", new RuntimeBeanReference(busBeanName)); context.registerBeanDefinition("postProcessor", postProcessorDef); @@ -78,7 +78,7 @@ public class SubscriberAnnotationPostProcessorTests { subscriberDef.getConstructorArgumentValues().addGenericArgumentValue(latch); context.registerBeanDefinition("testBean", subscriberDef); String busBeanName = MessageBusParser.MESSAGE_BUS_BEAN_NAME; - context.registerBeanDefinition(busBeanName, new RootBeanDefinition(MessageBus.class)); + context.registerBeanDefinition(busBeanName, new RootBeanDefinition(DefaultMessageBus.class)); RootBeanDefinition postProcessorDef = new RootBeanDefinition(SubscriberAnnotationPostProcessor.class); postProcessorDef.getPropertyValues().addPropertyValue("messageBus", new RuntimeBeanReference(busBeanName)); postProcessorDef.getPropertyValues().addPropertyValue("subscriberAnnotationType", CustomSubscriberAnnotation.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 6a5ad0e5e5..041e6e073b 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 @@ -47,6 +47,7 @@ import org.springframework.integration.annotation.MessageTarget; import org.springframework.integration.annotation.Polled; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; @@ -68,7 +69,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testHandlerAnnotation() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); HandlerAnnotatedBean bean = new HandlerAnnotatedBean(); @@ -78,7 +79,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testCustomHandlerAnnotation() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); CustomHandlerAnnotatedBean bean = new CustomHandlerAnnotatedBean(); @@ -158,7 +159,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testTargetAnnotation() throws InterruptedException { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); QueueChannel testChannel = new QueueChannel(); messageBus.registerChannel("testChannel", testChannel); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); @@ -176,7 +177,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testConcurrencyAnnotationWithValues() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); ConcurrencyAnnotationTestBean testBean = new ConcurrencyAnnotationTestBean(); @@ -203,7 +204,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testChannelRegistryAwareBean() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); ChannelRegistryAwareTestBean testBean = new ChannelRegistryAwareTestBean(); @@ -216,7 +217,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testProxiedMessageEndpointAnnotation() { - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); messageBus.setAutoCreateChannels(true); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); @@ -233,7 +234,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInherited() { - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); messageBus.setAutoCreateChannels(true); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); @@ -248,7 +249,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedWithProxy() { - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); messageBus.setAutoCreateChannels(true); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); @@ -265,7 +266,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterface() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessageChannel inputChannel = new QueueChannel(); MessageChannel outputChannel = new QueueChannel(); messageBus.registerChannel("inputChannel", inputChannel); @@ -281,7 +282,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterfaceWithAutoCreatedChannels() { - MessageBus messageBus = new MessageBus(); + DefaultMessageBus messageBus = new DefaultMessageBus(); messageBus.setAutoCreateChannels(true); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); @@ -296,7 +297,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageEndpointAnnotationInheritedFromInterfaceWithProxy() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessageChannel inputChannel = new QueueChannel(); MessageChannel outputChannel = new QueueChannel(); messageBus.registerChannel("inputChannel", inputChannel); @@ -314,7 +315,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testSplitterAnnotation() throws InterruptedException { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); QueueChannel input = new QueueChannel(); QueueChannel output = new QueueChannel(); messageBus.registerChannel("input", input); @@ -342,7 +343,7 @@ public class MessagingAnnotationPostProcessorTests { @Test(expected=ConfigurationException.class) public void testEndpointWithNoHandlerMethod() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); QueueChannel testChannel = new QueueChannel(); messageBus.registerChannel("testChannel", testChannel); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); @@ -353,7 +354,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testEndpointWithPolledAnnotation() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); QueueChannel testChannel = new QueueChannel(); messageBus.registerChannel("testChannel", testChannel); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); @@ -372,7 +373,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testMessageSourceAnnotation() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); QueueChannel testChannel = new QueueChannel(); messageBus.registerChannel("testChannel", testChannel); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); @@ -387,7 +388,7 @@ public class MessagingAnnotationPostProcessorTests { @Test public void testHandlerWithTransformers() { - MessageBus messageBus = new MessageBus(); + MessageBus messageBus = new DefaultMessageBus(); MessagingAnnotationPostProcessor postProcessor = new MessagingAnnotationPostProcessor(messageBus); postProcessor.afterPropertiesSet(); HandlerWithTransformers testBean = new HandlerWithTransformers(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml index 558707113e..952ce0d1a3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml index f745f4cbfb..b920f03eaa 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml index 57d9a266f4..16b6b156f3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml index 3228d4ebc3..d1327fd0bc 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml index 7f0e3ebbc9..a362291c5a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml @@ -9,6 +9,6 @@ - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml index 12dc2d03b3..66f2f826f9 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"> - + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java index a2b7ce37a8..2686f063f3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/RequestReplyTemplateTests.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.MessageHandler; @@ -48,7 +49,7 @@ public class RequestReplyTemplateTests { return new StringMessage(message.getPayload().toString().toUpperCase()); } }; - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); bus.registerChannel("requestChannel", requestChannel); bus.registerHandler("testHandler", testHandler, requestChannel, null); bus.start(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java index beff0deb58..93494cc678 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java @@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; +import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.handler.MethodInvokingTarget; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; @@ -90,7 +90,7 @@ public class MethodInvokingTargetTests { Message message = new GenericMessage("123", "testing"); channel.send(message); assertNull(queue.poll()); - MessageBus bus = new MessageBus(); + MessageBus bus = new DefaultMessageBus(); bus.registerChannel("channel", channel); bus.registerHandler("targetAdapter", target, channel, null); bus.start(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml index 76413563c9..868ad5456f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - +