Merge branch 'INT-3922'

spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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
@@ -42,6 +42,8 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
 
 	private volatile MessageChannel defaultOutputChannel;
 
+	private volatile String defaultOutputChannelName;
+
 	private volatile Long timeout;
 
 	private volatile Boolean resolutionRequired;
@@ -54,6 +56,10 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
 		this.defaultOutputChannel = defaultOutputChannel;
 	}
 
+	public void setDefaultOutputChannelName(String defaultOutputChannelName) {
+		this.defaultOutputChannelName = defaultOutputChannelName;
+	}
+
 	public void setTimeout(Long timeout) {
 		this.timeout = timeout;
 	}
@@ -112,6 +118,9 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
 		if (this.defaultOutputChannel != null) {
 			router.setDefaultOutputChannel(this.defaultOutputChannel);
 		}
+		if (this.defaultOutputChannelName != null) {
+			router.setDefaultOutputChannelName(this.defaultOutputChannelName);
+		}
 		if (this.timeout != null) {
 			router.setTimeout(this.timeout);
 		}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 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.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.config.RouterFactoryBean;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.support.GenericMessage;
+
+/**
+ * @author Gary Russell
+ * @since 4.2.5
+ *
+ */
+public class RouterFactoryBeanTests {
+
+	private boolean routeAttempted;
+
+	@Test
+	public void testOutputChannelName() throws Exception {
+		RouterFactoryBean fb = new RouterFactoryBean();
+		fb.setTargetObject(this);
+		fb.setTargetMethodName("foo");
+		fb.setDefaultOutputChannelName("bar");
+		BeanFactory beanFactory = mock(BeanFactory.class);
+		QueueChannel bar = new QueueChannel();
+		doReturn(bar).when(beanFactory).getBean("bar", MessageChannel.class);
+		fb.setBeanFactory(beanFactory);
+		MessageHandler handler = fb.getObject();
+		this.routeAttempted = false;
+		handler.handleMessage(new GenericMessage<>("foo"));
+		assertNotNull(bar.receive(10000));
+		assertTrue(this.routeAttempted);
+	}
+
+	public String foo() {
+		routeAttempted = true;
+		return null;
+	}
+
+}