Namespace support for XPathRouter INT-300

org.springframework.integration.xml/src/test/java/org/springframework/integration/router/XPathMultiChannelNameResolverTests.java

@@ -28,38 +28,41 @@ import org.springframework.xml.xpath.XPathExpression;
 import org.springframework.xml.xpath.XPathExpressionFactory;
 import org.w3c.dom.Document;
 
+/**
+ * 
+ * @author Jonas Partner
+ * 
+ */
 public class XPathMultiChannelNameResolverTests {
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testSimpleSingleeAttribute() throws Exception {
 		Document doc = XmlTestUtil.getDocumentForString("<doc type=\"one\" />");
 		XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
 		XPathMultiChannelNameResolver resolver = new XPathMultiChannelNameResolver(expression);
 		String[] channelNames = resolver.resolve(new GenericMessage(doc));
-		assertEquals("Wrong number of channels returend",1,channelNames.length);
-		assertEquals("Wrong channel name","one",channelNames[0]);
+		assertEquals("Wrong number of channels returend", 1, channelNames.length);
+		assertEquals("Wrong channel name", "one", channelNames[0]);
 	}
-	
+
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testMultipleNodeValues() throws Exception {
 		Document doc = XmlTestUtil.getDocumentForString("<doc type=\"one\"><book>bOne</book><book>bTwo</book></doc>");
 		XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/book");
 		XPathMultiChannelNameResolver resolver = new XPathMultiChannelNameResolver(expression);
 		String[] channelNames = resolver.resolve(new GenericMessage(doc));
-		assertEquals("Wrong number of channels returend",2,channelNames.length);
-		assertEquals("Wrong channel name","bOne",channelNames[0]);
-		assertEquals("Wrong channel name","bTwo",channelNames[1]);
+		assertEquals("Wrong number of channels returend", 2, channelNames.length);
+		assertEquals("Wrong channel name", "bOne", channelNames[0]);
+		assertEquals("Wrong channel name", "bTwo", channelNames[1]);
 	}
 
-	
-	@Test(expected=MessagingException.class)
+	@Test(expected = MessagingException.class)
 	public void testNonNodePayload() throws Exception {
 		XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
 		XPathMultiChannelNameResolver resolver = new XPathMultiChannelNameResolver(expression);
 		resolver.resolve(new StringMessage("test"));
 	}
 
-	
-	
-	
 }

org.springframework.integration.xml/src/test/java/org/springframework/integration/router/XPathSingleChannelNameResolverTests.java

@@ -28,26 +28,28 @@ import org.springframework.xml.xpath.XPathExpression;
 import org.springframework.xml.xpath.XPathExpressionFactory;
 import org.w3c.dom.Document;
 
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
 public class XPathSingleChannelNameResolverTests {
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testSimpleDocType() throws Exception {
 		Document doc = XmlTestUtil.getDocumentForString("<doc type=\"one\" />");
 		XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
 		XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver(expression);
 		String channelName = resolver.resolve(new GenericMessage(doc));
-		assertEquals("Wrong channel name","one",channelName);
+		assertEquals("Wrong channel name", "one", channelName);
 	}
 
-	
-	@Test(expected=MessagingException.class)
+	@Test(expected = MessagingException.class)
 	public void testNonNodePayload() throws Exception {
 		XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
 		XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver(expression);
 		resolver.resolve(new StringMessage("test"));
 	}
 
-	
-	
-	
 }

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubMarshaller.java

