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

INT-1969 polished PayloadTypeRouter support for determining the weight of sub-classes

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-07-15 23:25:24 -04:00
parent 4929fff7e5
commit f31aff1c27
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java
View File

@@ -115,7 +115,7 @@ public class PayloadTypeRouter extends AbstractMessageRouter {
}
// check interface hierarchy
for (Class<?> superInterface : iface.getInterfaces()) {
int weight = this.determineTypeDifferenceWeight(candidate, superInterface, level + 2);
int weight = this.determineTypeDifferenceWeight(candidate, superInterface, level + 3);
if (weight < Integer.MAX_VALUE) {
return weight;
}

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

@@ -199,7 +199,7 @@ public class PayloadTypeRouterTests {
assertNotNull(result);
}
@Test
@Test
public void higherWeightInterface() {
QueueChannel defaultChannel = new QueueChannel();
defaultChannel.setBeanName("defaultChannel");
@@ -226,7 +226,36 @@ public class PayloadTypeRouterTests {
router.setDefaultOutputChannel(defaultChannel);
Message<C1> message = new GenericMessage<C1>(new C1());
router.handleMessage(message);
Message<?> result = serializableChannel.receive(0);
}
@Test
public void superclassWinsOverDstantInterface() {
QueueChannel defaultChannel = new QueueChannel();
defaultChannel.setBeanName("defaultChannel");
QueueChannel c3Channel = new QueueChannel();
c3Channel.setBeanName("c3Channel");
QueueChannel i4Channel = new QueueChannel();
i4Channel.setBeanName("i4Channel");
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
beanFactory.registerSingleton("defaultChannel", defaultChannel);
beanFactory.registerSingleton("c3Channel", c3Channel);
beanFactory.registerSingleton("i4Channel", i4Channel);
Map<String, String> payloadTypeChannelMap = new ConcurrentHashMap<String, String>();
payloadTypeChannelMap.put(C3.class.getName(), "c3Channel");
payloadTypeChannelMap.put(I4.class.getName(), "i4Channel");
PayloadTypeRouter router = new PayloadTypeRouter();
router.setBeanFactory(beanFactory);
router.setChannelIdentifierMap(payloadTypeChannelMap);
router.setDefaultOutputChannel(defaultChannel);
Message<C1> message = new GenericMessage<C1>(new C1());
router.handleMessage(message);
Message<?> result = c3Channel.receive(0);
assertNotNull(result);
}
@@ -433,9 +462,12 @@ public class PayloadTypeRouterTests {
public interface I2 extends I3 {}
public interface I3 {}
public interface I3 extends I4 {}
public interface I4 {}
public static class C2 extends C3{}
public static class C3{}
}

8
spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java
View File

@@ -63,10 +63,10 @@ public class PayloadTypeRouterParserTests {
PollableChannel chanel2 = (PollableChannel) context.getBean("channel2");
PollableChannel chanel3 = (PollableChannel) context.getBean("channel3");
PollableChannel chanel4 = (PollableChannel) context.getBean("channel4");
assertTrue(chanel1.receive(0).getPayload() instanceof String);
assertTrue(chanel2.receive(0).getPayload() instanceof Integer);
assertTrue(chanel3.receive(0).getPayload().getClass().isArray());
assertTrue(chanel4.receive(0).getPayload().getClass().isArray());
assertTrue(chanel1.receive(100).getPayload() instanceof String);
assertTrue(chanel2.receive(100).getPayload() instanceof Integer);
assertTrue(chanel3.receive(100).getPayload().getClass().isArray());
assertTrue(chanel4.receive(100).getPayload().getClass().isArray());
}
@Test(expected=BeanDefinitionStoreException.class)