diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java index 8d73d916ac..0d4aa3d576 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java @@ -50,7 +50,7 @@ import org.springframework.util.Assert; * @author Mark Fisher * @author Marius Bogoevici */ -public class ApplicationContextMessageBus implements MessageBus, ChannelResolver, ApplicationContextAware, ApplicationListener, DisposableBean { +public class ApplicationContextMessageBus implements Lifecycle, ChannelResolver, ApplicationContextAware, ApplicationListener, DisposableBean { public static final String ERROR_CHANNEL_BEAN_NAME = "errorChannel"; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java deleted file mode 100644 index 4a7a04955e..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java +++ /dev/null @@ -1,28 +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.bus; - -import org.springframework.context.Lifecycle; - -/** - * The message bus interface. - * - * @author Mark Fisher - */ -public interface MessageBus extends Lifecycle { - -} 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 37643c5a8c..c0ac34f770 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 @@ -34,7 +34,6 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.bus.ApplicationContextMessageBus; -import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; @@ -68,7 +67,7 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { Assert.state(!parserContext.getRegistry().containsBeanDefinition(MESSAGE_BUS_BEAN_NAME), - "Only one instance of '" + MessageBus.class.getSimpleName() + "' is allowed per ApplicationContext."); + "Only one Message Bus is allowed per ApplicationContext."); return MESSAGE_BUS_BEAN_NAME; } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java index 89a1a04924..e0cf01658a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.context.Lifecycle; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.channel.BeanFactoryChannelResolver; @@ -118,7 +119,7 @@ public class ApplicationContextMessageBusTests { PollableChannel sourceChannel = (PollableChannel) context.getBean("sourceChannel"); sourceChannel.send(new GenericMessage("test")); PollableChannel targetChannel = (PollableChannel) context.getBean("targetChannel"); - MessageBus bus = (MessageBus) context.getBean("bus"); + Lifecycle bus = (Lifecycle) context.getBean("bus"); bus.start(); Message result = targetChannel.receive(1000); assertEquals("test", result.getPayload()); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusEventTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusEventTests.java index 652d145bd6..a6e0a4fe6f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusEventTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusEventTests.java @@ -74,25 +74,25 @@ public class MessageBusEventTests { public static class TestMessageBusListener implements ApplicationListener { - private volatile MessageBus startedBus; + private volatile ApplicationContextMessageBus startedBus; - private volatile MessageBus stoppedBus; + private volatile ApplicationContextMessageBus stoppedBus; - public MessageBus getStartedBus() { + public ApplicationContextMessageBus getStartedBus() { return this.startedBus; } - public MessageBus getStoppedBus() { + public ApplicationContextMessageBus getStoppedBus() { return this.stoppedBus; } public void onApplicationEvent(ApplicationEvent event) { if (event instanceof MessageBusStartedEvent) { - this.startedBus = (MessageBus) event.getSource(); + this.startedBus = (ApplicationContextMessageBus) event.getSource(); } if (event instanceof MessageBusStoppedEvent) { - this.stoppedBus = (MessageBus) event.getSource(); + this.stoppedBus = (ApplicationContextMessageBus) event.getSource(); } } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml index cf612d688b..2e6ab1b168 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml @@ -4,8 +4,8 @@ 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/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index b3c8b97018..986fb42127 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 @@ -27,12 +27,12 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.ApplicationContext; +import org.springframework.context.Lifecycle; 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.ApplicationContextMessageBus; -import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.MessageBusEventTests.TestMessageBusListener; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.MessageChannel; @@ -94,7 +94,7 @@ public class MessageBusParserTests { public void testAutoStartup() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithAutoStartup.xml", this.getClass()); - MessageBus bus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + Lifecycle bus = (Lifecycle) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); assertTrue(bus.isRunning()); bus.stop(); } @@ -138,7 +138,7 @@ public class MessageBusParserTests { public void testMessageBusEventListenerReceivesStartedEvent() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithListener.xml", this.getClass()); - MessageBus messageBus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + Lifecycle messageBus = (Lifecycle) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); TestMessageBusListener listener = (TestMessageBusListener) context.getBean("listener"); assertNull(listener.getStartedBus()); assertNull(listener.getStoppedBus()); @@ -152,7 +152,7 @@ public class MessageBusParserTests { public void testMessageBusEventListenerReceivesStoppedEvent() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithListener.xml", this.getClass()); - MessageBus messageBus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + Lifecycle messageBus = (Lifecycle) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); TestMessageBusListener listener = (TestMessageBusListener) context.getBean("listener"); assertNull(listener.getStoppedBus()); messageBus.start(); @@ -165,7 +165,7 @@ public class MessageBusParserTests { public void testMessageBusWithTaskScheduler() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithTaskScheduler.xml", this.getClass()); - MessageBus messageBus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); + Object messageBus = context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); StubTaskScheduler schedulerBean = (StubTaskScheduler) context.getBean("testScheduler"); TaskScheduler busScheduler = (TaskScheduler) new DirectFieldAccessor(messageBus).getPropertyValue("taskScheduler"); assertNotNull(busScheduler); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java index d74c185841..f1e2f03a1a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.bus.MessageBus; +import org.springframework.integration.bus.ApplicationContextMessageBus; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; @@ -55,7 +55,7 @@ public class AnnotatedEndpointActivationTests { private PollableChannel output; @Autowired - private MessageBus messageBus; + private ApplicationContextMessageBus messageBus; // This has to be static because the MessageBus registers the handler // more than once (every time a test instance is created), but only one of