Browse Source

renamed to MappingContext since no spel dep

pull/23217/head
Keith Donald 17 years ago
parent
commit
6d31db1017
  1. 2
      org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java
  2. 2
      org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
  3. 6
      org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java

2
org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java

@ -46,7 +46,7 @@ public class MapperConverter implements GenericConverter { @@ -46,7 +46,7 @@ public class MapperConverter implements GenericConverter {
if (source == null) {
return null;
}
if (SpelMappingContextHolder.contains(source)) {
if (MappingContextHolder.contains(source)) {
return source;
}
if (sourceType.isAssignableTo(targetType) && isCopyByReference(sourceType, targetType)) {

2
org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMappingContextHolder.java → org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java

@ -4,7 +4,7 @@ import java.util.Stack; @@ -4,7 +4,7 @@ import java.util.Stack;
import org.springframework.core.NamedThreadLocal;
class SpelMappingContextHolder {
class MappingContextHolder {
private static final ThreadLocal<Stack<Object>> mappingContextHolder = new NamedThreadLocal<Stack<Object>>(
"Mapping context");

6
org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java

@ -97,7 +97,7 @@ public class SpelMapper implements Mapper<Object, Object> { @@ -97,7 +97,7 @@ public class SpelMapper implements Mapper<Object, Object> {
public Object map(Object source, Object target) {
try {
SpelMappingContextHolder.push(source);
MappingContextHolder.push(source);
EvaluationContext sourceContext = getEvaluationContext(source);
EvaluationContext targetContext = getEvaluationContext(target);
List<MappingFailure> failures = new LinkedList<MappingFailure>();
@ -113,7 +113,7 @@ public class SpelMapper implements Mapper<Object, Object> { @@ -113,7 +113,7 @@ public class SpelMapper implements Mapper<Object, Object> {
}
return target;
} finally {
SpelMappingContextHolder.pop();
MappingContextHolder.pop();
}
}
@ -124,7 +124,7 @@ public class SpelMapper implements Mapper<Object, Object> { @@ -124,7 +124,7 @@ public class SpelMapper implements Mapper<Object, Object> {
private void doMap(SpelMapping mapping, EvaluationContext sourceContext, EvaluationContext targetContext,
List<MappingFailure> failures) {
if (logger.isDebugEnabled()) {
logger.debug(SpelMappingContextHolder.getLevel() + mapping);
logger.debug(MappingContextHolder.getLevel() + mapping);
}
mapping.map(sourceContext, targetContext, failures);
}

Loading…
Cancel
Save