diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionBeanDefintionBuilder.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionBeanDefintionBuilder.java deleted file mode 100644 index 3b4d16bb05..0000000000 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionBeanDefintionBuilder.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2007 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.xml.config; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; -import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; -import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -public class XPathExpressionBeanDefintionBuilder { - - public AbstractBeanDefinition handleXpathExpression(Element element, ParserContext parserContext) { - String strXpathExpression = element.getAttribute("xpath-expression"); - String strXpathExpressionPrefix = element.getAttribute("ns-prefix"); - String strXpathExpressionNamespace = element.getAttribute("ns-uri"); - String nameSpaceMapRef = element.getAttribute("namespace-map"); - - Assert.hasText(strXpathExpression, "xpath-expression attribute is required"); - - - - boolean prefixProvided = StringUtils.hasText(strXpathExpressionPrefix); - boolean namespaceProvided = StringUtils.hasText(strXpathExpressionNamespace); - boolean namespaceMapProvided = StringUtils.hasText(nameSpaceMapRef); - - if (prefixProvided || namespaceProvided) { - Assert.isTrue(prefixProvided && namespaceProvided, - "Both xpath-prefix and xpath-namespace must be specified if one is specified"); - Assert.isTrue(!namespaceMapProvided, "It is not valid to sepcify both xpath-namespace and namespace-map"); - } - - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XPathExpressionFactory.class); - builder.setFactoryMethod("createXPathExpression"); - builder.addConstructorArgValue(strXpathExpression); - - if (prefixProvided) { - Map namespaceMap = new HashMap(); - namespaceMap.put(strXpathExpressionPrefix, strXpathExpressionNamespace); - builder.addConstructorArgValue(namespaceMap); - } - else if (StringUtils.hasText(nameSpaceMapRef)) { - builder.addConstructorArgReference(nameSpaceMapRef); - } - else if (element.getChildNodes().getLength() > 0) { - NodeList nodeList = element.getChildNodes(); - Element mapElement = null; - int elementCount = 0; - for (int i = 0; i < nodeList.getLength(); i++) { - Node currentNode = nodeList.item(i); - if (currentNode.getNodeType() == Node.ELEMENT_NODE) { - mapElement = (Element) currentNode; - elementCount++; - } - } - Assert.isTrue(elementCount == 1, "Only one namespace map child allowed"); - if (mapElement != null) { - Map namespaceMap = parseNamespaceMapElement(mapElement, parserContext, builder.getBeanDefinition()); - builder.getBeanDefinition().getConstructorArgumentValues().addGenericArgumentValue(namespaceMap); - } - } - return builder.getBeanDefinition(); - } - - protected Map parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { - BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); - beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); - return beanParser.parseMapElement(element, parentDefinition); - } - -} diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java index f4393a529c..5197899f8d 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java @@ -36,7 +36,7 @@ import org.w3c.dom.NodeList; * */ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { - + @Override protected boolean shouldGenerateId() { return false; @@ -47,15 +47,17 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { return true; } + @SuppressWarnings("unchecked") @Override protected Class getBeanClass(Element element) { return XPathExpressionFactory.class; } + @SuppressWarnings("unchecked") @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - String strXpathExpression = element.getAttribute("xpath-expression"); + String strXpathExpression = element.getAttribute("expression"); String strXpathExpressionPrefix = element.getAttribute("ns-prefix"); String strXpathExpressionNamespace = element.getAttribute("ns-uri"); String nameSpaceMapRef = element.getAttribute("namespace-map"); @@ -105,6 +107,7 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { + @SuppressWarnings("unchecked") protected Map parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); 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 ece7d10575..59c136131d 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 @@ -16,24 +16,25 @@ package org.springframework.integration.xml.config; -import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.ConfigurationException; import org.springframework.integration.xml.router.XPathMultiChannelNameResolver; import org.springframework.integration.xml.router.XPathSingleChannelNameResolver; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** * @author Jonas Partner */ public class XPathRouterParser extends AbstractSingleBeanDefinitionParser { - private XPathExpressionBeanDefintionBuilder xpathBuilder = new XPathExpressionBeanDefintionBuilder(); - + private XPathExpressionParser xpathParser = new XPathExpressionParser(); + @Override protected boolean shouldGenerateId() { return false; @@ -48,18 +49,15 @@ public class XPathRouterParser extends AbstractSingleBeanDefinitionParser { protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { boolean multiChannel = Boolean.parseBoolean(element.getAttribute("multi-channel")); - String xPathExpression = element.getAttribute("xpath-expression"); - String strXpathExpressionPrefix = element.getAttribute("xpath-prefix"); - String strXpathExpressionNamespace = element.getAttribute("xpath-namespace"); - String nameSpaceMapRef = element.getAttribute("namespace-map"); - String xPathExpressionRef = element.getAttribute("xpath-expression-ref"); - boolean strXpathAttSpecified = StringUtils.hasText(xPathExpression) - || StringUtils.hasText(strXpathExpressionPrefix) || StringUtils.hasText(nameSpaceMapRef) - || StringUtils.hasText(strXpathExpressionNamespace); - if ((strXpathAttSpecified && StringUtils.hasText(xPathExpressionRef)) - || (!StringUtils.hasText(xPathExpression) && !StringUtils.hasText(xPathExpressionRef))) { + NodeList xPathExpressionNodes = element.getElementsByTagNameNS(element.getNamespaceURI(), "xpath-expression"); + Assert.isTrue(xPathExpressionNodes.getLength() < 2, "Only one xpath-expression child can be specified"); + boolean xPathExpressionChildPresent = xPathExpressionNodes.getLength() == 1; + boolean xPathReferencePresent = StringUtils.hasText(xPathExpressionRef); + + if ((xPathExpressionChildPresent && xPathReferencePresent) + || (!xPathExpressionChildPresent && !xPathReferencePresent)) { throw new ConfigurationException("Exactly one of 'xpath-expression' or 'xpath-expression-ref' is required."); } @@ -69,16 +67,15 @@ public class XPathRouterParser extends AbstractSingleBeanDefinitionParser { else { builder.getBeanDefinition().setBeanClass(XPathSingleChannelNameResolver.class); } - - if (StringUtils.hasText(xPathExpression)) { - AbstractBeanDefinition xPathExpressionBeanDefinition = xpathBuilder.handleXpathExpression(element, parserContext); - String xpathExpressionBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName( - xPathExpressionBeanDefinition, parserContext.getRegistry()); - builder.addConstructorArgReference(xpathExpressionBeanName); - } - else { + + if (xPathExpressionChildPresent) { + BeanDefinition beanDefinition = xpathParser.parse((Element) xPathExpressionNodes.item(0), parserContext); + builder.addConstructorArgValue(beanDefinition); + } else { builder.addConstructorArgReference(xPathExpressionRef); } } + + } diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathSelectorParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathSelectorParser.java index 597c7a40fa..892eee5297 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathSelectorParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathSelectorParser.java @@ -15,9 +15,8 @@ */ package org.springframework.integration.xml.config; -import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.ConfigurationException; @@ -26,15 +25,16 @@ import org.springframework.integration.xml.selector.StringValueTestXPathMessageS import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** * * @author Jonas Partner - * + * */ public class XPathSelectorParser extends AbstractSingleBeanDefinitionParser { - - private XPathExpressionBeanDefintionBuilder xpathBuilder = new XPathExpressionBeanDefintionBuilder(); + + private XPathExpressionParser xpathParser = new XPathExpressionParser(); @Override protected boolean shouldGenerateId() { @@ -50,40 +50,40 @@ public class XPathSelectorParser extends AbstractSingleBeanDefinitionParser { protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String evaluationType = element.getAttribute("evaluation-result-type"); - String xPathExpression = element.getAttribute("xpath-expression"); - String strXpathExpressionPrefix = element.getAttribute("xpath-prefix"); - String strXpathExpressionNamespace = element.getAttribute("xpath-namespace"); - String nameSpaceMapRef = element.getAttribute("namespace-map"); String xPathExpressionRef = element.getAttribute("xpath-expression-ref"); String stringTestValue = element.getAttribute("string-test-value"); - - boolean strXpathAttSpecified = StringUtils.hasText(xPathExpression) - || StringUtils.hasText(strXpathExpressionPrefix) || StringUtils.hasText(nameSpaceMapRef) - || StringUtils.hasText(strXpathExpressionNamespace); - - if ((strXpathAttSpecified && StringUtils.hasText(xPathExpressionRef)) - || (!StringUtils.hasText(xPathExpression) && !StringUtils.hasText(xPathExpressionRef))) { + + NodeList xPathExpressionNodes = element.getElementsByTagNameNS(element.getNamespaceURI(), "xpath-expression"); + Assert.isTrue(xPathExpressionNodes.getLength() < 2, "Only one xpath-expression child can be specified"); + boolean xPathExpressionChildPresent = xPathExpressionNodes.getLength() == 1; + boolean xPathReferencePresent = StringUtils.hasText(xPathExpressionRef); + + if ((xPathExpressionChildPresent && xPathReferencePresent) + || (!xPathExpressionChildPresent && !xPathReferencePresent)) { throw new ConfigurationException("Exactly one of 'xpath-expression' or 'xpath-expression-ref' is required."); } if (evaluationType.equals("boolean")) { builder.getBeanDefinition().setBeanClass(BooleanTestXPathMessageSelector.class); - Assert.state(!StringUtils.hasText(stringTestValue), "string-test-value should not be specified when evaluation-result-type is boolean"); + Assert.state(!StringUtils.hasText(stringTestValue), + "string-test-value should not be specified when evaluation-result-type is boolean"); } - else if (evaluationType.equals("string")){ - Assert.hasText(stringTestValue, "string-test-value must be specified when evaluation-result-type is string"); + else if (evaluationType.equals("string")) { + Assert + .hasText(stringTestValue, + "string-test-value must be specified when evaluation-result-type is string"); builder.addConstructorArgValue(stringTestValue); builder.getBeanDefinition().setBeanClass(StringValueTestXPathMessageSelector.class); - - } else { - throw new ConfigurationException("Unrecognised value: " + evaluationType + " for evaluation-result-type only boolean or string supported"); + } - - if (StringUtils.hasText(xPathExpression)) { - AbstractBeanDefinition xPathExpressionBeanDefinition = xpathBuilder.handleXpathExpression(element, null); - String xpathExpressionBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName( - xPathExpressionBeanDefinition, parserContext.getRegistry()); - builder.addConstructorArgReference(xpathExpressionBeanName); + else { + throw new ConfigurationException("Unrecognised value: " + evaluationType + + " for evaluation-result-type only boolean or string supported"); + } + + if (xPathExpressionChildPresent) { + BeanDefinition beanDefinition = xpathParser.parse((Element) xPathExpressionNodes.item(0), parserContext); + builder.addConstructorArgValue(beanDefinition); } else { builder.addConstructorArgReference(xPathExpressionRef); diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd index b156946b52..1c14ac04c8 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd @@ -83,6 +83,7 @@ + @@ -91,23 +92,16 @@ - + - - - - + @@ -116,16 +110,10 @@ - + - - - - @@ -135,8 +123,6 @@ - @@ -154,7 +140,7 @@ - diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java index bbb57267cb..7c4b54c409 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java @@ -26,14 +26,14 @@ public class XPathExpressionParserTests { @Test public void testSimpleStringExpression() throws Exception { - String xmlDoc = ""; + String xmlDoc = ""; XPathExpression xPathExpression = getXPathExpression(xmlDoc); assertEquals("outputOne",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); } @Test public void testNamespacedStringExpression() throws Exception { - String xmlDoc = ""; + String xmlDoc = ""; XPathExpression xPathExpression = getXPathExpression(xmlDoc); assertEquals("outputOne",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); assertEquals("",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); @@ -41,7 +41,7 @@ public class XPathExpressionParserTests { @Test public void testStringExpressionWithNamespaceMapReference() throws Exception { - StringBuffer xmlDoc = new StringBuffer(""); + StringBuffer xmlDoc = new StringBuffer(""); xmlDoc.append(""); XPathExpression xPathExpression = getXPathExpression(xmlDoc.toString()); assertEquals("outputOne",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); @@ -50,7 +50,7 @@ public class XPathExpressionParserTests { @Test public void testStringExpressionWithNamespaceInnerBean() throws Exception { - StringBuffer xmlDoc = new StringBuffer(""); + StringBuffer xmlDoc = new StringBuffer(""); xmlDoc.append("").append(""); XPathExpression xPathExpression = getXPathExpression(xmlDoc.toString()); assertEquals("outputOne",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); @@ -60,7 +60,7 @@ public class XPathExpressionParserTests { @Test(expected=BeanDefinitionStoreException.class) public void testNamespacePrefixButNoUri() throws Exception { - String xmlDoc = ""; + String xmlDoc = ""; XPathExpression xPathExpression = getXPathExpression(xmlDoc); assertEquals("outputOne",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); assertEquals("",xPathExpression.evaluateAsString(XmlTestUtil.getDocumentForString("outputOne"))); diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java index 4c53cc0ad3..9fe8512baa 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java @@ -36,7 +36,7 @@ public class XPathRouterParserTests { Document doc = XmlTestUtil.getDocumentForString("outputOne"); GenericMessage docMessage = new GenericMessage(doc); - TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(""); + TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(""); XPathSingleChannelNameResolver router = (XPathSingleChannelNameResolver) ctx.getBean("router"); String[] channelNames = router.resolveChannelNames(docMessage); @@ -50,7 +50,8 @@ public class XPathRouterParserTests { Document doc = XmlTestUtil.getDocumentForString("outputOne"); GenericMessage docMessage = new GenericMessage(doc); - TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(""); + TestXmlApplicationContext ctx = + TestXmlApplicationContextHelper.getTestAppContext(""); XPathSingleChannelNameResolver router = (XPathSingleChannelNameResolver) ctx.getBean("router"); String[] channelNames = router.resolveChannelNames(docMessage); @@ -65,10 +66,10 @@ public class XPathRouterParserTests { GenericMessage docMessage = new GenericMessage(doc); StringBuffer buffer = new StringBuffer( - ""); + " "); buffer .append(" "); - buffer.append(""); + buffer.append(""); TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(buffer.toString()); XPathSingleChannelNameResolver router = (XPathSingleChannelNameResolver) ctx.getBean("router"); @@ -84,7 +85,7 @@ public class XPathRouterParserTests { .getDocumentForString("outputOne"); GenericMessage docMessage = new GenericMessage(doc); StringBuffer buffer = new StringBuffer( - ""); + ""); buffer .append("") .append(""); @@ -98,14 +99,6 @@ public class XPathRouterParserTests { } - @Test(expected = Exception.class) - public void testNamespacedWithNoPrefixStringExpression() throws Exception { - TestXmlApplicationContextHelper.getTestAppContext(""); - } - @Test(expected = Exception.class) - public void testPrefixWithNoNamespaceStringExpression() throws Exception { - TestXmlApplicationContextHelper.getTestAppContext(""); - } } diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java index ca5a448aed..2ef0cc5429 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java @@ -28,7 +28,7 @@ public class XPathSelectorParserTests { @Test public void testSimpleStringExpressionBoolean() throws Exception { - String contextXml = ""; + String contextXml = ""; MessageSelector selector =getSelector( contextXml); assertTrue(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString("outputOne")))); @@ -37,7 +37,7 @@ public class XPathSelectorParserTests { @Test public void testStringExpressionWithNamespaceBoolean() throws Exception { - String contextXml = ""; + String contextXml = " "; MessageSelector selector = getSelector(contextXml); assertTrue(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString("outputOne")))); @@ -47,7 +47,7 @@ public class XPathSelectorParserTests { @Test public void testStringExpressionWithNestedMap() throws Exception { - String contextXml = ""; + String contextXml = ""; MessageSelector selector = getSelector(contextXml); assertTrue(selector.accept(new GenericMessage(XmlTestUtil.getDocumentForString("outputOne")))); diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java index 98bbd39f28..57f350bd45 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java @@ -16,7 +16,8 @@ package org.springframework.integration.xml.transformer; -import static org.custommonkey.xmlunit.XMLAssert.*; +import static junit.framework.Assert.assertTrue; +import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXResult; @@ -26,7 +27,6 @@ import org.junit.Test; import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; -import org.w3c.dom.Document; public class ResultToStringTransfomerTests { diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/util/XmlTestUtil.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/util/XmlTestUtil.java index b90cb7c0bd..0ba61b15ed 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/util/XmlTestUtil.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/util/XmlTestUtil.java @@ -18,7 +18,6 @@ package org.springframework.integration.xml.util; import java.io.StringReader; -import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Result; import javax.xml.transform.Source;