@@ -26,6 +26,11 @@ import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.XmlMappingException;
 import org.springframework.xml.transform.StringSource;
 
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
 public class StubMarshaller implements Marshaller {
 
 	public void marshal(Object graph, Result result) throws XmlMappingException, IOException {

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubUnmarshaller.java

@@ -24,6 +24,11 @@ import javax.xml.transform.Source;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.oxm.XmlMappingException;
 
+/**
+ * 
+ * @author Jonas Partner
+ *
+ */
 public class StubUnmarshaller implements Unmarshaller {
 
 	public LinkedList<Source> sourcesPassed = new LinkedList<Source>();

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests-context.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:si-xml="http://www.springframework.org/schema/integration-xml"
+	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+
+	<bean id="messageChannel"
+		class="org.springframework.integration.channel.QueueChannel" />
+	<si:message-bus error-channel="errors" />
+
+	<si:channel id="inputOne" />
+	<si:channel id="inputTwo" />
+
+
+	<si:channel id="outputOne" />
+	<si:channel id="outputTwo" />
+
+	<si:channel id="errors" />
+
+	<si-xml:xpath-router id="routerOne"
+		xpath-expression-ref="xpathExpression" />
+	<si:service-activator ref="routerOne" input-channel="inputOne" />
+
+	<si-xml:xpath-router id="routerTwo"
+		xpath-expression-ref="xpathExpressionMulti" multi-channel="true" />
+	<si:service-activator ref="routerTwo" input-channel="inputTwo" />
+
+
+	<bean id="xpathExpression"
+		class="org.springframework.xml.xpath.XPathExpressionFactoryBean">
+		<property name="expression" value="/name" />
+	</bean>
+
+	<bean id="xpathExpressionMulti"
+		class="org.springframework.xml.xpath.XPathExpressionFactoryBean">
+		<property name="expression" value="//name" />
+	</bean>
+
+</beans>

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java

@@ -0,0 +1,116 @@
+/*
+ * 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 static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.message.GenericMessage;
+import org.springframework.integration.xml.util.XmlTestUtil;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.w3c.dom.Document;
+
+
+@ContextConfiguration
+public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{
+	
+	@Autowired @Qualifier("inputOne")
+	MessageChannel inputOne;
+	
+	@Autowired @Qualifier("inputTwo")
+	MessageChannel inputTwo;
+	
+
+	@Autowired @Qualifier("outputOne")
+	MessageChannel outputOne;
+	
+
+	@Autowired @Qualifier("outputTwo")
+	MessageChannel outputTwo;
+	
+	@Autowired @Qualifier("errors")
+	MessageChannel errors;
+	
+	
+	
+	
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputOne() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<name>outputOne</name>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputOne.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>)outputOne.receive(1000);
+		assertNotNull("Did not recevie message from outputOne", received);
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputTwo() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<name>outputTwo</name>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputOne.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>)outputTwo.receive(1000);
+		assertNotNull("Did not recevie message from two", received);
+	}
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputThree() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<name>outputThree</name>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputOne.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>)errors.receive(1000);
+		assertNotNull("Did not recevie message on errors", received);
+		
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputOneMulti() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<name>outputOne</name>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputTwo.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>)outputOne.receive(1000);
+		assertNotNull("Did not recevie message from outputOne", received);
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputOneAndTwoMulti() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<doc><name>outputOne</name><name>outputTwo</name></doc>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputTwo.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>)outputTwo.receive(1000);
+		assertNotNull("Did not recevie message from two", received);
+	}
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testOutputThreeMulti() throws Exception{
+		Document doc =XmlTestUtil.getDocumentForString("<name>outputThree</name>");
+		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
+		inputTwo.send(docMessage);
+		GenericMessage<Document> received = (GenericMessage<Document>) errors.receive(1000);
+		assertNotNull("Did not recevie message on errors", received);
+		
+	}
+	
+	
+}

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml

@@ -5,12 +5,14 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd">
 
-	<si-xml:xslt-transformer
-		id="xsltTransfomerWithResource" xsl-resource="org/springframework/integration/xml/config/test.xsl" />
-		
-		
-	<si-xml:xslt-transformer id="xsltTransformerWithTemplates" xsl-templates="templates" />
-	
-	<bean id="templates" class="org.springframework.integration.xml.config.TestTemplatesFactory" />	
-		
+	<si-xml:xslt-transformer id="xsltTransfomerWithResource"
+		xsl-resource="org/springframework/integration/xml/config/test.xsl" />
+
+
+	<si-xml:xslt-transformer id="xsltTransformerWithTemplates"
+		xsl-templates="templates" />
+
+	<bean id="templates"
+		class="org.springframework.integration.xml.config.TestTemplatesFactory" />
+
 </beans>