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

polishing

Browse Source
This commit is contained in:
Mark Fisher
2010-11-10 08:14:14 -05:00
parent f6fc550966
commit 09afaed080
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.util.List;
import org.springframework.integration.Message; import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageChannel;
import org.springframework.integration.MessageHandlingException;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -32,41 +33,41 @@ import org.springframework.util.StringUtils;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
*/ */
public class PayloadTypeRouter extends AbstractMessageRouter { public class PayloadTypeRouter extends AbstractMessageRouter {
/** /**
* Will select the most appropriate channel name matching channel identifiers * Selects the most appropriate channel name matching channel identifiers which are the
* which are fully qualifies class name to type available while traversing payload type. * fully qualified class names encountered while traversing the payload type hierarchy.
* To resolve ties and conflicts (e.g., Serializable and String) it will match: * To resolve ties and conflicts (e.g., Serializable and String) it will match:
* 1. Type name to channel identifier else... * 1. Type name to channel identifier else...
* 2. Name of the subclass of the type to channel identifier elc... * 2. Name of the subclass of the type to channel identifier else...
* 3. Name of the Interface of the type to channel identifier while also * 3. Name of the Interface of the type to channel identifier while also
* preferring direct interface over in-direct subclass * preferring direct interface over indirect subclass
*
*/ */
@Override @Override
protected List<Object> getChannelIndicatorList(Message<?> message) { protected List<Object> getChannelIndicatorList(Message<?> message) {
Class<?> firstInterfaceMatch = null; Class<?> firstInterfaceMatch = null;
Class<?> type = message.getPayload().getClass(); Class<?> type = message.getPayload().getClass();
while (type != null && !CollectionUtils.isEmpty(this.channelIdentifierMap)) {
while (type != null && !CollectionUtils.isEmpty(channelIdentifierMap)) {
Class<?>[] interfaces = type.getInterfaces(); Class<?>[] interfaces = type.getInterfaces();
// first try to find a match amongst the interfaces and also check if there is more then one // first try to find a match amongst the interfaces and also check if there is more than one
for (Class<?> interfase : interfaces) { for (Class<?> ifc : interfaces) {
if (channelIdentifierMap.containsKey(interfase.getName())){ if (this.channelIdentifierMap.containsKey(ifc.getName())) {
if (firstInterfaceMatch != null){ if (firstInterfaceMatch != null) {
throw new IllegalStateException("Unresolvable ambiguity while attempting to find closest match for [" + throw new MessageHandlingException(message,
type.getName() + "]. Candidate types [" + firstInterfaceMatch.getName() + "] and [" + interfase.getName() + "Unresolvable ambiguity while attempting to find closest match for [" + type.getName() +
"] have equal weight."); "]. Candidate types [" + firstInterfaceMatch.getName() + "] and [" +
ifc.getName() + "] have equal weight.");
} }
else { else {
firstInterfaceMatch = interfase; firstInterfaceMatch = ifc;
} }
} }
} }
// the actual type should favor the possible interface match // the actual type should favor the possible interface match
String channelName = channelIdentifierMap.get(type.getName()); String channelName = this.channelIdentifierMap.get(type.getName());
if (!StringUtils.hasText(channelName)){ if (!StringUtils.hasText(channelName)) {
if (firstInterfaceMatch != null){ if (firstInterfaceMatch != null) {
return Collections.singletonList((Object)channelIdentifierMap.get(firstInterfaceMatch.getName())); return Collections.singletonList((Object) this.channelIdentifierMap.get(firstInterfaceMatch.getName()));
} }
} }
else { else {
@@ -76,4 +77,5 @@ public class PayloadTypeRouter extends AbstractMessageRouter {
} }
return null; return null;
} }
} }

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

@@ -218,8 +218,8 @@ public class PayloadTypeRouterTests {
assertNotNull(result); assertNotNull(result);
} }
@Test(expected = IllegalStateException.class) @Test(expected = MessageHandlingException.class)
public void ambiguityFailure() throws Throwable { public void ambiguityFailure() throws Exception {
QueueChannel defaultChannel = new QueueChannel(); QueueChannel defaultChannel = new QueueChannel();
defaultChannel.setBeanName("defaultChannel"); defaultChannel.setBeanName("defaultChannel");
QueueChannel serializableChannel = new QueueChannel(); QueueChannel serializableChannel = new QueueChannel();
@@ -242,12 +242,7 @@ public class PayloadTypeRouterTests {
router.setDefaultOutputChannel(defaultChannel); router.setDefaultOutputChannel(defaultChannel);
Message<String> message = new GenericMessage<String>("test"); Message<String> message = new GenericMessage<String>("test");
try { router.handleMessage(message);
router.handleMessage(message);
}
catch (MessageHandlingException e) {
throw e.getCause();
}
} }
@Test @Test