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

fixed failing test

Browse Source
This commit is contained in:
Keith Donald
2010-04-17 06:28:06 +00:00
parent d98da7d240
commit b9aeba23ef
6 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@@ -433,7 +433,15 @@ public class TypeDescriptor {
if (this == TypeDescriptor.NULL || targetType == TypeDescriptor.NULL) {
return true;
}
return targetType.getObjectType().isAssignableFrom(getObjectType());
if (isCollection()) {
return targetType.isCollection() && getElementTypeDescriptor().isAssignableTo(targetType.getElementTypeDescriptor());
} else if (isMap()) {
return targetType.isMap() && getMapKeyTypeDescriptor().isAssignableTo(targetType.getMapKeyTypeDescriptor()) && getMapValueTypeDescriptor().isAssignableTo(targetType.getMapValueTypeDescriptor());
} else if (isArray()) {
return targetType.isArray() && getElementTypeDescriptor().isAssignableTo(targetType.getElementTypeDescriptor());
} else {
return targetType.getObjectType().isAssignableFrom(getObjectType());
}
}
/**

41
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@@ -247,6 +247,9 @@ public class GenericConversionService implements ConversionService, ConverterReg
*/
protected GenericConverter getDefaultConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (sourceType.isAssignableTo(targetType)) {
if (logger.isDebugEnabled()) {
logger.debug("Matched default NO_OP_CONVERTER");
}
return NO_OP_CONVERTER;
}
else {
@@ -287,15 +290,15 @@ public class GenericConversionService implements ConversionService, ConverterReg
}
private GenericConverter findConverterForClassPair(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (logger.isTraceEnabled()) {
logger.trace("Looking for Converter to convert from " + sourceType + " to " + targetType);
}
Class<?> sourceObjectType = sourceType.getObjectType();
if (sourceObjectType.isInterface()) {
LinkedList<Class<?>> classQueue = new LinkedList<Class<?>>();
classQueue.addFirst(sourceObjectType);
while (!classQueue.isEmpty()) {
Class<?> currentClass = classQueue.removeLast();
if (logger.isTraceEnabled()) {
logger.trace("Looking for converters indexed by sourceType [" + currentClass.getName() + "]");
}
Map<Class<?>, MatchableConverters> converters = getTargetConvertersForSource(currentClass);
GenericConverter converter = getMatchingConverterForTarget(sourceType, targetType, converters);
if (converter != null) {
@@ -314,6 +317,9 @@ public class GenericConversionService implements ConversionService, ConverterReg
classQueue.addFirst(sourceObjectType);
while (!classQueue.isEmpty()) {
Class<?> currentClass = classQueue.removeLast();
if (logger.isTraceEnabled()) {
logger.trace("Looking for converters indexed by sourceType [" + currentClass.getName() + "]");
}
Map<Class<?>, MatchableConverters> converters = getTargetConvertersForSource(currentClass);
GenericConverter converter = getMatchingConverterForTarget(sourceType, targetType, converters);
if (converter != null) {
@@ -356,6 +362,9 @@ public class GenericConversionService implements ConversionService, ConverterReg
classQueue.addFirst(targetObjectType);
while (!classQueue.isEmpty()) {
Class<?> currentClass = classQueue.removeLast();
if (logger.isTraceEnabled()) {
logger.trace("and indexed by targetType [" + currentClass.getName() + "]");
}
MatchableConverters matchable = converters.get(currentClass);
GenericConverter converter = matchConverter(matchable, sourceType, targetType);
if (converter != null) {
@@ -366,6 +375,9 @@ public class GenericConversionService implements ConversionService, ConverterReg
classQueue.addFirst(ifc);
}
}
if (logger.isTraceEnabled()) {
logger.trace("and indexed by [java.lang.Object]");
}
return matchConverter(converters.get(Object.class), sourceType, targetType);
}
else {
@@ -373,6 +385,9 @@ public class GenericConversionService implements ConversionService, ConverterReg
classQueue.addFirst(targetObjectType);
while (!classQueue.isEmpty()) {
Class<?> currentClass = classQueue.removeLast();
if (logger.isTraceEnabled()) {
logger.trace("and indexed by targetType [" + currentClass.getName() + "]");
}
MatchableConverters matchable = converters.get(currentClass);
GenericConverter converter = matchConverter(matchable, sourceType, targetType);
if (converter != null) {
@@ -405,9 +420,14 @@ public class GenericConversionService implements ConversionService, ConverterReg
}
}
private GenericConverter matchConverter(
MatchableConverters matchable, TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
return (matchable != null ? matchable.matchConverter(sourceFieldType, targetFieldType) : null);
private GenericConverter matchConverter(MatchableConverters matchable, TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
if (matchable == null) {
return null;
}
if (logger.isTraceEnabled()) {
logger.trace("Found matchable converters " + matchable);
}
return matchable.matchConverter(sourceFieldType, targetFieldType);
}
@SuppressWarnings("unchecked")
@@ -491,21 +511,24 @@ public class GenericConversionService implements ConversionService, ConverterReg
public GenericConverter matchConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (this.conditionalConverters != null) {
for (ConditionalGenericConverter conditional : this.conditionalConverters) {
if (logger.isTraceEnabled()) {
logger.trace("Matching " + conditional);
}
if (conditional.matches(sourceType, targetType)) {
if (logger.isDebugEnabled()) {
logger.debug("[MATCHED] converter " + conditional);
logger.debug("Matched converter " + conditional);
}
return conditional;
}
else {
if (logger.isDebugEnabled()) {
logger.debug("[DID NOT MATCH] converter " + conditional);
logger.debug("Did not match converter " + conditional);
}
}
}
}
if (this.defaultConverter != null && logger.isDebugEnabled()) {
logger.debug("[MATCHED] converter " + this.defaultConverter);
logger.debug("Matched converter " + this.defaultConverter);
}
return this.defaultConverter;
}

2
org.springframework.core/src/test/resources/log4j.xml
View File

@@ -12,7 +12,7 @@
</appender>
<logger name="org.springframework.core">
<level value="debug" />
<level value="trace" />
</logger>
<!-- Root Logger -->