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

INT-1816 added support for multiple non-conflicting mbean exporters

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-03-09 12:49:04 -05:00
parent 0b5f3b20e4
commit 1b3e7ce6e9
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java
View File

@@ -31,7 +31,9 @@ import org.junit.Test;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.StaticApplicationContext;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.monitor.IntegrationMBeanExporter;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.jmx.support.ObjectNameManager;
@@ -51,13 +53,17 @@ public class NotificationPublishingMessageHandlerTests {
@Before
public void setup() throws Exception {
this.publisherObjectName = ObjectNameManager.getInstance("test:type=publisher");
context.registerSingleton("exporter", MBeanExporter.class);
// deliberately registering two exporters (one SI specific and one generic)
// should not fail INT-1816
context.registerSingleton("exporter", IntegrationMBeanExporter.class);
context.registerSingleton("anotherExporter", MBeanExporter.class);
RootBeanDefinition publisherDefinition = new RootBeanDefinition(NotificationPublishingMessageHandler.class);
publisherDefinition.getConstructorArgumentValues().addGenericArgumentValue(this.publisherObjectName);
publisherDefinition.getPropertyValues().add("defaultNotificationType", "test.type");
context.registerBeanDefinition("testPublisher", publisherDefinition);
context.registerBeanDefinition("testPublisher", publisherDefinition);
context.refresh();
MBeanExporter exporter = context.getBean(MBeanExporter.class);
MBeanExporter exporter = context.getBean(IntegrationMBeanExporter.class);
exporter.getServer().addNotificationListener(publisherObjectName, this.listener, null, null);
}
@@ -70,9 +76,9 @@ public class NotificationPublishingMessageHandlerTests {
@Test
public void simplePublish() {
NotificationPublishingMessageHandler adapter = context.getBean(NotificationPublishingMessageHandler.class);
MessageHandler handler = context.getBean("testPublisher", MessageHandler.class);
assertEquals(0, this.listener.notifications.size());
adapter.handleMessage(new GenericMessage<String>("foo"));
handler.handleMessage(new GenericMessage<String>("foo"));
assertEquals(1, this.listener.notifications.size());
Notification notification = this.listener.notifications.get(0);
assertEquals(this.publisherObjectName, notification.getSource());
@@ -80,7 +86,6 @@ public class NotificationPublishingMessageHandlerTests {
assertEquals("test.type", notification.getType());
}
public static class TestNotificationListener implements NotificationListener {
private final List<Notification> notifications = new ArrayList<Notification>();

1
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml
View File

@@ -15,6 +15,7 @@
<context:mbean-export/>
<context:mbean-server/>
<jmx:mbean-export/>
<si:channel id="channel"/>