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

renamed getChannelIndicatorList method to getChannelIdentifiers on AbstractMessageRouter

Browse Source
This commit is contained in:
Mark Fisher
2010-11-10 08:50:21 -05:00
parent 0a82438e2e
commit 38aa676cb9
13 changed files with 47 additions and 48 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 {
public void routeWithChannelMapping() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
public List<Object> getChannelIdentifiers(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"channel1", "channel2"});
}
};
@@ -64,7 +64,7 @@ public class MultiChannelRouterTests {
public void channelNameLookupFailure() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
public List<Object> getChannelIdentifiers(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"noSuchChannel"} );
}
};
@@ -78,7 +78,7 @@ public class MultiChannelRouterTests {
public void channelMappingNotAvailable() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
public List<Object> getChannelIndicatorList(Message<?> message) {
public List<Object> getChannelIdentifiers(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {"noSuchChannel"});
}
};

16
spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java
View File

@@ -56,17 +56,17 @@ public class PayloadTypeRouterTests {
Message<String> message1 = new GenericMessage<String>("test");
Message<Integer> message2 = new GenericMessage<Integer>(123);
assertEquals(1, router.getChannelIndicatorList(message1).size());
assertEquals("stringChannel", router.getChannelIndicatorList(message1).iterator().next());
assertEquals(1, router.getChannelIndicatorList(message2).size());
assertEquals("integerChannel", router.getChannelIndicatorList(message2).iterator().next());
assertEquals(1, router.getChannelIdentifiers(message1).size());
assertEquals("stringChannel", router.getChannelIdentifiers(message1).iterator().next());
assertEquals(1, router.getChannelIdentifiers(message2).size());
assertEquals("integerChannel", router.getChannelIdentifiers(message2).iterator().next());
// validate dynamics
QueueChannel newChannel = new QueueChannel();
beanFactory.registerSingleton("newChannel", newChannel);
router.setChannelMapping(String.class.getName(), "newChannel");
assertEquals(1, router.getChannelIndicatorList(message1).size());
assertEquals("newChannel", router.getChannelIndicatorList(message1).iterator().next());
assertEquals(1, router.getChannelIdentifiers(message1).size());
assertEquals("newChannel", router.getChannelIdentifiers(message1).iterator().next());
// validate nothing happens if mappings were removed and resolutionRequires = false
router.removeChannelMapping(String.class.getName());
router.removeChannelMapping(Integer.class.getName());
@@ -108,7 +108,7 @@ public class PayloadTypeRouterTests {
QueueChannel newChannel = new QueueChannel();
beanFactory.registerSingleton("newChannel", newChannel);
router.setChannelMapping(Integer.class.getName(), "newChannel");
assertEquals(1, router.getChannelIndicatorList(message).size());
assertEquals(1, router.getChannelIdentifiers(message).size());
router.handleMessage(message);
result = newChannel.receive(10);
assertNotNull(result);
@@ -208,7 +208,7 @@ public class PayloadTypeRouterTests {
QueueChannel newChannel = new QueueChannel();
beanFactory.registerSingleton("newChannel", newChannel);
router.setChannelMapping(Integer.class.getName(), "newChannel");
assertEquals(1, router.getChannelIndicatorList(message).size());
assertEquals(1, router.getChannelIdentifiers(message).size());
router.handleMessage(message);
result = newChannel.receive(10);
assertNotNull(result);

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

@@ -43,7 +43,7 @@ public class RouterTests {
public void nullChannelIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -55,7 +55,7 @@ public class RouterTests {
public void nullChannelThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -68,7 +68,7 @@ public class RouterTests {
public void emptyChannelListIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -80,7 +80,7 @@ public class RouterTests {
public void emptyChannelListThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -93,7 +93,7 @@ public class RouterTests {
public void nullChannelNameArrayIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -106,7 +106,7 @@ public class RouterTests {
@Test(expected = MessageDeliveryException.class)
public void nullChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
}
};
@@ -121,7 +121,7 @@ public class RouterTests {
@Test
public void emptyChannelNameArrayIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return new ArrayList<Object>();
}
};
@@ -135,7 +135,7 @@ public class RouterTests {
public void emptyChannelNameArrayThrowsExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return CollectionUtils.arrayToList(new String[] {});
}
};
@@ -161,7 +161,7 @@ public class RouterTests {
public void channelMappingIsRequiredWhenResolvingChannelNamesWithMultiChannelRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message){
protected List<Object> getChannelIdentifiers(Message<?> message){
return CollectionUtils.arrayToList(new String[] { "notImportant" });
}
};
@@ -189,7 +189,7 @@ public class RouterTests {
public void beanFactoryWithMultiChannelRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return CollectionUtils.arrayToList(new String[] { "testChannel" });
}
};

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

@@ -206,7 +206,7 @@ public class RouterParserTests {
@Override
protected List<Object> getChannelIndicatorList(Message<?> message) {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return Collections.singletonList((Object)this.channel);
}
}