Implemented multi-channel routing with support for resolution by channel instance or channel name.

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

@@ -0,0 +1,170 @@
+/*
+ * 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.router;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.springframework.integration.MessageHandlingException;
+import org.springframework.integration.MessagingConfigurationException;
+import org.springframework.integration.channel.ChannelRegistry;
+import org.springframework.integration.channel.DefaultChannelRegistry;
+import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.PointToPointChannel;
+import org.springframework.integration.message.Message;
+import org.springframework.integration.message.StringMessage;
+
+/**
+ * @author Mark Fisher
+ */
+public class MultiChannelRouterTests {
+
+	@Test
+	public void testRoutingWithChannelResolver() {
+		final PointToPointChannel channel1 = new PointToPointChannel();
+		final PointToPointChannel channel2 = new PointToPointChannel();
+		MultiChannelResolver channelResolver = new MultiChannelResolver() {
+			public List<MessageChannel> resolve(Message<?> message) {
+				List<MessageChannel> channels = new ArrayList<MessageChannel>();
+				channels.add(channel1);
+				channels.add(channel2);
+				return channels;
+			}
+		};
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelResolver(channelResolver);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+		Message<?> result1 = channel1.receive(25);
+		assertNotNull(result1);
+		assertEquals("test", result1.getPayload());
+		Message<?> result2 = channel2.receive(25);
+		assertNotNull(result2);
+		assertEquals("test", result2.getPayload());
+	}
+
+	@Test
+	public void testRoutingWithChannelNameResolver() {
+		MultiChannelNameResolver channelNameResolver = new MultiChannelNameResolver() {
+			public String[] resolve(Message<?> message) {
+				return new String[] {"channel1", "channel2"};
+			}
+		};
+		PointToPointChannel channel1 = new PointToPointChannel();
+		PointToPointChannel channel2 = new PointToPointChannel();
+		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
+		channelRegistry.registerChannel("channel1", channel1);
+		channelRegistry.registerChannel("channel2", channel2);
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelNameResolver(channelNameResolver);
+		router.setChannelRegistry(channelRegistry);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+		Message<?> result1 = channel1.receive(25);
+		assertNotNull(result1);
+		assertEquals("test", result1.getPayload());
+		Message<?> result2 = channel2.receive(25);
+		assertNotNull(result2);
+		assertEquals("test", result2.getPayload());
+	}
+
+	@Test(expected=MessagingConfigurationException.class)
+	public void testConfiguringBothChannelResolverAndChannelNameResolverIsNotAllowed() {
+		MultiChannelResolver channelResolver = new MultiChannelResolver() {
+			public List<MessageChannel> resolve(Message<?> message) {
+				return null;
+			}
+		};
+		MultiChannelNameResolver channelNameResolver = new MultiChannelNameResolver() {
+			public String[] resolve(Message<?> message) {
+				return null;
+			}
+		};
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelResolver(channelResolver);		
+		router.setChannelNameResolver(channelNameResolver);
+		router.afterPropertiesSet();
+	}
+
+	public void testChannelResolutionFailureIgnoredByDefault() {
+		MultiChannelResolver channelResolver = new MultiChannelResolver() {
+			public List<MessageChannel> resolve(Message<?> message) {
+				return null;
+			}
+		};
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelResolver(channelResolver);
+		router.setResolutionRequired(true);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
+	@Test(expected=MessageHandlingException.class)
+	public void testChannelResolutionFailureThrowsExceptionWhenResolutionRequired() {
+		MultiChannelResolver channelResolver = new MultiChannelResolver() {
+			public List<MessageChannel> resolve(Message<?> message) {
+				return null;
+			}
+		};
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelResolver(channelResolver);
+		router.setResolutionRequired(true);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
+	public void testChannelNameResolutionFailureIgnoredByDefault() {
+		MultiChannelNameResolver channelNameResolver = new MultiChannelNameResolver() {
+			public String[] resolve(Message<?> message) {
+				return new String[] {"noSuchChannel"};
+			}
+		};
+		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelNameResolver(channelNameResolver);
+		router.setChannelRegistry(channelRegistry);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
+	@Test(expected=MessageHandlingException.class)
+	public void testChannelNameResolutionFailureThrowsExceptionWhenResolutionRequired() {
+		MultiChannelNameResolver channelNameResolver = new MultiChannelNameResolver() {
+			public String[] resolve(Message<?> message) {
+				return new String[] {"noSuchChannel"};
+			}
+		};
+		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
+		MultiChannelRouter router = new MultiChannelRouter();
+		router.setChannelNameResolver(channelNameResolver);
+		router.setChannelRegistry(channelRegistry);
+		router.setResolutionRequired(true);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
+}

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

@@ -33,7 +33,7 @@ import org.springframework.integration.message.StringMessage;
 /**
  * @author Mark Fisher
  */
-public class RoutingMessageHandlerTests {
+public class SingleChannelRouterTests {
 
 	@Test
 	public void testRoutingWithChannelResolver() {
@@ -43,7 +43,7 @@ public class RoutingMessageHandlerTests {
 				return channel;
 			}
 		};
-		RoutingMessageHandler router = new RoutingMessageHandler();
+		SingleChannelRouter router = new SingleChannelRouter();
 		router.setChannelResolver(channelResolver);
 		router.afterPropertiesSet();
 		Message<String> message = new StringMessage("123", "test");
@@ -63,7 +63,7 @@ public class RoutingMessageHandlerTests {
 		PointToPointChannel channel = new PointToPointChannel();
 		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
 		channelRegistry.registerChannel("testChannel", channel);
-		RoutingMessageHandler router = new RoutingMessageHandler();
+		SingleChannelRouter router = new SingleChannelRouter();
 		router.setChannelNameResolver(channelNameResolver);
 		router.setChannelRegistry(channelRegistry);
 		router.afterPropertiesSet();
@@ -86,37 +86,49 @@ public class RoutingMessageHandlerTests {
 				return "";
 			}
 		};
-		RoutingMessageHandler router = new RoutingMessageHandler();
+		SingleChannelRouter router = new SingleChannelRouter();
 		router.setChannelResolver(channelResolver);		
 		router.setChannelNameResolver(channelNameResolver);
 		router.afterPropertiesSet();
 	}
 
-	@Test(expected=MessageHandlingException.class)
-	public void testChannelResolutionFailure() {
+	public void testChannelResolutionFailureIgnoredByDefault() {
 		ChannelResolver channelResolver = new ChannelResolver() {
 			public MessageChannel resolve(Message<?> message) {
 				return null;
 			}
 		};
-		RoutingMessageHandler router = new RoutingMessageHandler();
+		SingleChannelRouter router = new SingleChannelRouter();
 		router.setChannelResolver(channelResolver);
+		router.setResolutionRequired(true);
 		router.afterPropertiesSet();
 		Message<String> message = new StringMessage("123", "test");
 		router.handle(message);
 	}
 
 	@Test(expected=MessageHandlingException.class)
-	public void testChannelNameResolutionFailure() {
+	public void testChannelResolutionFailureThrowsExceptionWhenResolutionRequired() {
+		ChannelResolver channelResolver = new ChannelResolver() {
+			public MessageChannel resolve(Message<?> message) {
+				return null;
+			}
+		};
+		SingleChannelRouter router = new SingleChannelRouter();
+		router.setChannelResolver(channelResolver);
+		router.setResolutionRequired(true);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
+	public void testChannelNameResolutionFailureIgnoredByDefault() {
 		ChannelNameResolver channelNameResolver = new ChannelNameResolver() {
 			public String resolve(Message<?> message) {
 				return "noSuchChannel";
 			}
 		};
-		PointToPointChannel channel = new PointToPointChannel();
 		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
-		channelRegistry.registerChannel("testChannel", channel);
-		RoutingMessageHandler router = new RoutingMessageHandler();
+		SingleChannelRouter router = new SingleChannelRouter();
 		router.setChannelNameResolver(channelNameResolver);
 		router.setChannelRegistry(channelRegistry);
 		router.afterPropertiesSet();
@@ -124,4 +136,21 @@ public class RoutingMessageHandlerTests {
 		router.handle(message);
 	}
 
+	@Test(expected=MessageHandlingException.class)
+	public void testChannelNameResolutionFailureThrowsExceptionWhenResolutionRequired() {
+		ChannelNameResolver channelNameResolver = new ChannelNameResolver() {
+			public String resolve(Message<?> message) {
+				return "noSuchChannel";
+			}
+		};
+		ChannelRegistry channelRegistry = new DefaultChannelRegistry();
+		SingleChannelRouter router = new SingleChannelRouter();
+		router.setChannelNameResolver(channelNameResolver);
+		router.setChannelRegistry(channelRegistry);
+		router.setResolutionRequired(true);
+		router.afterPropertiesSet();
+		Message<String> message = new StringMessage("123", "test");
+		router.handle(message);
+	}
+
 }