Refactored the 'jms-target' element to an 'outbound-channel-adapter' element within the 'jms' namespace.

This commit is contained in:
Mark Fisher
2008-10-12 03:23:48 +00:00
parent 6873274353
commit 118dc27b7c
10 changed files with 77 additions and 57 deletions

View File

@@ -20,11 +20,12 @@ import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageConsumer;
/**
* A target for sending JMS Messages.
* A MessageConsumer that sends the converted Message payload within
* a JMS Message.
*
* @author Mark Fisher
*/
public class JmsTarget extends AbstractJmsTemplateBasedAdapter implements MessageConsumer {
public class JmsSendingMessageConsumer extends AbstractJmsTemplateBasedAdapter implements MessageConsumer {
public final void onMessage(final Message<?> message) {
if (message == null) {

View File

@@ -28,7 +28,7 @@ public class JmsNamespaceHandler extends NamespaceHandlerSupport {
public void init() {
this.registerBeanDefinitionParser("jms-gateway", new JmsGatewayParser());
this.registerBeanDefinitionParser("inbound-channel-adapter", new JmsInboundChannelAdapterParser());
this.registerBeanDefinitionParser("jms-target", new JmsTargetParser());
this.registerBeanDefinitionParser("outbound-channel-adapter", new JmsOutboundChannelAdapterParser());
}
}

View File

@@ -19,10 +19,11 @@ package org.springframework.integration.jms.config;
import org.w3c.dom.Element;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.jms.JmsTarget;
import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
import org.springframework.integration.jms.JmsSendingMessageConsumer;
import org.springframework.util.StringUtils;
/**
@@ -30,21 +31,11 @@ import org.springframework.util.StringUtils;
*
* @author Mark Fisher
*/
public class JmsTargetParser extends AbstractSingleBeanDefinitionParser {
public class JmsOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
protected Class<?> getBeanClass(Element element) {
return JmsTarget.class;
}
protected boolean shouldGenerateId() {
return false;
}
protected boolean shouldGenerateIdAsFallback() {
return true;
}
protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
@Override
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsSendingMessageConsumer.class);
String jmsTemplate = element.getAttribute(JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE);
String destination = element.getAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE);
String destinationName = element.getAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE);
@@ -53,7 +44,7 @@ public class JmsTargetParser extends AbstractSingleBeanDefinitionParser {
if (element.hasAttribute(JmsAdapterParserUtils.CONNECTION_FACTORY_ATTRIBUTE) ||
element.hasAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE) ||
element.hasAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE)) {
throw new BeanCreationException("when providing a 'jms-template' reference, none of " +
throw new BeanCreationException("When providing a 'jms-template' reference, none of " +
"'connection-factory', 'destination', or 'destination-name' should be provided.");
}
builder.addPropertyReference(JmsAdapterParserUtils.JMS_TEMPLATE_PROPERTY, jmsTemplate);
@@ -69,12 +60,13 @@ public class JmsTargetParser extends AbstractSingleBeanDefinitionParser {
}
}
else {
throw new BeanCreationException("Either a 'jms-template' reference or " +
"one of 'destination' or 'destination-name' attributes must be provided.");
throw new BeanCreationException("Either a 'jms-template' reference " +
"or one of 'destination' or 'destination-name' must be provided.");
}
if (StringUtils.hasText(headerMapper)) {
builder.addPropertyReference(JmsAdapterParserUtils.HEADER_MAPPER_PROPERTY, headerMapper);
}
return builder.getBeanDefinition();
}
}

View File

@@ -62,15 +62,16 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-target">
<xsd:element name="outbound-channel-adapter">
<xsd:annotation>
<xsd:documentation>
Defines a target that sends JMS Messages.
Defines an outbound JMS Message-sending Channel Adapter.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsAdapterType">
<xsd:attribute name="channel" type="xsd:string"/>
<xsd:attribute name="header-mapper" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>