From 295d609eb3e792a50594fab9d5b374dacb0c8844 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Sat, 3 Dec 2016 15:16:23 -0500
Subject: [PATCH] INT-4180: RecipientListRouterSpec Fix

JIRA: https://jira.spring.io/browse/INT-4180

Use `if...else` for `null` in `recipient()` with `Expression`.

Add test.
---
 .../integration/dsl/RecipientListRouterSpec.java   | 12 +++++++++---
 .../integration/dsl/routers/RouterTests.java       | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java
index 222867317f..758dbb8eee 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java
@@ -32,6 +32,7 @@ import org.springframework.util.StringUtils;
  * An {@link AbstractRouterSpec} for a {@link RecipientListRouter}.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 5.0
  */
@@ -142,9 +143,14 @@ public class RecipientListRouterSpec extends AbstractRouterSpec<RecipientListRou
 	 * @return the router spec.
 	 */
 	public RecipientListRouterSpec recipient(MessageChannel channel, Expression expression) {
-		ExpressionEvaluatingSelector selector = new ExpressionEvaluatingSelector(expression);
-		this.target.addRecipient(channel, selector);
-		this.componentsToRegister.add(selector);
+		if (expression != null) {
+			ExpressionEvaluatingSelector selector = new ExpressionEvaluatingSelector(expression);
+			this.target.addRecipient(channel, selector);
+			this.componentsToRegister.add(selector);
+		}
+		else {
+			this.target.addRecipient(channel);
+		}
 		return _this();
 	}
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java
index 6fa9795f95..6d2d7f1fec 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java
@@ -61,6 +61,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 5.0
  */
@@ -441,6 +442,10 @@ public class RouterTests {
 	@Qualifier("recipientListOrderResult")
 	private PollableChannel recipientListOrderResult;
 
+	@Autowired
+	@Qualifier("alwaysRecipient")
+	private QueueChannel alwaysRecipient;
+
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testRecipientListRouterOrder() {
@@ -455,6 +460,8 @@ public class RouterTests {
 		assertNotNull(receive);
 		result = (AtomicReference<String>) receive.getPayload();
 		assertEquals("Hello World", result.get());
+
+		assertEquals(1, this.alwaysRecipient.getQueueSize());
 	}
 
 	@Autowired
@@ -582,7 +589,6 @@ public class RouterTests {
 					.get();
 		}
 
-
 		@Bean
 		public RoutingTestBean routingTestBean() {
 			return new RoutingTestBean();
@@ -646,6 +652,7 @@ public class RouterTests {
 		public IntegrationFlow recipientListOrderFlow() {
 			return f -> f
 					.routeToRecipients(r -> r
+							.recipient(alwaysRecipient())
 							.recipient("recipient2.input")
 							.recipient("recipient1.input"));
 		}
@@ -675,6 +682,11 @@ public class RouterTests {
 			return new QueueChannel();
 		}
 
+		@Bean
+		public QueueChannel alwaysRecipient() {
+			return new QueueChannel();
+		}
+
 		@Bean
 		public IntegrationFlow scatterGatherFlow() {
 			return f -> f