From f8acd850dc11bcd6eaca4c78e40272c64f652a86 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 13 Jul 2011 12:36:51 -0400 Subject: [PATCH] INT-1974 removed the IF statement which was checking the state of the collection in favor of delegating to the ConversionService --- .../integration/util/BeanFactoryTypeConverter.java | 7 ------- .../integration/util/BeanFactoryTypeConverterTests.java | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java index e75ae1eaf9..99d4281695 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java @@ -17,7 +17,6 @@ package org.springframework.integration.util; import java.beans.PropertyEditor; -import java.util.Collection; import org.springframework.beans.BeansException; import org.springframework.beans.SimpleTypeConverter; @@ -28,7 +27,6 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.expression.TypeConverter; -import org.springframework.util.CollectionUtils; /** * @author Dave Syer @@ -99,11 +97,6 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware if (targetType.getType() == Void.class || targetType.getType() == Void.TYPE) { return null; } - if (value instanceof Collection - && CollectionUtils.isEmpty((Collection) value) - && Collection.class.isAssignableFrom(targetType.getObjectType())){ - return value; - } if (conversionService.canConvert(sourceType, targetType)) { return conversionService.convert(value, sourceType, targetType); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index 67aec87076..b4fc6bc64b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -25,9 +25,8 @@ public class BeanFactoryTypeConverterTests { public void testEmptyCollectionConversion(){ BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(); List sourceObject = new ArrayList(); - // source type doesn't even matter ArrayList convertedCollection = - (ArrayList) typeConverter.convertValue(sourceObject, null, TypeDescriptor.forObject(new ArrayList())); + (ArrayList) typeConverter.convertValue(sourceObject, TypeDescriptor.forObject(sourceObject), TypeDescriptor.forObject(new ArrayList())); assertEquals(sourceObject, convertedCollection); }