INT-1186 added bean resolution support for expression based routers

spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java

@@ -19,6 +19,7 @@ package org.springframework.integration.router;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.handler.AbstractMessageProcessor;
 import org.springframework.integration.handler.MessageProcessor;
@@ -47,6 +48,9 @@ class AbstractMessageProcessingRouter extends AbstractChannelNameResolvingMessag
 		if (this.messageProcessor instanceof AbstractMessageProcessor) {
 			((AbstractMessageProcessor) this.messageProcessor).setConversionService(this.getConversionService());
 		}
+		if (this.messageProcessor instanceof BeanFactoryAware) {
+			((BeanFactoryAware) this.messageProcessor).setBeanFactory(this.getBeanFactory());
+		}
 	}
 
 	@Override

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

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<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"
+	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="input"/>
 
 	<channel id="even">
 		<queue/>
@@ -17,6 +15,12 @@
 		<queue/>
 	</channel>
 
-	<router input-channel="input" expression="payload.number % 2 == 0 ? 'even' : 'odd'"/>
+	<router input-channel="simpleInput" expression="payload.number % 2 == 0 ? 'even' : 'odd'"/>
+
+	<router input-channel="beanResolvingInput" expression="@testBean.getChannel(payload % @testBean.number)"/>
+
+	<beans:bean id="testBean" class="org.springframework.integration.router.config.SpelRouterIntegrationTests$TestBean">
+		<beans:constructor-arg value="10"/>
+	</beans:bean>
 
 </beans:beans>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.message.MessageBuilder;
@@ -38,18 +38,24 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class SpelRouterIntegrationTests {
 
-	@Autowired @Qualifier("input")
-	private MessageChannel input;
+	@Autowired
+	private MessageChannel simpleInput;
 
-	@Autowired @Qualifier("even")
+	@Autowired
 	private PollableChannel even;
 
-	@Autowired @Qualifier("odd")
+	@Autowired
 	private PollableChannel odd;
 
+	@Autowired
+	private MessageChannel beanResolvingInput;
+
+	@Autowired
+	private TestBean testBean;
+
 
 	@Test
-	public void split() {
+	public void simpleExpressionBasedRouter() {
 		TestBean testBean1 = new TestBean(1);
 		TestBean testBean2 = new TestBean(2);
 		TestBean testBean3 = new TestBean(3);
@@ -58,10 +64,10 @@ public class SpelRouterIntegrationTests {
 		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);
+		this.simpleInput.send(message1);
+		this.simpleInput.send(message2);
+		this.simpleInput.send(message3);
+		this.simpleInput.send(message4);
 		assertEquals(testBean1, odd.receive(0).getPayload());
 		assertEquals(testBean2, even.receive(0).getPayload());
 		assertEquals(testBean3, odd.receive(0).getPayload());
@@ -70,11 +76,31 @@ public class SpelRouterIntegrationTests {
 		assertNull(even.receive(0));
 	}
 
+	@Test
+	public void beanResolvingExpressionBasedRouter() {
+		this.beanResolvingInput.send(MessageBuilder.withPayload(5).build());
+		this.beanResolvingInput.send(MessageBuilder.withPayload(9).build());
+		this.beanResolvingInput.send(MessageBuilder.withPayload(20).build());
+		this.beanResolvingInput.send(MessageBuilder.withPayload(30).build());
+		this.beanResolvingInput.send(MessageBuilder.withPayload(34).build());
+		assertEquals(20, testBean.clear.receive(0).getPayload());
+		assertEquals(30, testBean.clear.receive(0).getPayload());
+		assertNull(testBean.clear.receive(0));
+		assertEquals(5, testBean.remainders.receive(0).getPayload());
+		assertEquals(9, testBean.remainders.receive(0).getPayload());
+		assertEquals(34, testBean.remainders.receive(0).getPayload());
+		assertNull(testBean.remainders.receive(0));
+	}
+
 
 	static class TestBean {
 
 		private final int number;
 
+		private final QueueChannel clear = new QueueChannel();
+
+		private final QueueChannel remainders = new QueueChannel();
+
 		public TestBean(int number) {
 			this.number = number;
 		}
@@ -82,6 +108,10 @@ public class SpelRouterIntegrationTests {
 		public int getNumber() {
 			return this.number;
 		}
+
+		public MessageChannel getChannel(int value) {
+			return (value == 0) ? clear : remainders;
+		}
 	}
 
 }