-
Notifications
You must be signed in to change notification settings - Fork 38.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support SpEL compilation of interface methods again
Spring Framework 5.1.8 introduced a regression for the compilation of SpEL expressions referencing a method declared in an interface. An attempt to compile such an expression resulted in a SpelEvaluationException caused by an IncompatibleClassChangeError. This commit fixes this regression by adding explicit support in ReflectivePropertyAccessor.OptimalPropertyAccessor.generateCode() for methods declared in interfaces. Closes gh-24357
- Loading branch information
Showing
2 changed files
with
66 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...ression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.expression.spel.standard; | ||
|
||
import java.util.stream.IntStream; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import org.springframework.core.Ordered; | ||
import org.springframework.expression.Expression; | ||
import org.springframework.expression.spel.SpelCompilerMode; | ||
import org.springframework.expression.spel.SpelParserConfiguration; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* Tests for the {@link SpelCompiler}. | ||
* | ||
* @author Sam Brannen | ||
* @since 5.1.14 | ||
*/ | ||
class SpelCompilerTests { | ||
|
||
@Test // gh-24357 | ||
void expressionCompilesWhenMethodComesFromPublicInterface() { | ||
SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null); | ||
SpelExpressionParser parser = new SpelExpressionParser(config); | ||
|
||
OrderedComponent component = new OrderedComponent(); | ||
Expression expression = parser.parseExpression("order"); | ||
|
||
// Evaluate the expression multiple times to ensure that it gets compiled. | ||
IntStream.rangeClosed(1, 5).forEach(i -> assertThat(expression.getValue(component)).isEqualTo(42)); | ||
} | ||
|
||
|
||
static class OrderedComponent implements Ordered { | ||
|
||
@Override | ||
public int getOrder() { | ||
return 42; | ||
} | ||
} | ||
|
||
} |