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

MessagingAnnotationPostProcessor now registers endpoints with the MessageBus so that they may be activated even if the bus has already detected endpoint beans from the context (INT-386). For an example, see: AnnotatedEndpointActivationTests. Although it does not impact this particular scenario, a related change is that the message bus no longer registers endpoint beans after receiving the application context refresh event. Instead it will retrieve all beans from the context when start() is invoked. It maintains a set of endpoints that also includes those registered only with the bus itself (not in the application context).

Browse Source
This commit is contained in:
Mark Fisher
2008-10-08 19:43:08 +00:00
parent 4ddfc680ae
commit 46e76afa53
4 changed files with 135 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
private final Map<String, MessageChannel> channels = new ConcurrentHashMap<String, MessageChannel>();
private final Set<MessageEndpoint> endpoints = new CopyOnWriteArraySet<MessageEndpoint>();
private final MessageBusInterceptorsList interceptors = new MessageBusInterceptorsList();
private final Set<Lifecycle> lifecycleGateways = new CopyOnWriteArraySet<Lifecycle>();
@@ -138,15 +140,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
}
}
@SuppressWarnings("unchecked")
private void registerEndpoints(ApplicationContext context) {
Map<String, MessageEndpoint> endpointBeans = (Map<String, MessageEndpoint>) context
.getBeansOfType(MessageEndpoint.class);
for (Map.Entry<String, MessageEndpoint> entry : endpointBeans.entrySet()) {
this.registerEndpoint(entry.getValue());
}
}
@SuppressWarnings("unchecked")
private void registerGateways(ApplicationContext context) {
Map<String, MessagingGateway> gatewayBeans = (Map<String, MessagingGateway>) context
@@ -200,6 +193,9 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
public void registerEndpoint(MessageEndpoint endpoint) {
Assert.notNull(endpoint, "'endpoint' must not be null");
if (!this.endpoints.contains(endpoint)) {
this.endpoints.add(endpoint);
}
if (this.isRunning()) {
this.activateEndpoint(endpoint);
}
@@ -220,7 +216,8 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
private Collection<MessageEndpoint> getEndpoints() {
GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
return accessor.getBeansOfType(MessageEndpoint.class).values();
this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
return this.endpoints;
}
private void activateEndpoints() {
@@ -341,7 +338,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
if (event instanceof ContextRefreshedEvent) {
ApplicationContext context = ((ContextRefreshedEvent) event).getApplicationContext();
this.registerChannels(context);
this.registerEndpoints(context);
this.registerGateways(context);
if (this.configureAsyncEventMulticaster) {
this.initialize();

1
org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
View File

@@ -112,6 +112,7 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Bean
((BeanNameAware) result).setBeanName(endpointBeanName);
}
beanFactory.registerSingleton(endpointBeanName, result);
messageBus.registerEndpoint((MessageEndpoint) result);
}
}
}