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

INT-930 falling back to a default ConversionService so that a bean does not have to be defined for common cases

Browse Source
This commit is contained in:
Mark Fisher
2010-03-10 05:00:46 +00:00
parent 88a2c65519
commit 1b2ff13413
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java
View File

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.integration.channel.BeanFactoryChannelResolver;
import org.springframework.integration.channel.ChannelResolutionException;
import org.springframework.integration.channel.ChannelResolver;
@@ -140,17 +141,13 @@ public abstract class AbstractChannelNameResolvingMessageRouter extends Abstract
else if (channelIndicator instanceof Collection) {
addToCollection(channels, (Collection<?>) channelIndicator, message);
}
else if (this.getConversionService().canConvert(channelIndicator.getClass(), String.class)) {
addChannelFromString(channels,
this.getConversionService().convert(channelIndicator, String.class), message);
}
else {
if (this.conversionService == null && this.beanFactory != null) {
this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
}
if (this.conversionService != null
&& this.conversionService.canConvert(channelIndicator.getClass(), String.class)) {
addChannelFromString(channels, this.conversionService.convert(channelIndicator, String.class), message);
}
else {
throw new MessagingException("unsupported return type for router [" + channelIndicator.getClass() + "]");
}
throw new MessagingException(
"unsupported return type for router [" + channelIndicator.getClass() + "]");
}
}
}
@@ -168,6 +165,18 @@ public abstract class AbstractChannelNameResolvingMessageRouter extends Abstract
}
}
private ConversionService getConversionService() {
if (this.conversionService == null) {
if (this.beanFactory != null) {
this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
}
if (this.conversionService == null) {
this.conversionService = ConversionServiceFactory.createDefaultConversionService();
}
}
return this.conversionService;
}
/**
* Subclasses must implement this method to return the channel indicators.
*/

2
org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests-context.xml
View File

@@ -20,6 +20,4 @@
<mapping value="false" channel="falseChannel" />
</header-value-router>
<beans:bean id="integrationConversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
</beans:beans>