Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganized DefaultMessageBus methods.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-15 16:19:04 +00:00
parent 8e24ef2dd0
commit 0afc835679
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
View File

@@ -43,8 +43,11 @@ import org.springframework.integration.scheduling.TaskSchedulerAware;
import org.springframework.util.Assert;
/**
* The messaging bus. Serves as a registry for channels and endpoints, manages their lifecycle,
* and activates subscriptions.
* Spring Integration's standard Message Bus implementation. Serves as a
* registry for Messages Endpoints. Manages their lifecycle, activates
* subscriptions, and schedules pollers by delegating to a
* {@link TaskScheduler}. Retrieves MessageChannels from the
* ApplicationContext based on bean name.
*
* @author Mark Fisher
* @author Marius Bogoevici
@@ -96,17 +99,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
this.autoStartup = autoStartup;
}
public void initialize() {
synchronized (this.lifecycleMonitor) {
if (this.initialized) {
return;
}
Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
Assert.notNull(this.taskScheduler, "TaskScheduler must not be null");
this.initialized = true;
}
}
public MessageChannel lookupChannel(String channelName) {
Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
if (this.applicationContext.containsBean(channelName)) {
@@ -128,12 +120,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
return null;
}
private Collection<MessageEndpoint> getEndpoints() {
GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
return this.endpoints;
}
public void registerEndpoint(MessageEndpoint endpoint) {
Assert.notNull(endpoint, "'endpoint' must not be null");
if (!this.endpoints.contains(endpoint)) {
@@ -147,6 +133,12 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
}
}
private Collection<MessageEndpoint> getEndpoints() {
GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
return this.endpoints;
}
private void activateEndpoints() {
for (MessageEndpoint endpoint : this.getEndpoints()) {
if (endpoint != null) {
@@ -233,6 +225,23 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
}
}
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ContextRefreshedEvent && this.autoStartup) {
this.start();
}
}
private void initialize() {
synchronized (this.lifecycleMonitor) {
if (this.initialized) {
return;
}
Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
Assert.notNull(this.taskScheduler, "TaskScheduler must not be null");
this.initialized = true;
}
}
public void destroy() throws Exception {
this.stop();
if (this.taskScheduler instanceof DisposableBean) {
@@ -240,12 +249,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
}
}
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ContextRefreshedEvent && this.autoStartup) {
this.start();
}
}
public void addInterceptor(MessageBusInterceptor interceptor) {
this.interceptors.add(interceptor);
}

2
org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
View File

@@ -52,7 +52,6 @@ public class MessageBusParserTests {
ApplicationContext context = new ClassPathXmlApplicationContext(
"messageBusWithErrorChannel.xml", this.getClass());
DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME);
bus.initialize();
MessageChannel channel = bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME);
assertEquals(context.getBean("errorChannel"), channel);
}
@@ -62,7 +61,6 @@ public class MessageBusParserTests {
ApplicationContext context = new ClassPathXmlApplicationContext(
"messageBusWithDefaults.xml", this.getClass());
DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME);
bus.initialize();
assertNotNull("parser should have created a default error channel",
bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME));
}