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

Modify SpEL code gen to take account of null safe refs

Browse Source 
With this change the code generation for method and property
references is modified to include branching logic in the
case of null safe dereferencing (?.). This is complicated
by the possible usage of primitives on the left hand side
of the dereference. To cope with this case primitives are
promoted to boxed types when this situation occurs enabling
null to be passed as a possible result.

Issue: SPR-16489
This commit is contained in:
Andy Clement
2018-03-12 11:11:40 -07:00
parent 573f1d77f2
commit d3acf45ea4
4 changed files with 284 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View File

@@ -701,7 +701,167 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
assertCanCompile(expression);
assertEquals("def", expression.getValue());
}
@Test
public void nullsafeFieldPropertyDereferencing_SPR16489() throws Exception {
FooObjectHolder foh = new FooObjectHolder();
StandardEvaluationContext context = new StandardEvaluationContext();
context.setRootObject(foh);
// First non compiled:
SpelExpression expression = (SpelExpression) parser.parseExpression("foo?.object");
assertEquals("hello",expression.getValue(context));
foh.foo = null;
assertNull(expression.getValue(context));
// Now revert state of foh and try compiling it:
foh.foo = new FooObject();
assertEquals("hello",expression.getValue(context));
assertCanCompile(expression);
assertEquals("hello",expression.getValue(context));
foh.foo = null;
assertNull(expression.getValue(context));
// Static references
expression = (SpelExpression)parser.parseExpression("#var?.propertya");
context.setVariable("var", StaticsHelper.class);
assertEquals("sh",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", StaticsHelper.class);
assertEquals("sh",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Single size primitive (boolean)
expression = (SpelExpression)parser.parseExpression("#var?.a");
context.setVariable("var", new TestClass4());
assertFalse((Boolean)expression.getValue(context));
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", new TestClass4());
assertFalse((Boolean)expression.getValue(context));
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Double slot primitives
expression = (SpelExpression)parser.parseExpression("#var?.four");
context.setVariable("var", new Three());
assertEquals("0.04",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", new Three());
assertEquals("0.04",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
}
@Test
public void nullsafeMethodChaining_SPR16489() throws Exception {
FooObjectHolder foh = new FooObjectHolder();
StandardEvaluationContext context = new StandardEvaluationContext();
context.setRootObject(foh);
// First non compiled:
SpelExpression expression = (SpelExpression) parser.parseExpression("getFoo()?.getObject()");
assertEquals("hello",expression.getValue(context));
foh.foo = null;
assertNull(expression.getValue(context));
assertCanCompile(expression);
foh.foo = new FooObject();
assertEquals("hello",expression.getValue(context));
foh.foo = null;
assertNull(expression.getValue(context));
// Static method references
expression = (SpelExpression)parser.parseExpression("#var?.methoda()");
context.setVariable("var", StaticsHelper.class);
assertEquals("sh",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", StaticsHelper.class);
assertEquals("sh",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.intValue()");
context.setVariable("var", 4);
assertEquals("4",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", 4);
assertEquals("4",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.booleanValue()");
context.setVariable("var", false);
assertEquals("false",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", false);
assertEquals("false",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.booleanValue()");
context.setVariable("var", true);
assertEquals("true",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", true);
assertEquals("true",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.longValue()");
context.setVariable("var", 5L);
assertEquals("5",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", 5L);
assertEquals("5",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.floatValue()");
context.setVariable("var", 3f);
assertEquals("3.0",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", 3f);
assertEquals("3.0",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
// Nullsafe guard on expression element evaluating to primitive/null
expression = (SpelExpression)parser.parseExpression("#var?.shortValue()");
context.setVariable("var", (short)8);
assertEquals("8",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
assertCanCompile(expression);
context.setVariable("var", (short)8);
assertEquals("8",expression.getValue(context).toString());
context.setVariable("var", null);
assertNull(expression.getValue(context));
}
@Test
public void elvis() throws Exception {
Expression expression = parser.parseExpression("'a'?:'b'");
@@ -3063,19 +3223,47 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
assertEquals(1.0f, expression.getValue());
}
@Test
public void compilationOfBasicNullSafeMethodReference() {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.OFF, getClass().getClassLoader()));
SpelExpression expression = parser.parseRaw("#it?.equals(3)");
StandardEvaluationContext context = new StandardEvaluationContext(new Object[] {1});
context.setVariable("it", 3);
expression.setEvaluationContext(context);
assertTrue(expression.getValue(Boolean.class));
context.setVariable("it", null);
assertNull(expression.getValue(Boolean.class));
assertCanCompile(expression);
context.setVariable("it", 3);
assertTrue(expression.getValue(Boolean.class));
context.setVariable("it", null);
assertNull(expression.getValue(Boolean.class));
}
@Test
public void failsWhenSettingContextForExpression_SPR12326() {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, getClass().getClassLoader()));
new SpelParserConfiguration(SpelCompilerMode.OFF, getClass().getClassLoader()));
Person3 person = new Person3("foo", 1);
SpelExpression expression = parser.parseRaw("#it?.age?.equals([0])");
StandardEvaluationContext context = new StandardEvaluationContext(new Object[] {1});
context.setVariable("it", person);
expression.setEvaluationContext(context);
assertTrue(expression.getValue(Boolean.class));
// This will trigger compilation (second usage)
assertTrue(expression.getValue(Boolean.class));
context.setVariable("it", null);
assertNull(expression.getValue(Boolean.class));
assertCanCompile(expression);
context.setVariable("it", person);
assertTrue(expression.getValue(Boolean.class));
context.setVariable("it", null);
assertNull(expression.getValue(Boolean.class));
}
@@ -5078,6 +5266,14 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
}
public static class FooObjectHolder {
private FooObject foo = new FooObject();
public FooObject getFoo() {
return foo;
}
}
public static class FooObject {