Simplified router hierarchy and only implementing ChannelRegistryAware for routers that resolve channel names.

This commit is contained in:
Mark Fisher
2008-09-29 20:59:17 +00:00
parent 0c35a1781e
commit 590d346f08
9 changed files with 73 additions and 89 deletions

View File

@@ -41,7 +41,7 @@ public class MultiChannelRouterTests {
public void routeWithChannelResolver() {
final QueueChannel channel1 = new QueueChannel();
final QueueChannel channel2 = new QueueChannel();
AbstractChannelResolver channelResolver = new AbstractChannelResolver() {
ChannelResolver channelResolver = new ChannelResolver() {
public List<MessageChannel> resolveChannels(Message<?> message) {
List<MessageChannel> channels = new ArrayList<MessageChannel>();
channels.add(channel1);
@@ -62,7 +62,7 @@ public class MultiChannelRouterTests {
@Test
public void routeWithChannelNameResolver() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] {"channel1", "channel2"};
}
@@ -88,7 +88,7 @@ public class MultiChannelRouterTests {
@Test(expected = MessagingException.class)
public void channelNameLookupFailure() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] {"noSuchChannel"};
}
@@ -102,7 +102,7 @@ public class MultiChannelRouterTests {
@Test(expected = MessagingException.class)
public void channelRegistryNotAvailable() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] {"noSuchChannel"};
}

View File

@@ -86,7 +86,7 @@ public class RouterEndpointTests {
@Test
public void nullChannelNameArrayIgnoredByDefault() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return null;
}
@@ -100,7 +100,7 @@ public class RouterEndpointTests {
@Test(expected = MessageDeliveryException.class)
public void nullChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return null;
}
@@ -116,7 +116,7 @@ public class RouterEndpointTests {
@Test
public void emptyChannelNameArrayIgnoredByDefault() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] {};
}
@@ -130,7 +130,7 @@ public class RouterEndpointTests {
@Test(expected = MessageDeliveryException.class)
public void emptyChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] {};
}
@@ -156,7 +156,7 @@ public class RouterEndpointTests {
@Test(expected = MessagingException.class)
public void testChannelRegistryIsRequiredWhenUsingChannelNameResolverWithMultiChannelRouter() {
AbstractMultiChannelNameResolver channelNameResolver = new AbstractMultiChannelNameResolver() {
AbstractChannelNameResolver channelNameResolver = new AbstractChannelNameResolver() {
public String[] resolveChannelNames(Message<?> message) {
return new String[] { "notImportant" };
}