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

INT-2039 removed references to deprecated Spring classes. Modified code where needed

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-08-09 00:19:42 -04:00
parent 935cd01d07
commit 6ecf0ec1e6
18 changed files with 80 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
View File

@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.MessageDeliveryException;
@@ -194,7 +194,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler {
protected ConversionService getRequiredConversionService() {
if (this.getConversionService() == null) {
this.setConversionService(ConversionServiceFactory.createDefaultConversionService());
this.setConversionService(new DefaultConversionService());
}
return this.getConversionService();
}

4
spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java
View File

@@ -22,7 +22,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.validation.DataBinder;
@@ -73,7 +73,7 @@ public class MapToObjectTransformer extends AbstractPayloadTransformer<Map<?,?>,
conversionService = ((ConfigurableBeanFactory)this.getBeanFactory()).getConversionService();
}
if (conversionService == null){
conversionService = ConversionServiceFactory.createDefaultConversionService();
conversionService = new DefaultConversionService();
}
binder.setConversionService(conversionService);
binder.bind(new MutablePropertyValues(payload));