take element/key/value objects into account for the best possible type descriptor

jhoeller · jhoeller · commit 4a7b96c4ca5d · 2011-12-12T00:44:38.000Z
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
@@ -529,7 +529,7 @@ protected Collection convertToTypedCollection(
 				methodParam.increaseNestingLevel();
 			}
 			Object convertedElement = convertIfNecessary(
-					indexedPropertyName, null, element, elementType, typeDescriptor.getElementTypeDescriptor());
+					indexedPropertyName, null, element, elementType, typeDescriptor.getElementTypeDescriptor(element));
 			if (methodParam != null) {
 				methodParam.decreaseNestingLevel();
 			}
@@ -624,12 +624,12 @@ protected Map convertToTypedMap(
 				methodParam.setTypeIndexForCurrentLevel(0);
 			}
 			Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType,
-					typeDescriptor.getMapKeyTypeDescriptor());
+					typeDescriptor.getMapKeyTypeDescriptor(key));
 			if (methodParam != null) {
 				methodParam.setTypeIndexForCurrentLevel(1);
 			}
 			Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType,
-					typeDescriptor.getMapValueTypeDescriptor());
+					typeDescriptor.getMapValueTypeDescriptor(value));
 			if (methodParam != null) {
 				methodParam.decreaseNestingLevel();
 			}
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -324,7 +324,7 @@ public TypeDescriptor getMapKeyTypeDescriptor() {
 	 */
 	public TypeDescriptor getMapKeyTypeDescriptor(Object key) {
 		TypeDescriptor keyType = getMapKeyTypeDescriptor();
-		return (keyType != TypeDescriptor.UNKNOWN ? keyType : TypeDescriptor.forObject(key));
+		return (!TypeDescriptor.UNKNOWN.equals(keyType) ? keyType : TypeDescriptor.forObject(key));
 	}
 
 	/**
@@ -353,7 +353,7 @@ public TypeDescriptor getMapValueTypeDescriptor() {
 	 */
 	public TypeDescriptor getMapValueTypeDescriptor(Object value) {
 		TypeDescriptor valueType = getMapValueTypeDescriptor();
-		return (valueType != TypeDescriptor.UNKNOWN ? valueType : TypeDescriptor.forObject(value));
+		return (!TypeDescriptor.UNKNOWN.equals(valueType) ? valueType : TypeDescriptor.forObject(value));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ protected Collection convertToTypedCollection(`
`529`	`529`	`methodParam.increaseNestingLevel();`
`530`	`530`	`}`
`531`	`531`	`Object convertedElement = convertIfNecessary(`
`532`		`- indexedPropertyName, null, element, elementType, typeDescriptor.getElementTypeDescriptor());`
	`532`	`+ indexedPropertyName, null, element, elementType, typeDescriptor.getElementTypeDescriptor(element));`
`533`	`533`	`if (methodParam != null) {`
`534`	`534`	`methodParam.decreaseNestingLevel();`
`535`	`535`	`}`
`@@ -624,12 +624,12 @@ protected Map convertToTypedMap(`
`624`	`624`	`methodParam.setTypeIndexForCurrentLevel(0);`
`625`	`625`	`}`
`626`	`626`	`Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType,`
`627`		`- typeDescriptor.getMapKeyTypeDescriptor());`
	`627`	`+ typeDescriptor.getMapKeyTypeDescriptor(key));`
`628`	`628`	`if (methodParam != null) {`
`629`	`629`	`methodParam.setTypeIndexForCurrentLevel(1);`
`630`	`630`	`}`
`631`	`631`	`Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType,`
`632`		`- typeDescriptor.getMapValueTypeDescriptor());`
	`632`	`+ typeDescriptor.getMapValueTypeDescriptor(value));`
`633`	`633`	`if (methodParam != null) {`
`634`	`634`	`methodParam.decreaseNestingLevel();`
`635`	`635`	`}`