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

added namespace support for the 'default-notification-type' on the notification-publishing-channel-adapter

Browse Source
This commit is contained in:
Mark Fisher
2010-03-12 20:06:01 +00:00
parent dab427547a
commit f27891530b
4 changed files with 16 additions and 1 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/config/NotificationPublishingChannelAdapterParser.java
View File

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
/**
* @author Mark Fisher
@@ -34,6 +35,7 @@ public class NotificationPublishingChannelAdapterParser extends AbstractOutbound
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
"org.springframework.integration.jmx.NotificationPublishingMessageHandler");
builder.addConstructorArgValue(element.getAttribute("object-name"));
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "default-notification-type");
return builder.getBeanDefinition();
}

1
org.springframework.integration.jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd
View File

@@ -80,6 +80,7 @@
<xsd:attribute name="id" type="xsd:string" use="optional"/>
<xsd:attribute name="channel" type="xsd:string" use="required"/>
<xsd:attribute name="object-name" type="xsd:string" use="required"/>
<xsd:attribute name="default-notification-type" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>

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

@@ -20,7 +20,8 @@
<jmx:notification-publishing-channel-adapter
id="adapter" channel="channel"
object-name="test.publisher:name=publisher"/>
object-name="test.publisher:name=publisher"
default-notification-type="default.type"/>
<bean id="testListener" class="org.springframework.integration.jmx.config.TestListener"/>

11
org.springframework.integration.jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
View File

@@ -81,6 +81,17 @@ public class NotificationPublishingChannelAdapterParserTests {
assertEquals("test.type", notification.getType());
}
@Test
public void defaultNotificationType() throws Exception {
assertNull(listener.lastNotification);
Message<?> message = MessageBuilder.withPayload("test").build();
channel.send(message);
assertNotNull(listener.lastNotification);
Notification notification = listener.lastNotification;
assertEquals("default.type", notification.getType());
}
private static class TestData {
}