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

Author: odrotbohm

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

@@ -32,10 +32,12 @@
 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;
 
@@ -209,6 +211,7 @@ static class TypedSpelPath extends 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<>(32);
+		private static final EvaluationContext CONTEXT = SimpleEvaluationContext.forReadWriteDataBinding().build();
 
 		private final Class<?> type;
 
@@ -254,7 +257,7 @@ public <T> T getValue(Object target) {
 			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);
 			}
@@ -270,7 +273,7 @@ public void setValue(Object target, Object value) {
 
 			Assert.notNull(target, "Target must not be null!");
 
-			expression.setValue(target, value);
+			expression.setValue(CONTEXT, target, value);
 		}
 
 		/**
@@ -283,7 +286,7 @@ public Class<?> getType(Object root) {
 
 			Assert.notNull(root, "Root object must not be null!");
 
-			return expression.getValueType(root);
+			return expression.getValueType(CONTEXT, root);
 		}
 
 		/**
@@ -390,7 +393,7 @@ private TypedSpelPath getParent() {
 		}
 
 		private TypeDescriptor getTypeDescriptor(Object target) {
-			return expression.getValueTypeDescriptor(target);
+			return expression.getValueTypeDescriptor(CONTEXT, target);
 		}
 
 		private Integer getTargetListIndex() {