Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1377, merged AbstractSingleChannelNameRouter with AbstractMessageRouter, fixed corresponding tests, removed dependencies on it across the workspace

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-10-13 11:30:09 -04:00
parent f69a178c1f
commit ecc8b23cf1
13 changed files with 252 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class MultiChannelRouterTests {
@Test
public void routeWithChannelMapping() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"channel1", "channel2"});
@@ -64,7 +64,7 @@ public class MultiChannelRouterTests {
@Test(expected = MessagingException.class)
public void channelNameLookupFailure() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"noSuchChannel"} );
@@ -78,7 +78,7 @@ public class MultiChannelRouterTests {
@Test(expected = MessagingException.class)
public void channelMappingNotAvailable() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"noSuchChannel"});

32
spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java
View File

@@ -45,9 +45,11 @@ public class RouterTests {
@Test
public void nullChannelIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
public List<MessageChannel> determineTargetChannels(Message<?> message) {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
};
Message<String> message = new GenericMessage<String>("test");
router.handleMessage(message);
@@ -56,7 +58,8 @@ public class RouterTests {
@Test(expected = MessageDeliveryException.class)
public void nullChannelThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
public List<MessageChannel> determineTargetChannels(Message<?> message) {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
};
@@ -68,8 +71,9 @@ public class RouterTests {
@Test
public void emptyChannelListIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
public List<MessageChannel> determineTargetChannels(Message<?> message) {
return Collections.emptyList();
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
};
Message<String> message = new GenericMessage<String>("test");
@@ -79,8 +83,9 @@ public class RouterTests {
@Test(expected = MessageDeliveryException.class)
public void emptyChannelListThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
public List<MessageChannel> determineTargetChannels(Message<?> message) {
return Collections.emptyList();
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
};
router.setResolutionRequired(true);
@@ -90,8 +95,9 @@ public class RouterTests {
@Test
public void nullChannelNameArrayIgnoredByDefault() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
protected List<Object> getChannelIndicatorList(Message<?> message) {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
};
@@ -103,7 +109,7 @@ public class RouterTests {
@Test(expected = MessageDeliveryException.class)
public void nullChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIndicatorList(Message<?> message) {
return null;
}
@@ -118,7 +124,7 @@ public class RouterTests {
@Test
public void emptyChannelNameArrayIgnoredByDefault() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIndicatorList(Message<?> message) {
return new ArrayList<Object>();
}
@@ -131,7 +137,7 @@ public class RouterTests {
@Test(expected = MessageDeliveryException.class)
public void emptyChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {});
@@ -157,7 +163,7 @@ public class RouterTests {
@Test(expected = MessagingException.class)
public void channelMappingIsRequiredWhenResolvingChannelNamesWithMultiChannelRouter() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message){
return CollectionUtils.arrayToList(new String[] { "notImportant" });
@@ -185,7 +191,7 @@ public class RouterTests {
@Test
public void beanFactoryWithMultiChannelRouter() {
AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message) {
return CollectionUtils.arrayToList(new String[] { "testChannel" });

6
spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.mockito.Mockito;
@@ -205,9 +206,10 @@ public class RouterParserTests {
this.channel = channel;
}
@Override
protected Collection<MessageChannel> determineTargetChannels(Message<?> message) {
return Collections.singletonList(this.channel);
protected List<Object> getChannelIndicatorList(Message<?> message) {
return Collections.singletonList((Object)this.channel);
}
}