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

INT-793, INT-1004 Using an inner class for the actual Notification-publishing MBean.

Browse Source
This commit is contained in:
Mark Fisher
2010-03-02 18:46:08 +00:00
parent 1a38553402
commit 9b3208c89a
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java
View File

@@ -34,7 +34,7 @@ class DefaultNotificationMapper implements OutboundMessageMapper<Notification> {
private final ObjectName sourceObjectName;
private volatile String defaultNotificationType = "SpringIntegrationNotification";
private volatile String defaultNotificationType = "org.springframework.integration.jmx.event";
private final AtomicInteger sequence = new AtomicInteger();

31
org.springframework.integration.jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingAdapter.java
View File

@@ -41,9 +41,9 @@ import org.springframework.util.Assert;
* @since 2.0
*/
public class NotificationPublishingAdapter extends AbstractMessageHandler
implements NotificationPublisherAware, BeanNameAware, BeanFactoryAware, InitializingBean {
implements BeanNameAware, BeanFactoryAware, InitializingBean {
private volatile NotificationPublisher notificationPublisher;
private final PublisherDelegate delegate = new PublisherDelegate();
private volatile OutboundMessageMapper<Notification> notificationMapper;
@@ -67,10 +67,6 @@ public class NotificationPublishingAdapter extends AbstractMessageHandler
this.notificationMapper = notificationMapper;
}
public void setNotificationPublisher(NotificationPublisher notificationPublisher) {
this.notificationPublisher = notificationPublisher;
}
public void setBeanName(String beanName) {
this.beanName = beanName;
}
@@ -94,16 +90,31 @@ public class NotificationPublishingAdapter extends AbstractMessageHandler
if (this.notificationMapper == null) {
this.notificationMapper = new DefaultNotificationMapper(this.objectName);
}
exporter.registerManagedResource(this, ObjectNameManager.getInstance(this.objectName));
exporter.registerManagedResource(this.delegate, ObjectNameManager.getInstance(this.objectName));
if (this.logger.isInfoEnabled()) {
this.logger.info("Registered NotificationPublishingAdapter as MBean with ObjectName: " + this.objectName);
this.logger.info("Registered JMX notification publisher as MBean with ObjectName: " + this.objectName);
}
}
@Override
protected void handleMessageInternal(Message<?> message) throws Exception {
Assert.state(this.notificationPublisher != null, "NotificationPublisher must not be null.");
this.notificationPublisher.sendNotification(this.notificationMapper.fromMessage(message));
Assert.state(delegate != null, "NotificationPublisher is required");
this.delegate.publish(this.notificationMapper.fromMessage(message));
}
private static class PublisherDelegate implements NotificationPublisherAware {
private volatile NotificationPublisher notificationPublisher;
public void setNotificationPublisher(NotificationPublisher notificationPublisher) {
this.notificationPublisher = notificationPublisher;
}
private void publish(Notification notification) {
Assert.state(this.notificationPublisher != null, "NotificationPublisher must not be null.");
this.notificationPublisher.sendNotification(notification);
}
}
}

3
org.springframework.integration.jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingAdapterTests.java
View File

@@ -61,6 +61,7 @@ public class NotificationPublishingAdapterTests {
@After
public void cleanup() {
this.listener.clearNotifications();
context.close();
}
@@ -73,7 +74,7 @@ public class NotificationPublishingAdapterTests {
Notification notification = this.listener.notifications.get(0);
assertEquals(this.publisherObjectName, notification.getSource());
assertEquals("foo", notification.getMessage());
assertEquals("SpringIntegrationNotification", notification.getType());
assertEquals("org.springframework.integration.jmx.event", notification.getType());
}