From 7d3666b93f62e621a93167865488763135cb8fa7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 29 Sep 2009 11:15:18 +0000 Subject: [PATCH] INT-807, INT-707 - fixed broken build after Spring RC1 migration --- .../integration/config/xml/GatewayParser.java | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java index cfec968ed2..3fe403d1dc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java @@ -18,16 +18,13 @@ package org.springframework.integration.config.xml; import java.util.List; -import org.w3c.dom.Element; - -import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; -import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.gateway.GatewayMethodDefinition; import org.springframework.util.ObjectUtils; import org.springframework.util.xml.DomUtils; +import org.w3c.dom.Element; /** * Parser for the <gateway/> element. @@ -40,25 +37,6 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { "default-request-channel", "default-reply-channel", "message-mapper" }; - protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - super.doParse(element, builder); - List elements = DomUtils.getChildElementsByTagName(element, "method"); - ManagedMap methodToChannelMap = null; - if (elements != null && elements.size() > 0){ - methodToChannelMap = new ManagedMap(); - } - for (Element methodElement : elements) { - String methodName = methodElement.getAttribute("name"); - GatewayMethodDefinition gatewayDefinition = new GatewayMethodDefinition(); - gatewayDefinition.setRequestChannelName(methodElement.getAttribute("request-channel")); - gatewayDefinition.setReplyChannelName(methodElement.getAttribute("reply-channel")); - gatewayDefinition.setRequestTimeout(methodElement.getAttribute("request-timeout")); - gatewayDefinition.setReplyTimeout(methodElement.getAttribute("reply-timeout")); - methodToChannelMap.put(methodName, gatewayDefinition); - } - builder.addPropertyValue("methodToChannelMap", methodToChannelMap); - } - @Override protected String getBeanClassName(Element element) { return IntegrationNamespaceUtils.BASE_PACKAGE + ".gateway.GatewayProxyFactoryBean"; @@ -75,6 +53,21 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { for (String attributeName : referenceAttributes) { IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, attributeName); } + List elements = DomUtils.getChildElementsByTagName(element, "method"); + ManagedMap methodToChannelMap = null; + if (elements != null && elements.size() > 0){ + methodToChannelMap = new ManagedMap(); + } + for (Element methodElement : elements) { + String methodName = methodElement.getAttribute("name"); + GatewayMethodDefinition gatewayDefinition = new GatewayMethodDefinition(); + gatewayDefinition.setRequestChannelName(methodElement.getAttribute("request-channel")); + gatewayDefinition.setReplyChannelName(methodElement.getAttribute("reply-channel")); + gatewayDefinition.setRequestTimeout(methodElement.getAttribute("request-timeout")); + gatewayDefinition.setReplyTimeout(methodElement.getAttribute("reply-timeout")); + methodToChannelMap.put(methodName, gatewayDefinition); + } + builder.addPropertyValue("methodToChannelMap", methodToChannelMap); } }