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

Polishing

This commit is contained in:
Sam Brannen 2022-02-28 17:15:35 +01:00
parent beab8ab4e7
commit 84de100fc6
5 changed files with 1339 additions and 1330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -22,8 +22,8 @@ import org.springframework.core.convert.TypeDescriptor;
import org.springframework.lang.Nullable;
/**
* A method resolver attempts locate a method and returns a command executor that can be
* used to invoke that method. The command executor will be cached but if it 'goes stale'
* A method resolver attempts to locate a method and returns a command executor that can be
* used to invoke that method. The command executor will be cached, but if it 'goes stale'
* the resolvers will be called again.
*
* @author Andy Clement

3
spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
View File

@ -200,8 +200,7 @@ public class MethodReference extends SpelNodeImpl {
EvaluationContext evaluationContext) throws SpelEvaluationException {
AccessException accessException = null;
List<MethodResolver> methodResolvers = evaluationContext.getMethodResolvers();
for (MethodResolver methodResolver : methodResolvers) {
for (MethodResolver methodResolver : evaluationContext.getMethodResolvers()) {
try {
MethodExecutor methodExecutor = methodResolver.resolve(
evaluationContext, targetObject, this.name, argumentTypes);

2528
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

File diff suppressed because it is too large Load Diff

130
spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -41,16 +41,17 @@ import static org.assertj.core.api.Assertions.within;
/**
* Test the examples specified in the documentation.
*
* NOTE: any outgoing changes from this file upon synchronizing with the repo may indicate that
* <p>NOTE: any outgoing changes from this file upon synchronizing with the repo may indicate that
* you need to update the documentation too !
*
* @author Andy Clement
*/
@SuppressWarnings("rawtypes")
public class SpelDocumentationTests extends AbstractExpressionTests {
class SpelDocumentationTests extends AbstractExpressionTests {
static Inventor tesla ;
static Inventor pupin ;
static Inventor tesla;
static Inventor pupin;
static {
GregorianCalendar c = new GregorianCalendar();
@ -65,53 +66,24 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
pupin.setPlaceOfBirth(new PlaceOfBirth("Idvor"));
}
static class IEEE {
private String name;
public Inventor[] Members = new Inventor[1];
public List Members2 = new ArrayList();
public Map<String,Object> officers = new HashMap<>();
public List<Map<String, Object>> reverse = new ArrayList<>();
@SuppressWarnings("unchecked")
IEEE() {
officers.put("president",pupin);
List linv = new ArrayList();
linv.add(tesla);
officers.put("advisors",linv);
Members2.add(tesla);
Members2.add(pupin);
reverse.add(officers);
}
public boolean isMember(String name) {
return true;
}
public String getName() { return name; }
public void setName(String n) { this.name = n; }
}
@Test
public void testMethodInvocation() {
void methodInvocation() {
evaluate("'Hello World'.concat('!')","Hello World!",String.class);
}
@Test
public void testBeanPropertyAccess() {
void beanPropertyAccess() {
evaluate("new String('Hello World'.bytes)","Hello World",String.class);
}
@Test
public void testArrayLengthAccess() {
void arrayLengthAccess() {
evaluate("'Hello World'.bytes.length",11,Integer.class);
}
@Test
public void testRootObject() throws Exception {
void rootObject() throws Exception {
GregorianCalendar c = new GregorianCalendar();
c.set(1856, 7, 9);
@ -129,7 +101,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
}
@Test
public void testEqualityCheck() throws Exception {
void equalityCheck() throws Exception {
ExpressionParser parser = new SpelExpressionParser();
StandardEvaluationContext context = new StandardEvaluationContext();
@ -143,13 +115,13 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// Section 7.4.1
@Test
public void testXMLBasedConfig() {
void xmlBasedConfig() {
evaluate("(T(java.lang.Math).random() * 100.0 )>0",true,Boolean.class);
}
// Section 7.5
@Test
public void testLiterals() throws Exception {
void literals() throws Exception {
ExpressionParser parser = new SpelExpressionParser();
String helloWorld = (String) parser.parseExpression("'Hello World'").getValue(); // evals to "Hello World"
@ -169,7 +141,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
}
@Test
public void testPropertyAccess() throws Exception {
void propertyAccess() throws Exception {
EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
int year = (Integer) parser.parseExpression("Birthdate.Year + 1900").getValue(context); // 1856
assertThat(year).isEqualTo(1856);
@ -179,12 +151,12 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
}
@Test
public void testPropertyNavigation() throws Exception {
void propertyNavigation() throws Exception {
ExpressionParser parser = new SpelExpressionParser();
// Inventions Array
StandardEvaluationContext teslaContext = TestScenarioCreator.getTestEvaluationContext();
// teslaContext.setRootObject(tesla);
// teslaContext.setRootObject(tesla);
// evaluates to "Induction motor"
String invention = parser.parseExpression("inventions[3]").getValue(teslaContext, String.class);
@ -206,9 +178,8 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
assertThat(invention).isEqualTo("Wireless communication");
}
@Test
public void testDictionaryAccess() throws Exception {
void dictionaryAccess() throws Exception {
StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE());
// Officer's Dictionary
@ -233,7 +204,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.3
@Test
public void testMethodInvocation2() throws Exception {
void methodInvocation2() throws Exception {
// string literal, evaluates to "bc"
String c = parser.parseExpression("'abc'.substring(1, 3)").getValue(String.class);
assertThat(c).isEqualTo("bc");
@ -248,7 +219,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.4.1
@Test
public void testRelationalOperators() throws Exception {
void relationalOperators() throws Exception {
boolean result = parser.parseExpression("2 == 2").getValue(Boolean.class);
assertThat(result).isTrue();
// evaluates to false
@ -261,7 +232,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
}
@Test
public void testOtherOperators() throws Exception {
void otherOperators() throws Exception {
// evaluates to false
boolean falseValue = parser.parseExpression("'xyz' instanceof T(int)").getValue(Boolean.class);
assertThat(falseValue).isFalse();
@ -278,7 +249,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.4.2
@Test
public void testLogicalOperators() throws Exception {
void logicalOperators() throws Exception {
StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE());
@ -319,7 +290,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.4.3
@Test
public void testNumericalOperators() throws Exception {
void numericalOperators() throws Exception {
// Addition
int two = parser.parseExpression("1 + 1").getValue(Integer.class); // 2
assertThat(two).isEqualTo(2);
@ -363,7 +334,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.5
@Test
public void testAssignment() throws Exception {
void assignment() throws Exception {
Inventor inventor = new Inventor();
StandardEvaluationContext inventorContext = new StandardEvaluationContext();
inventorContext.setRootObject(inventor);
@ -381,7 +352,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.6
@Test
public void testTypes() throws Exception {
void types() throws Exception {
Class<?> dateClass = parser.parseExpression("T(java.util.Date)").getValue(Class.class);
assertThat(dateClass).isEqualTo(Date.class);
boolean trueValue = parser.parseExpression("T(java.math.RoundingMode).CEILING < T(java.math.RoundingMode).FLOOR").getValue(Boolean.class);
@ -391,7 +362,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.7
@Test
public void testConstructors() throws Exception {
void constructors() throws Exception {
StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE());
Inventor einstein =
@ -404,7 +375,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.8
@Test
public void testVariables() throws Exception {
void variables() throws Exception {
Inventor tesla = new Inventor("Nikola Tesla", "Serbian");
StandardEvaluationContext context = new StandardEvaluationContext();
context.setVariable("newName", "Mike Tesla");
@ -416,9 +387,9 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
assertThat(tesla.getFoo()).isEqualTo("Mike Tesla");
}
@SuppressWarnings("unchecked")
@Test
public void testSpecialVariables() throws Exception {
@SuppressWarnings("unchecked")
void specialVariables() throws Exception {
// create an array of integers
List<Integer> primes = Arrays.asList(2, 3, 5, 7, 11, 13, 17);
@ -435,7 +406,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.9
@Test
public void testFunctions() throws Exception {
void functions() throws Exception {
ExpressionParser parser = new SpelExpressionParser();
StandardEvaluationContext context = new StandardEvaluationContext();
context.registerFunction("reverseString", StringUtils.class.getDeclaredMethod("reverseString", String.class));
@ -447,7 +418,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.10
@Test
public void testTernary() throws Exception {
void ternary() throws Exception {
String falseString = parser.parseExpression("false ? 'trueExp' : 'falseExp'").getValue(String.class);
assertThat(falseString).isEqualTo("falseExp");
@ -468,9 +439,9 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.11
@SuppressWarnings("unchecked")
@Test
public void testSelection() throws Exception {
@SuppressWarnings("unchecked")
void selection() throws Exception {
StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE());
List<Inventor> list = (List<Inventor>) parser.parseExpression("Members2.?[nationality == 'Serbian']").getValue(societyContext);
@ -481,7 +452,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
// 7.5.12
@Test
public void testTemplating() throws Exception {
void templating() throws Exception {
String randomPhrase =
parser.parseExpression("random number is ${T(java.lang.Math).random()}", new TemplatedParserContext()).getValue(String.class);
assertThat(randomPhrase.startsWith("random number")).isTrue();
@ -505,14 +476,39 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
}
}
static class IEEE {
private String name;
public Inventor[] Members = new Inventor[1];
public List Members2 = new ArrayList();
public Map<String,Object> officers = new HashMap<>();
public List<Map<String, Object>> reverse = new ArrayList<>();
@SuppressWarnings("unchecked")
IEEE() {
officers.put("president",pupin);
List linv = new ArrayList();
linv.add(tesla);
officers.put("advisors",linv);
Members2.add(tesla);
Members2.add(pupin);
reverse.add(officers);
}
public boolean isMember(String name) {
return true;
}
public String getName() { return name; }
public void setName(String n) { this.name = n; }
}
static class StringUtils {
public static String reverseString(String input) {
StringBuilder backwards = new StringBuilder();
for (int i = 0; i < input.length(); i++) {
backwards.append(input.charAt(input.length() - 1 - i));
}
return backwards.toString();
return new StringBuilder(input).reverse().toString();
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
View File

@ -30,7 +30,7 @@ import org.springframework.expression.spel.testresources.PlaceOfBirth;
* <li>The root context object is an Inventor instance {@link Inventor}
* </ul>
*/
public class TestScenarioCreator {
class TestScenarioCreator {
public static StandardEvaluationContext getTestEvaluationContext() {
StandardEvaluationContext testContext = new StandardEvaluationContext();