Sync MapAccessor implementations

Author: sbrannen

spring-expression/src/test/java/org/springframework/expression/spel/CompilableMapAccessor.java

@@ -34,6 +34,27 @@
  */
 class CompilableMapAccessor implements CompilablePropertyAccessor {
 
+	private final boolean allowWrite;
+
+	/**
+	 * Create a new map accessor for reading as well as writing.
+	 * @since 6.2
+	 * @see #CompilableMapAccessor(boolean)
+	 */
+	public CompilableMapAccessor() {
+		this(true);
+	}
+
+	/**
+	 * Create a new map accessor for reading and possibly also writing.
+	 * @param allowWrite whether to allow write operations on a target instance
+	 * @since 6.2
+	 * @see #canWrite
+	 */
+	public CompilableMapAccessor(boolean allowWrite) {
+		this.allowWrite = allowWrite;
+	}
+
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class<?>[] {Map.class};
@@ -57,15 +78,15 @@ public TypedValue read(EvaluationContext context, @Nullable Object target, Strin
 
 	@Override
 	public boolean canWrite(EvaluationContext context, @Nullable Object target, String name) throws AccessException {
-		return true;
+		return (this.allowWrite && target instanceof Map);
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public void write(EvaluationContext context, @Nullable Object target, String name, @Nullable Object newValue)
 			throws AccessException {
 
-		Assert.state(target instanceof Map, "Target must be a Map");
+		Assert.state(target instanceof Map, "Target must be of type Map");
 		Map<Object, Object> map = (Map<Object, Object>) target;
 		map.put(name, newValue);
 	}
@@ -90,7 +111,7 @@ public void generateCode(String propertyName, MethodVisitor mv, CodeFlow cf) {
 			CodeFlow.insertCheckCast(mv, "Ljava/util/Map");
 		}
 		mv.visitLdcInsn(propertyName);
-		mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get","(Ljava/lang/Object;)Ljava/lang/Object;",true);
+		mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
 	}