From 93a2d2c9f20edaa7467b3971c562c63b30cd80ed Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 21 Nov 2008 17:39:01 +0000 Subject: [PATCH] Renamed the 'parseConsumer' method to 'parseHandler' since it creates an implementation of MessageHandler. --- .../adapter/config/AbstractRemotingOutboundGatewayParser.java | 2 +- .../integration/jms/config/JmsOutboundGatewayParser.java | 2 +- .../integration/xml/config/XPathMessageSplitterParser.java | 2 +- .../integration/xml/config/XPathRouterParser.java | 2 +- .../config/xml/AbstractConsumerEndpointParser.java | 4 ++-- .../integration/config/xml/AbstractTransformerParser.java | 2 +- .../integration/config/xml/AggregatorParser.java | 2 +- .../springframework/integration/config/xml/FilterParser.java | 2 +- .../integration/config/xml/ResequencerParser.java | 2 +- .../springframework/integration/config/xml/RouterParser.java | 2 +- .../integration/config/xml/ServiceActivatorParser.java | 2 +- .../integration/config/xml/SplitterParser.java | 2 +- .../integration/config/xml/TransformerParser.java | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java index 22bb6f028f..7a195576ee 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java @@ -54,7 +54,7 @@ public abstract class AbstractRemotingOutboundGatewayParser extends AbstractCons } @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(this.getGatewayClass(element)); String url = this.parseUrl(element); builder.addConstructorArgValue(url); diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java index 79d8b02b2b..d53767384e 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java @@ -37,7 +37,7 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser { } @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsOutboundGateway.class); builder.addPropertyReference("connectionFactory", element.getAttribute("connection-factory")); builder.addPropertyReference("requestDestination", element.getAttribute("request-destination")); diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathMessageSplitterParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathMessageSplitterParser.java index ed5f2b7c24..a6abdeb488 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathMessageSplitterParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathMessageSplitterParser.java @@ -46,7 +46,7 @@ public class XPathMessageSplitterParser extends AbstractConsumerEndpointParser { } @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XPathMessageSplitter.class); String xPathExpressionRef = element.getAttribute("xpath-expression-ref"); NodeList xPathExpressionNodes = element.getElementsByTagNameNS(element.getNamespaceURI(), "xpath-expression"); diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java index cf4910a16c..3ad4a5c10a 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java @@ -47,7 +47,7 @@ public class XPathRouterParser extends AbstractConsumerEndpointParser { } @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(); boolean multiChannel = Boolean.parseBoolean(element.getAttribute("multi-channel")); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java index 2ea1d92317..eaaa78dfd4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java @@ -64,7 +64,7 @@ public abstract class AbstractConsumerEndpointParser extends AbstractSingleBeanD /** * Parse the MessageConsumer. */ - protected abstract BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext); + protected abstract BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext); protected String getInputChannelAttributeName() { return "input-channel"; @@ -72,7 +72,7 @@ public abstract class AbstractConsumerEndpointParser extends AbstractSingleBeanD @Override protected final void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - BeanDefinitionBuilder consumerBuilder = this.parseConsumer(element, parserContext); + BeanDefinitionBuilder consumerBuilder = this.parseHandler(element, parserContext); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(consumerBuilder, element, OUTPUT_CHANNEL_ATTRIBUTE); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(consumerBuilder, element, SELECTOR_ATTRIBUTE); String consumerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName( diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java index 5a77be92ac..e2b4faa0cf 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java @@ -30,7 +30,7 @@ import org.springframework.integration.transformer.MessageTransformingHandler; public abstract class AbstractTransformerParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageTransformingHandler.class); BeanDefinitionBuilder transformerBuilder = BeanDefinitionBuilder.genericBeanDefinition(this.getTransformerClass()); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java index a984de11ec..58cb747ee9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java @@ -55,7 +55,7 @@ public class AggregatorParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MethodInvokingAggregator.class); String ref = element.getAttribute(REF_ATTRIBUTE); Assert.hasText(ref, "The '" + REF_ATTRIBUTE + "' attribute is required."); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java index e0cb5dea17..607e5858bd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; public class FilterParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageFilter.class); builder.addConstructorArgReference(this.parseSelector(element, parserContext)); return builder; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java index 888657d68c..aadf67e209 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java @@ -45,7 +45,7 @@ public class ResequencerParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(Resequencer.class); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, DISCARD_CHANNEL_ATTRIBUTE); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, SEND_TIMEOUT_ATTRIBUTE); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java index 02d1145f89..06eaf98c99 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; public class RouterParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { String ref = element.getAttribute(REF_ATTRIBUTE); Assert.hasText(ref, "The '" + REF_ATTRIBUTE + "' attribute is required."); BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(RouterFactoryBean.class); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java index 5e8794d54b..ff21605663 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java @@ -32,7 +32,7 @@ import org.springframework.util.StringUtils; public class ServiceActivatorParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ServiceActivatingHandler.class); String ref = element.getAttribute(REF_ATTRIBUTE); Assert.hasText(ref, "The '" + REF_ATTRIBUTE + "' attribute is required."); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java index 965c5c9118..2850d183ca 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java @@ -31,7 +31,7 @@ import org.springframework.util.StringUtils; public class SplitterParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SplitterFactoryBean.class); if (element.hasAttribute(REF_ATTRIBUTE)) { String ref = element.getAttribute(REF_ATTRIBUTE); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java index a1c692d3b8..7db2b39576 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; public class TransformerParser extends AbstractConsumerEndpointParser { @Override - protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) { + protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageTransformingHandler.class); builder.addConstructorArgReference(this.parseTransformer(element, parserContext)); return builder;