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

implemented collection/map converter conditional matching checks; updated SpEL to reflect this behavior

Browse Source
This commit is contained in:
Keith Donald
2011-06-07 20:00:28 +00:00
parent df460f4486
commit 1e39b0bbbc
22 changed files with 239 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
View File

@@ -45,7 +45,7 @@ final class ArrayToArrayConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
return this.helperConverter.matches(sourceType, targetType);
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {

18
org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
View File

@@ -49,7 +49,23 @@ final class ArrayToCollectionConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (targetType.getElementTypeDescriptor() == null) {
// yes
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getElementTypeDescriptor().getType().isAssignableFrom(targetType.getElementTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
@SuppressWarnings("unchecked")

2
org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
View File

@@ -45,7 +45,7 @@ final class ArrayToObjectConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
return this.helperConverter.matches(sourceType, targetType);
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {

2
org.springframework.core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
View File

@@ -45,7 +45,7 @@ final class ArrayToStringConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
return this.helperConverter.matches(sourceType, targetType);
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {

20
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
View File

@@ -49,7 +49,23 @@ final class CollectionToArrayConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (sourceType.getElementTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getElementTypeDescriptor().getType().isAssignableFrom(targetType.getElementTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -66,4 +82,4 @@ final class CollectionToArrayConverter implements ConditionalGenericConverter {
return array;
}
}
}

24
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
View File

@@ -49,7 +49,27 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (targetType.getElementTypeDescriptor() == null) {
// yes
return true;
}
if (sourceType.getElementTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getElementTypeDescriptor().getType().isAssignableFrom(targetType.getElementTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
@SuppressWarnings("unchecked")
@@ -72,4 +92,4 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
return target;
}
}
}

18
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
View File

@@ -43,7 +43,23 @@ final class CollectionToObjectConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (sourceType.getElementTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getElementTypeDescriptor(), targetType);
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getElementTypeDescriptor().getType().isAssignableFrom(targetType.getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {

20
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
View File

@@ -45,7 +45,23 @@ final class CollectionToStringConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (sourceType.getElementTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getElementTypeDescriptor(), targetType);
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getElementTypeDescriptor().getType().isAssignableFrom(targetType.getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -69,4 +85,4 @@ final class CollectionToStringConverter implements ConditionalGenericConverter {
return sb.toString();
}
}
}

50
org.springframework.core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
View File

@@ -49,7 +49,7 @@ final class MapToMapConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
return canConvertKey(sourceType, targetType) && canConvertValue(sourceType, targetType);
}
@SuppressWarnings("unchecked")
@@ -70,6 +70,54 @@ final class MapToMapConverter implements ConditionalGenericConverter {
}
// internal helpers
private boolean canConvertKey(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (targetType.getMapKeyTypeDescriptor() == null) {
// yes
return true;
}
if (sourceType.getMapKeyTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getMapKeyTypeDescriptor(), targetType.getMapKeyTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getMapKeyTypeDescriptor().getType().isAssignableFrom(targetType.getMapKeyTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
private boolean canConvertValue(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (targetType.getMapValueTypeDescriptor() == null) {
// yes
return true;
}
if (sourceType.getMapValueTypeDescriptor() == null) {
// maybe
return true;
}
boolean canConvert = conversionService.canConvert(sourceType.getMapValueTypeDescriptor(), targetType.getMapValueTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getMapValueTypeDescriptor().getType().isAssignableFrom(targetType.getMapValueTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
private Object convertKey(Object sourceKey, TypeDescriptor sourceType, TypeDescriptor targetType) {
if (targetType == null) {

14
org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
View File

@@ -44,7 +44,19 @@ final class ObjectToArrayConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
boolean canConvert = conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getType().isAssignableFrom(targetType.getElementTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {

20
org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
View File

@@ -46,7 +46,23 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return true;
if (targetType.getElementTypeDescriptor() == null) {
// yes
return true;
}
boolean canConvert = conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor());
if (canConvert) {
// yes
return true;
} else {
if (sourceType.getType().isAssignableFrom(targetType.getElementTypeDescriptor().getType())) {
// maybe;
return true;
} else {
// no;
return false;
}
}
}
@SuppressWarnings("unchecked")
@@ -64,4 +80,4 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
return target;
}
}
}

8
org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
View File

@@ -175,16 +175,16 @@ public class CollectionToCollectionConverterTests {
assertEquals(resources, conversionService.convert(resources, sourceType, new TypeDescriptor(getClass().getField("resources"))));
}
@Test
public void allNullsNotConvertible() throws Exception {
@Test(expected=ConverterNotFoundException.class)
public void elementTypesNotConvertible() throws Exception {
List<Resource> resources = new ArrayList<Resource>();
resources.add(null);
resources.add(null);
TypeDescriptor sourceType = new TypeDescriptor(getClass().getField("allNullsNotConvertible"));
TypeDescriptor sourceType = new TypeDescriptor(getClass().getField("strings"));
assertEquals(resources, conversionService.convert(resources, sourceType, new TypeDescriptor(getClass().getField("resources"))));
}
public List<String> allNullsNotConvertible;
public List<String> strings;
@Test(expected=ConversionFailedException.class)
public void nothingInCommon() throws Exception {

6
org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
View File

@@ -225,11 +225,11 @@ public class GenericConversionServiceTests {
@Test
public void genericConverterDelegatingBackToConversionServiceConverterNotFound() {
conversionService.addConverter(new ObjectToArrayConverter(conversionService));
assertTrue(conversionService.canConvert(String.class, Integer[].class));
assertFalse(conversionService.canConvert(String.class, Integer[].class));
try {
conversionService.convert("3,4,5", Integer[].class);
} catch (ConversionFailedException e) {
assertTrue(e.getCause() instanceof ConverterNotFoundException);
fail("should have failed");
} catch (ConverterNotFoundException e) {
}
}

10
org.springframework.core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
View File

@@ -3,6 +3,7 @@ package org.springframework.core.convert.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Arrays;
import java.util.HashMap;
@@ -114,12 +115,13 @@ public class MapToMapConverterTests {
map.put("2", Arrays.asList("37", "23"));
TypeDescriptor sourceType = new TypeDescriptor(getClass().getField("sourceCollectionMapTarget"));
TypeDescriptor targetType = new TypeDescriptor(getClass().getField("collectionMapTarget"));
assertTrue(conversionService.canConvert(sourceType, targetType));
assertFalse(conversionService.canConvert(sourceType, targetType));
try {
conversionService.convert(map, sourceType, targetType);
} catch (ConversionFailedException e) {
assertTrue(e.getCause() instanceof ConverterNotFoundException);
}
fail("Should have failed");
} catch (ConverterNotFoundException e) {
}
conversionService.addConverter(new CollectionToCollectionConverter(conversionService));
conversionService.addConverterFactory(new StringToNumberConverterFactory());
assertTrue(conversionService.canConvert(sourceType, targetType));