Merge branch 'master' of git.springsource.org:spring-integration/spring-integration

spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd

@@ -1929,6 +1929,7 @@ Name of the header whose value to use.
 			<xsd:extension base="channelNameResolvingRouterType">
 				<xsd:choice minOccurs="0" maxOccurs="2">
 					<xsd:element name="poller" type="innerPollerType" minOccurs="0" maxOccurs="1" />
+					<xsd:element name="expression" type="innerExpressionType" minOccurs="0" maxOccurs="1" />
 					<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="1" />
 				</xsd:choice>
 				<xsd:attribute name="ref" type="xsd:string">

spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests-context.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="even">
+		<queue/>
+	</channel>
+
+	<channel id="odd">
+		<queue/>
+	</channel>
+
+	<router input-channel="input">
+		<expression key="router.oddeven" source="testExpressionSource"/>
+	</router>
+
+	<beans:bean id="testExpressionSource" class="org.springframework.integration.expression.ReloadableResourceBundleExpressionSource">
+		<beans:property name="basename" value="org/springframework/integration/router/config/expressions"/>
+	</beans:bean>
+
+</beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2002-2010 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.router.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class DynamicExpressionRouterIntegrationTests {
+
+	@Autowired
+	private MessageChannel input;
+
+	@Autowired
+	private PollableChannel even;
+
+	@Autowired
+	private PollableChannel odd;
+
+
+	@Test
+	public void dynamicExpressionBasedRouter() {
+		TestBean testBean1 = new TestBean(1);
+		TestBean testBean2 = new TestBean(2);
+		TestBean testBean3 = new TestBean(3);
+		TestBean testBean4 = new TestBean(4);
+		Message<?> message1 = MessageBuilder.withPayload(testBean1).build();
+		Message<?> message2 = MessageBuilder.withPayload(testBean2).build();
+		Message<?> message3 = MessageBuilder.withPayload(testBean3).build();
+		Message<?> message4 = MessageBuilder.withPayload(testBean4).build();
+		this.input.send(message1);
+		this.input.send(message2);
+		this.input.send(message3);
+		this.input.send(message4);
+		assertEquals(testBean1, odd.receive(0).getPayload());
+		assertEquals(testBean2, even.receive(0).getPayload());
+		assertEquals(testBean3, odd.receive(0).getPayload());
+		assertEquals(testBean4, even.receive(0).getPayload());
+		assertNull(odd.receive(0));
+		assertNull(even.receive(0));
+	}
+
+
+	static class TestBean {
+
+		private final int number;
+
+		public TestBean(int number) {
+			this.number = number;
+		}
+
+		public int getNumber() {
+			return this.number;
+		}
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/router/config/expressions.properties

@@ -0,0 +1 @@
+router.oddeven=payload.number % 2 == 0 ? 'even' : 'odd'

spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests-context.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="output">
+		<queue/>
+	</channel>
+
+	<splitter input-channel="input" output-channel="output">
+		<expression key="split.lessThan5" source="testExpressionSource"/> 
+	</splitter>
+
+	<beans:bean id="testExpressionSource" class="org.springframework.integration.expression.ReloadableResourceBundleExpressionSource">
+		<beans:property name="basename" value="org/springframework/integration/splitter/expressions"/>
+	</beans:bean>
+
+</beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2002-2010 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.splitter;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class DynamicExpressionSplitterIntegrationTests {
+
+	@Autowired
+	private MessageChannel input;
+
+	@Autowired
+	private PollableChannel output;
+
+
+	@Test
+	public void simple() {
+		Message<?> message = MessageBuilder.withPayload(new TestBean()).setHeader("foo", "foo").build();
+		this.input.send(message);
+		Message<?> one = output.receive(0);
+		Message<?> two = output.receive(0);
+		Message<?> three = output.receive(0);
+		Message<?> four = output.receive(0);
+		assertEquals(new Integer(1), one.getPayload());
+		assertEquals("foo", one.getHeaders().get("foo"));
+		assertEquals(new Integer(2), two.getPayload());
+		assertEquals("foo", two.getHeaders().get("foo"));
+		assertEquals(new Integer(3), three.getPayload());
+		assertEquals("foo", three.getHeaders().get("foo"));
+		assertEquals(new Integer(4), four.getPayload());
+		assertEquals("foo", four.getHeaders().get("foo"));
+		assertNull(output.receive(0));
+	}
+
+
+	static class TestBean {
+
+		private final List<Integer> numbers = new ArrayList<Integer>();
+
+		public TestBean() {
+			for (int i = 1; i <= 10; i++) {
+				this.numbers.add(i);
+			}
+		}
+
+		public List<Integer> getNumbers() {
+			return this.numbers;
+		}
+
+		public String[] split(String s) {
+			return s.split(",");
+		}
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/splitter/expressions.properties

@@ -0,0 +1 @@
+split.lessThan5=payload.numbers.?[#this < 5]