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

DATAREST-1222 - Switched to SimpleEvaluationContext for SpEL-based PATCH handling.

Browse Source
This commit is contained in:
Oliver Gierke
2018-03-28 09:43:29 +02:00
parent 4c71f818b6
commit 83eba22a36
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java
View File

@@ -32,10 +32,12 @@ import org.springframework.core.CollectionFactory;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.data.mapping.PropertyPath;
import org.springframework.data.mapping.PropertyReferenceException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionException;
import org.springframework.expression.spel.SpelEvaluationException;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.SimpleEvaluationContext;
import org.springframework.util.Assert;
import org.springframework.util.ConcurrentReferenceHashMap;
import org.springframework.util.StringUtils;
@@ -220,6 +222,7 @@ class SpelPath {
private static final String INVALID_PATH_REFERENCE = "Invalid path reference %s on type %s (from source %s)!";
private static final Map<CacheKey, TypedSpelPath> TYPED_PATHS = new ConcurrentReferenceHashMap<CacheKey, TypedSpelPath>(
32);
private static final EvaluationContext CONTEXT = SimpleEvaluationContext.forReadWriteDataBinding().build();
private final Class<?> type;
@@ -274,7 +277,7 @@ class SpelPath {
Assert.notNull(target, "Target must not be null!");
try {
return (T) expression.getValue(target);
return (T) expression.getValue(CONTEXT, target);
} catch (ExpressionException o_O) {
throw new PatchException("Unable to get value from target", o_O);
}
@@ -290,7 +293,7 @@ class SpelPath {
Assert.notNull(target, "Target must not be null!");
expression.setValue(target, value);
expression.setValue(CONTEXT, target, value);
}
/**
@@ -303,7 +306,7 @@ class SpelPath {
Assert.notNull(root, "Root object must not be null!");
return expression.getValueType(root);
return expression.getValueType(CONTEXT, root);
}
/**
@@ -410,7 +413,7 @@ class SpelPath {
}
private TypeDescriptor getTypeDescriptor(Object target) {
return expression.getValueTypeDescriptor(target);
return expression.getValueTypeDescriptor(CONTEXT, target);
}
private Integer getTargetListIndex() {