diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java deleted file mode 100644 index 38a572b445..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.config; - -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.RuntimeBeanReference; -import org.springframework.beans.factory.parsing.BeanComponentDefinition; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.ManagedList; -import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; -import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.ConfigurationException; -import org.springframework.integration.scheduling.PollingSchedule; -import org.springframework.integration.scheduling.Schedule; -import org.springframework.util.StringUtils; - -/** - * Base class for target-endpoint and handler-endpoint parsers. - * - * @author Mark Fisher - */ -public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDefinitionParser { - - private static final String INPUT_CHANNEL_ATTRIBUTE = "input-channel"; - - private static final String SELECTOR_ATTRIBUTE = "selector"; - - private static final String SELECTOR_PROPERTY = "messageSelector"; - - private static final String PERIOD_ATTRIBUTE = "period"; - - private static final String SCHEDULE_ELEMENT = "schedule"; - - private static final String INTERCEPTORS_ELEMENT = "interceptors"; - - - @Override - protected boolean shouldGenerateId() { - return false; - } - - @Override - protected boolean shouldGenerateIdAsFallback() { - return true; - } - - @Override - protected abstract Class getBeanClass(Element element); - - protected abstract String getTargetAttributeName(); - - protected abstract Class getAdapterClass(); - - protected void postProcess(BeanDefinitionBuilder builder, Element element) { - } - - @Override - protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - this.parseTarget(element, this.getTargetAttributeName(), parserContext, builder); - String inputChannelName = element.getAttribute(INPUT_CHANNEL_ATTRIBUTE); - Schedule schedule = null; - NodeList childNodes = element.getChildNodes(); - for (int i = 0; i < childNodes.getLength(); i++) { - Node child = childNodes.item(i); - if (child.getNodeType() == Node.ELEMENT_NODE) { - Element childElement = (Element) child; - String localName = child.getLocalName(); - if (SCHEDULE_ELEMENT.equals(localName)) { - schedule = this.parseSchedule(childElement); - } - else if (INTERCEPTORS_ELEMENT.equals(localName)) { - EndpointInterceptorParser parser = new EndpointInterceptorParser(); - ManagedList interceptors = parser.parseEndpointInterceptors(childElement, parserContext); - builder.addPropertyValue("interceptors", interceptors); - } - } - } - if (StringUtils.hasText(inputChannelName)) { - builder.addPropertyValue("inputChannelName", inputChannelName); - } - if (schedule != null) { - builder.addPropertyValue("schedule", schedule); - } - String selectorRef = element.getAttribute(SELECTOR_ATTRIBUTE); - if (StringUtils.hasText(selectorRef)) { - builder.addPropertyReference(SELECTOR_PROPERTY, selectorRef); - } - this.postProcess(builder, element); - } - - private void parseTarget(Element element, String attribute, ParserContext parserContext, BeanDefinitionBuilder builder) { - String ref = element.getAttribute(attribute); - if (!StringUtils.hasText(ref)) { - throw new ConfigurationException("The '" + attribute + "' attribute is required."); - } - String method = element.getAttribute("method"); - if (StringUtils.hasText(method)) { - String adapterBeanName = this.parseAdapter(ref, method, parserContext); - builder.addConstructorArgReference(adapterBeanName); - } - else { - builder.addConstructorArgReference(ref); - } - } - - private String parseAdapter(String ref, String method, ParserContext parserContext) { - BeanDefinition adapterDef = new RootBeanDefinition(this.getAdapterClass()); - adapterDef.getPropertyValues().addPropertyValue("object", new RuntimeBeanReference(ref)); - adapterDef.getPropertyValues().addPropertyValue("methodName", method); - String adapterBeanName = parserContext.getReaderContext().generateBeanName(adapterDef); - parserContext.registerBeanComponent(new BeanComponentDefinition(adapterDef, adapterBeanName)); - return adapterBeanName; - } - - private Schedule parseSchedule(Element scheduleElement) { - PollingSchedule schedule = new PollingSchedule(5); - String period = scheduleElement.getAttribute(PERIOD_ATTRIBUTE); - if (StringUtils.hasText(period)) { - schedule.setPeriod(Integer.parseInt(period)); - } - return schedule; - } - -} diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java index c5dfe71ff5..8cd8c32f07 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java @@ -17,11 +17,22 @@ package org.springframework.integration.config; import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; +import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.support.ManagedList; +import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; +import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.integration.ConfigurationException; import org.springframework.integration.endpoint.HandlerEndpoint; import org.springframework.integration.handler.DefaultMessageHandlerAdapter; +import org.springframework.integration.scheduling.PollingSchedule; +import org.springframework.integration.scheduling.Schedule; import org.springframework.util.StringUtils; /** @@ -29,7 +40,9 @@ import org.springframework.util.StringUtils; * * @author Mark Fisher */ -public class HandlerEndpointParser extends AbstractTargetEndpointParser { +public class HandlerEndpointParser extends AbstractSingleBeanDefinitionParser { + + private static final String INPUT_CHANNEL_ATTRIBUTE = "input-channel"; private static final String OUTPUT_CHANNEL_ATTRIBUTE = "output-channel"; @@ -41,23 +54,74 @@ public class HandlerEndpointParser extends AbstractTargetEndpointParser { private static final String REPLY_HANDLER_PROPERTY = "replyHandler"; + private static final String SELECTOR_ATTRIBUTE = "selector"; + + private static final String SELECTOR_PROPERTY = "messageSelector"; + + private static final String PERIOD_ATTRIBUTE = "period"; + + private static final String SCHEDULE_ELEMENT = "schedule"; + + private static final String INTERCEPTORS_ELEMENT = "interceptors"; + @Override protected Class getBeanClass(Element element) { return HandlerEndpoint.class; } - protected String getTargetAttributeName() { - return "handler"; + @Override + protected boolean shouldGenerateId() { + return false; } @Override - protected Class getAdapterClass() { - return DefaultMessageHandlerAdapter.class; + protected boolean shouldGenerateIdAsFallback() { + return true; } @Override - protected void postProcess(BeanDefinitionBuilder builder, Element element) { + protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { + String handler = element.getAttribute("handler"); + if (!StringUtils.hasText(handler)) { + throw new ConfigurationException("The 'handler' attribute is required."); + } + String method = element.getAttribute("method"); + if (StringUtils.hasText(method)) { + String adapterBeanName = this.parseAdapter(handler, method, parserContext); + builder.addConstructorArgReference(adapterBeanName); + } + else { + builder.addConstructorArgReference(handler); + } + String inputChannelName = element.getAttribute(INPUT_CHANNEL_ATTRIBUTE); + Schedule schedule = null; + NodeList childNodes = element.getChildNodes(); + for (int i = 0; i < childNodes.getLength(); i++) { + Node child = childNodes.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) { + Element childElement = (Element) child; + String localName = child.getLocalName(); + if (SCHEDULE_ELEMENT.equals(localName)) { + schedule = this.parseSchedule(childElement); + } + else if (INTERCEPTORS_ELEMENT.equals(localName)) { + EndpointInterceptorParser parser = new EndpointInterceptorParser(); + ManagedList interceptors = parser.parseEndpointInterceptors(childElement, parserContext); + builder.addPropertyValue("interceptors", interceptors); + } + } + } + if (StringUtils.hasText(inputChannelName)) { + builder.addPropertyValue("inputChannelName", inputChannelName); + } + if (schedule != null) { + builder.addPropertyValue("schedule", schedule); + } + String selectorRef = element.getAttribute(SELECTOR_ATTRIBUTE); + if (StringUtils.hasText(selectorRef)) { + builder.addPropertyReference(SELECTOR_PROPERTY, selectorRef); + } String outputChannel = element.getAttribute(OUTPUT_CHANNEL_ATTRIBUTE); if (StringUtils.hasText(outputChannel)) { builder.addPropertyValue(OUTPUT_CHANNEL_PROPERTY, outputChannel); @@ -71,4 +135,22 @@ public class HandlerEndpointParser extends AbstractTargetEndpointParser { } } + private String parseAdapter(String ref, String method, ParserContext parserContext) { + BeanDefinition adapterDef = new RootBeanDefinition(DefaultMessageHandlerAdapter.class); + adapterDef.getPropertyValues().addPropertyValue("object", new RuntimeBeanReference(ref)); + adapterDef.getPropertyValues().addPropertyValue("methodName", method); + String adapterBeanName = parserContext.getReaderContext().generateBeanName(adapterDef); + parserContext.registerBeanComponent(new BeanComponentDefinition(adapterDef, adapterBeanName)); + return adapterBeanName; + } + + private Schedule parseSchedule(Element scheduleElement) { + PollingSchedule schedule = new PollingSchedule(0); + String period = scheduleElement.getAttribute(PERIOD_ATTRIBUTE); + if (StringUtils.hasText(period)) { + schedule.setPeriod(Integer.parseInt(period)); + } + return schedule; + } + } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/TargetEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/TargetEndpointParser.java deleted file mode 100644 index c9f8d5293e..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/TargetEndpointParser.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.config; - -import org.w3c.dom.Element; - -import org.springframework.integration.endpoint.TargetEndpoint; -import org.springframework.integration.handler.MethodInvokingTarget; - -/** - * Parser for the <target-endpoint> element. - * - * @author Mark Fisher - */ -public class TargetEndpointParser extends AbstractTargetEndpointParser { - - @Override - protected Class getBeanClass(Element element) { - return TargetEndpoint.class; - } - - @Override - protected String getTargetAttributeName() { - return "target"; - } - - @Override - protected Class getAdapterClass() { - return MethodInvokingTarget.class; - } - -}