diff --git a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml index 38e093edfb..6bd308ef43 100644 --- a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml +++ b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml @@ -1,10 +1,13 @@ - - + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/integration + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> + + 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/DefaultMessageBus.java index 8b8ddfec36..ffc2f2d20a 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/DefaultMessageBus.java @@ -26,6 +26,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor; @@ -35,7 +36,6 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.Lifecycle; import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.integration.ConfigurationException; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; @@ -119,10 +119,7 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A return; } Assert.notNull(this.applicationContext, "ApplicationContext must not be null"); - //TODO: Assert.notNull(this.taskScheduler, "TaskScheduler must not be null"); - if (this.taskScheduler == null) { - this.taskScheduler = new SimpleTaskScheduler(new SimpleAsyncTaskExecutor()); - } + Assert.notNull(this.taskScheduler, "TaskScheduler must not be null"); if (this.getErrorChannel() == null) { this.registerChannel(new DefaultErrorChannel()); } 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 b7b08800a6..27298cab44 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 @@ -36,6 +36,7 @@ import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -55,6 +56,7 @@ public class DirectChannelSubscriptionTests { targetChannel.setBeanName("targetChannel"); bus.registerChannel(sourceChannel); bus.registerChannel(targetChannel); + bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); } 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 d75a26c4d0..8477aae7b8 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 @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.bus.MessageBus; +import org.springframework.integration.util.TestUtils; /** * @author Marius Bogoevici @@ -33,6 +34,7 @@ public class MessageBusInterceptorTests { @Test public void testStart() { DefaultMessageBus messageBus = new DefaultMessageBus(); + messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); messageBus.setApplicationContext(new GenericApplicationContext()); TestMessageBusStartInterceptor startInterceptor = new TestMessageBusStartInterceptor(); TestMessageBusStopInterceptor stopInterceptor = new TestMessageBusStopInterceptor(); 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 24de10a9b3..8353cb397f 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 @@ -36,6 +36,7 @@ import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -60,6 +61,7 @@ public class MessageChannelTemplateTests { context.getBeanFactory().registerSingleton("requestChannel", requestChannel); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); DefaultMessageBus bus = new DefaultMessageBus(); + bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); } 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 7abdebb44f..675f97c048 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 @@ -33,6 +33,7 @@ import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.message.StringMessage; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -48,7 +49,9 @@ public class ServiceActivatorAnnotationPostProcessorTests { beanDefinition.getConstructorArgumentValues().addGenericArgumentValue(latch); context.registerBeanDefinition("testBean", beanDefinition); String busBeanName = MessageBusParser.MESSAGE_BUS_BEAN_NAME; - context.registerBeanDefinition(busBeanName, new RootBeanDefinition(DefaultMessageBus.class)); + RootBeanDefinition busBeanDefinition = new RootBeanDefinition(DefaultMessageBus.class); + busBeanDefinition.getPropertyValues().addPropertyValue("taskScheduler", TestUtils.createTaskScheduler(10)); + context.registerBeanDefinition(busBeanName, busBeanDefinition); RootBeanDefinition postProcessorDef = new RootBeanDefinition(MessagingAnnotationPostProcessor.class); context.registerBeanDefinition("postProcessor", postProcessorDef); context.refresh(); 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 817f8de3a8..c47924628a 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 @@ -30,6 +30,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.MessageBusParser; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -48,6 +49,7 @@ public class RouterAnnotationPostProcessorTests { @Before public void init() { messageBus.setApplicationContext(context); + messageBus.setTaskScheduler(TestUtils.createTaskScheduler(10)); inputChannel.setBeanName("input"); outputChannel.setBeanName("output"); context.getBeanFactory().registerSingleton("input", inputChannel); 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 10dde19dcb..78eaac3066 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 @@ -32,6 +32,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.MessageBusParser; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -55,6 +56,7 @@ public class SplitterAnnotationPostProcessorTests { context.getBeanFactory().registerSingleton("output", outputChannel); 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/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml index 7e9665172e..7871883fb7 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-1.0.xsd"> - + 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 e156fc4169..2bf26654b8 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 @@ -31,6 +31,7 @@ import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ServiceActivatorEndpoint; +import org.springframework.integration.util.TestUtils; /** * @author Mark Fisher @@ -87,6 +88,7 @@ public class MethodInvokingConsumerTests { PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(serivceActivator, channel); context.getBeanFactory().registerSingleton("testEndpoint", endpoint); DefaultMessageBus bus = new DefaultMessageBus(); + bus.setTaskScheduler(TestUtils.createTaskScheduler(10)); bus.setApplicationContext(context); bus.start(); String result = queue.poll(1000, TimeUnit.MILLISECONDS);