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

Removed parsing instructions for deleted properties (concurrencyPolicy and errorHandler).

Browse Source
This commit is contained in:
Mark Fisher
2008-07-01 19:49:48 +00:00
parent f3f7daa201
commit 71c35ee513
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
View File

@@ -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);