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

polish

Browse Source
This commit is contained in:
Keith Donald
2009-10-15 15:49:26 +00:00
parent e99cda3739
commit 3fb3549997
6 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.context/src/main/java/org/springframework/mapping/support/DefaultMappingTargetFactory.java
View File

@@ -30,7 +30,7 @@ final class DefaultMappingTargetFactory implements MappingTargetFactory {
return ClassUtils.hasConstructor(targetType.getType(), null);
}
public Object createTarget(TypeDescriptor targetType) {
public Object createTarget(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
return BeanUtils.instantiate(targetType.getType());
}

2
org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
View File

@@ -24,7 +24,7 @@ import org.springframework.core.NamedThreadLocal;
* @author Keith Donald
* @see SpelMapper#map(Object, Object)
*/
abstract class MappingContextHolder {
public abstract class MappingContextHolder {
private static final ThreadLocal<Stack<Object>> mappingContextHolder = new NamedThreadLocal<Stack<Object>>(
"Mapping context");

18
org.springframework.context/src/main/java/org/springframework/mapping/support/MappingConverter.java
View File

@@ -33,10 +33,20 @@ public final class MappingConverter implements GenericConverter {
private MappingTargetFactory mappingTargetFactory;
/**
* Creates a new Converter that delegates to the mapper to complete the type conversion process.
* Uses a {@link DefaultMappingTargetFactory} to create the target object to map and return.
* @param mapper the mapper
*/
public MappingConverter(Mapper mapper) {
this(mapper, new DefaultMappingTargetFactory());
}
/**
* Creates a new Converter that delegates to the mapper to complete the type conversion process.
* Uses the specified MappingTargetFactory to create the target object to map and return.
* @param mapper the mapper
*/
public MappingConverter(Mapper mapper, MappingTargetFactory mappingTargetFactory) {
this.mapper = mapper;
this.mappingTargetFactory = mappingTargetFactory;
@@ -52,7 +62,7 @@ public final class MappingConverter implements GenericConverter {
if (sourceType.isAssignableTo(targetType) && isCopyByReference(sourceType, targetType)) {
return source;
}
return createAndMap(targetType, source, sourceType);
return createTargetAndMap(source, sourceType, targetType);
}
private boolean isCopyByReference(TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -63,13 +73,13 @@ public final class MappingConverter implements GenericConverter {
}
}
private Object createAndMap(TypeDescriptor targetType, Object source, TypeDescriptor sourceType) {
private Object createTargetAndMap(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
if (this.mappingTargetFactory.supports(targetType)) {
Object target = this.mappingTargetFactory.createTarget(targetType);
Object target = this.mappingTargetFactory.createTarget(source, sourceType, targetType);
return this.mapper.map(source, target);
} else {
IllegalStateException cause = new IllegalStateException("["
+ this.mappingTargetFactory.getClass().getName() + "] does not support target type ["
+ this.mappingTargetFactory.getClass().getName() + "] does not support targetType ["
+ targetType.getName() + "]");
throw new ConversionFailedException(sourceType, targetType, source, cause);
}

2
org.springframework.context/src/main/java/org/springframework/mapping/support/MappingTargetFactory.java
View File

@@ -41,6 +41,6 @@ public interface MappingTargetFactory {
* @param targetType the target object type descriptor
* @return the target
*/
public Object createTarget(TypeDescriptor targetType);
public Object createTarget(Object source, TypeDescriptor sourceType, TypeDescriptor targetType);
}

3
org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java
View File

@@ -170,7 +170,8 @@ public class SpelMapper implements Mapper<Object, Object> {
*/
public void addNestedMapper(Class<?> sourceType, Class<?> targetType, Mapper<?, ?> nestedMapper,
MappingTargetFactory targetFactory) {
this.conversionService.addGenericConverter(sourceType, targetType, new MappingConverter(nestedMapper));
this.conversionService.addGenericConverter(sourceType, targetType, new MappingConverter(nestedMapper,
targetFactory));
}
/**