root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-8718 Minor polish

This commit is contained in:
Rossen Stoyanchev 2011-10-06 18:06:47 +00:00
parent 369f6f032b
commit 4199d772cc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
if (source == null) {
return null;
}
boolean isCopyRequired = !targetType.getType().isInstance(source);
boolean copyRequired = !targetType.getType().isInstance(source);
Collection<?> sourceCollection = (Collection<?>) source;
Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), sourceCollection.size());
if (targetType.getElementTypeDescriptor() == null) {
@ -70,11 +70,11 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
Object targetElement = this.conversionService.convert(sourceElement, sourceType.elementTypeDescriptor(sourceElement), targetType.getElementTypeDescriptor());
target.add(targetElement);
if (sourceElement != targetElement) {
isCopyRequired = true;
copyRequired = true;
}
}
}
return isCopyRequired ? target : source;
return copyRequired ? target : source;
}
}

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

@ -57,7 +57,7 @@ final class MapToMapConverter implements ConditionalGenericConverter {
if (source == null) {
return null;
}
boolean isCopyRequired = !targetType.getType().isInstance(source);
boolean copyRequired = !targetType.getType().isInstance(source);
Map<Object, Object> sourceMap = (Map<Object, Object>) source;
Map<Object, Object> targetMap = CollectionFactory.createMap(targetType.getType(), sourceMap.size());
for (Map.Entry<Object, Object> entry : sourceMap.entrySet()) {
@ -67,10 +67,10 @@ final class MapToMapConverter implements ConditionalGenericConverter {
Object targetValue = convertValue(sourceValue, sourceType, targetType.getMapValueTypeDescriptor());
targetMap.put(targetKey, targetValue);
if (sourceKey != targetKey || sourceValue != targetValue) {
isCopyRequired = true;
copyRequired = true;
}
}
return isCopyRequired ? targetMap : sourceMap;
return copyRequired ? targetMap : sourceMap;
}
// internal helpers