Fix SpEL generated code for default method invocation

Closes gh-25706
spring-projects · Sep 5, 2020 · c368ce8 · c368ce8
1 parent 670b9fd
commit c368ce8
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 5 deletions.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -347,8 +347,9 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 		}
 
 		generateCodeForArguments(mv, cf, method, this.children);
-		mv.visitMethodInsn((isStaticMethod ? INVOKESTATIC : INVOKEVIRTUAL), classDesc, method.getName(),
-				CodeFlow.createSignatureDescriptor(method), method.getDeclaringClass().isInterface());
+		mv.visitMethodInsn((isStaticMethod ? INVOKESTATIC : (method.isDefault() ? INVOKEINTERFACE : INVOKEVIRTUAL)),
+				classDesc, method.getName(), CodeFlow.createSignatureDescriptor(method),
+				method.getDeclaringClass().isInterface());
 		cf.pushDescriptor(this.exitTypeDescriptor);
 
 		if (this.originalPrimitiveExitTypeDescriptor != null) {

diff --git a/...ssion/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/...ssion/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -5159,7 +5159,7 @@ private void assertGetValueFail(Expression expression) {
 		assertThatExceptionOfType(Exception.class).isThrownBy(expression::getValue);
 	}
 
-	private void assertIsCompiled(Expression expression) {
+	public static void assertIsCompiled(Expression expression) {
 		try {
 			Field field = SpelExpression.class.getDeclaredField("compiledAst");
 			field.setAccessible(true);

diff --git a/...ression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java b/...ression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
@@ -22,20 +22,23 @@
 
 import org.springframework.core.Ordered;
 import org.springframework.expression.Expression;
+import org.springframework.expression.spel.SpelCompilationCoverageTests;
 import org.springframework.expression.spel.SpelCompilerMode;
 import org.springframework.expression.spel.SpelParserConfiguration;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for the {@link SpelCompiler}.
  *
  * @author Sam Brannen
+ * @author Andy Clement
  * @since 5.1.14
  */
 class SpelCompilerTests {
 
-	@Test // gh-24357
+	@Test  // gh-24357
 	void expressionCompilesWhenMethodComesFromPublicInterface() {
 		SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null);
 		SpelExpressionParser parser = new SpelExpressionParser(config);
@@ -47,6 +50,31 @@ void expressionCompilesWhenMethodComesFromPublicInterface() {
 		IntStream.rangeClosed(1, 5).forEach(i -> assertThat(expression.getValue(component)).isEqualTo(42));
 	}
 
+	@Test  // gh-25706
+	void defaultMethodInvocation() {
+		SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null);
+		SpelExpressionParser parser = new SpelExpressionParser(config);
+
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Item item = new Item();
+		context.setRootObject(item);
+
+		Expression expression = parser.parseExpression("#root.isEditable2()");
+		assertThat(SpelCompiler.compile(expression)).isFalse();
+		assertThat(expression.getValue(context)).isEqualTo(false);
+		assertThat(SpelCompiler.compile(expression)).isTrue();
+		SpelCompilationCoverageTests.assertIsCompiled(expression);
+		assertThat(expression.getValue(context)).isEqualTo(false);
+
+		context.setVariable("user", new User());
+		expression = parser.parseExpression("#root.isEditable(#user)");
+		assertThat(SpelCompiler.compile(expression)).isFalse();
+		assertThat(expression.getValue(context)).isEqualTo(true);
+		assertThat(SpelCompiler.compile(expression)).isTrue();
+		SpelCompilationCoverageTests.assertIsCompiled(expression);
+		assertThat(expression.getValue(context)).isEqualTo(true);
+	}
+
 
 	static class OrderedComponent implements Ordered {
 
@@ -56,4 +84,40 @@ public int getOrder() {
 		}
 	}
 
+
+	public static class User {
+
+		boolean isAdmin() {
+			return true;
+		}
+	}
+
+
+	public static class Item implements Editable {
+
+		// some fields
+		private String someField = "";
+
+		// some getters and setters
+
+		@Override
+		public boolean hasSomeProperty() {
+			return someField != null;
+		}
+	}
+
+
+	public interface Editable {
+
+		default boolean isEditable(User user) {
+			return user.isAdmin() && hasSomeProperty();
+		}
+
+		default boolean isEditable2() {
+			return false;
+		}
+
+		boolean hasSomeProperty();
+	}
+
 }