From 71c35ee513d1ceada2a53599a30ee005c9df375e Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 1 Jul 2008 19:49:48 +0000 Subject: [PATCH] Removed parsing instructions for deleted properties (concurrencyPolicy and errorHandler). --- .../config/AbstractTargetEndpointParser.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) 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 index 525cb1ad14..8cfed040ca 100644 --- 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 @@ -29,7 +29,6 @@ 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.ConcurrencyPolicy; import org.springframework.integration.scheduling.PollingSchedule; import org.springframework.integration.scheduling.Schedule; import org.springframework.integration.scheduling.Subscription; @@ -46,10 +45,6 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef private static final String SUBSCRIPTION_PROPERTY = "subscription"; - private static final String ERROR_HANDLER_ATTRIBUTE = "error-handler"; - - private static final String ERROR_HANDLER_PROPERTY = "errorHandler"; - private static final String SELECTOR_ATTRIBUTE = "selector"; private static final String SELECTOR_PROPERTY = "messageSelector"; @@ -58,10 +53,6 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef private static final String SCHEDULE_ELEMENT = "schedule"; - private static final String CONCURRENCY_ELEMENT = "concurrency"; - - private static final String CONCURRENCY_POLICY_PROPERTY = "concurrencyPolicy"; - private static final String INTERCEPTORS_ELEMENT = "interceptors"; @@ -95,10 +86,7 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef Node child = childNodes.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { String localName = child.getLocalName(); - if (CONCURRENCY_ELEMENT.equals(localName)) { - parseConcurrencyPolicy((Element) child, builder); - } - else if (SCHEDULE_ELEMENT.equals(localName)) { + if (SCHEDULE_ELEMENT.equals(localName)) { schedule = this.parseSchedule((Element) child); } else if (INTERCEPTORS_ELEMENT.equals(localName)) { @@ -118,10 +106,6 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef parserContext.registerBeanComponent(new BeanComponentDefinition(subscriptionDef, subscriptionBeanName)); builder.addPropertyReference(SUBSCRIPTION_PROPERTY, subscriptionBeanName); } - String errorHandlerRef = element.getAttribute(ERROR_HANDLER_ATTRIBUTE); - if (StringUtils.hasText(errorHandlerRef)) { - builder.addPropertyReference(ERROR_HANDLER_PROPERTY, errorHandlerRef); - } String selectorRef = element.getAttribute(SELECTOR_ATTRIBUTE); if (StringUtils.hasText(selectorRef)) { builder.addPropertyReference(SELECTOR_PROPERTY, selectorRef); @@ -153,11 +137,6 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef return adapterBeanName; } - private void parseConcurrencyPolicy(Element concurrencyElement, BeanDefinitionBuilder builder) { - ConcurrencyPolicy policy = IntegrationNamespaceUtils.parseConcurrencyPolicy(concurrencyElement); - builder.addPropertyValue(CONCURRENCY_POLICY_PROPERTY, policy); - } - private Schedule parseSchedule(Element scheduleElement) { PollingSchedule schedule = new PollingSchedule(5); String period = scheduleElement.getAttribute(PERIOD_ATTRIBUTE);