root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2024-07-23 18:21:12 +03:00
parent f3123d88f3
commit 4684a17f00
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
View File

@ -89,7 +89,7 @@ public class MapAccessor implements CompilablePropertyAccessor {
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);
}
@ -114,7 +114,7 @@ public class MapAccessor implements CompilablePropertyAccessor {
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);
}

50
spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java
View File

@ -17,6 +17,7 @@
package org.springframework.context.expression;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
@ -36,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class MapAccessorTests {
@Test
void mapAccessorCompilable() {
void compilationSupport() {
Map<String, Object> testMap = getSimpleTestMap();
StandardEvaluationContext sec = new StandardEvaluationContext();
sec.addPropertyAccessor(new MapAccessor());
@ -44,72 +45,79 @@ class MapAccessorTests {
// basic
Expression ex = sep.parseExpression("foo");
assertThat(ex.getValue(sec,testMap)).isEqualTo("bar");
assertThat(ex.getValue(sec, testMap)).isEqualTo("bar");
assertThat(SpelCompiler.compile(ex)).isTrue();
assertThat(ex.getValue(sec,testMap)).isEqualTo("bar");
assertThat(ex.getValue(sec, testMap)).isEqualTo("bar");
// compound expression
ex = sep.parseExpression("foo.toUpperCase()");
assertThat(ex.getValue(sec,testMap)).isEqualTo("BAR");
assertThat(ex.getValue(sec, testMap)).isEqualTo("BAR");
assertThat(SpelCompiler.compile(ex)).isTrue();
assertThat(ex.getValue(sec,testMap)).isEqualTo("BAR");
assertThat(ex.getValue(sec, testMap)).isEqualTo("BAR");
// nested map
Map<String,Map<String,Object>> nestedMap = getNestedTestMap();
Map<String, Map<String, Object>> nestedMap = getNestedTestMap();
ex = sep.parseExpression("aaa.foo.toUpperCase()");
assertThat(ex.getValue(sec,nestedMap)).isEqualTo("BAR");
assertThat(ex.getValue(sec, nestedMap)).isEqualTo("BAR");
assertThat(SpelCompiler.compile(ex)).isTrue();
assertThat(ex.getValue(sec,nestedMap)).isEqualTo("BAR");
assertThat(ex.getValue(sec, nestedMap)).isEqualTo("BAR");
// avoiding inserting checkcast because first part of expression returns a Map
ex = sep.parseExpression("getMap().foo");
MapGetter mapGetter = new MapGetter();
assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
assertThat(ex.getValue(sec, mapGetter)).isEqualTo("bar");
assertThat(SpelCompiler.compile(ex)).isTrue();
assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
assertThat(ex.getValue(sec, mapGetter)).isEqualTo("bar");
// basic isWritable
ex = sep.parseExpression("foo");
assertThat(ex.isWritable(sec,testMap)).isTrue();
assertThat(ex.isWritable(sec, testMap)).isTrue();
// basic write
ex = sep.parseExpression("foo2");
ex.setValue(sec, testMap, "bar2");
assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
assertThat(ex.getValue(sec, testMap)).isEqualTo("bar2");
assertThat(SpelCompiler.compile(ex)).isTrue();
assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
assertThat(ex.getValue(sec, testMap)).isEqualTo("bar2");
}
@Test
void mapAccessorNotWritable() {
void isWritable() {
Map<String, Object> testMap = getSimpleTestMap();
StandardEvaluationContext sec = new StandardEvaluationContext();
sec.addPropertyAccessor(new MapAccessor(false));
SpelExpressionParser sep = new SpelExpressionParser();
Expression ex = sep.parseExpression("foo");
assertThat(ex.isWritable(sec, testMap)).isFalse();
sec.setPropertyAccessors(List.of(new MapAccessor(true)));
assertThat(ex.isWritable(sec, testMap)).isTrue();
sec.setPropertyAccessors(List.of(new MapAccessor(false)));
assertThat(ex.isWritable(sec, testMap)).isFalse();
}
@SuppressWarnings({"rawtypes", "unchecked"})
public static class MapGetter {
Map<String,Object> map = new HashMap<>();
Map map = new HashMap<>();
public MapGetter() {
map.put("foo", "bar");
this.map.put("foo", "bar");
}
@SuppressWarnings("rawtypes")
public Map getMap() {
return map;
return this.map;
}
}
public Map<String,Object> getSimpleTestMap() {
private static Map<String,Object> getSimpleTestMap() {
Map<String,Object> map = new HashMap<>();
map.put("foo","bar");
return map;
}
public Map<String,Map<String,Object>> getNestedTestMap() {
private static Map<String,Map<String,Object>> getNestedTestMap() {
Map<String,Object> map = new HashMap<>();
map.put("foo","bar");
Map<String,Map<String,Object>> map2 = new HashMap<>();