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

ReflectiveMethodResolver lets local static methods override java.lang.Class methods

Browse Source 
Issue: SPR-13918
(cherry picked from commit cf3e460)
This commit is contained in:
Juergen Hoeller
2016-02-08 13:23:02 +01:00
parent d11b9577d5
commit 512d1263f2
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
View File

@@ -221,14 +221,15 @@ public class ReflectiveMethodResolver implements MethodResolver {
private Collection<Method> getMethods(Class<?> type, Object targetObject) { private Collection<Method> getMethods(Class<?> type, Object targetObject) {
if (targetObject instanceof Class) { if (targetObject instanceof Class) {
Set<Method> result = new LinkedHashSet<Method>(); Set<Method> result = new LinkedHashSet<Method>();
result.addAll(Arrays.asList(getMethods(targetObject.getClass()))); // Add these so that static methods are invocable on the type: e.g. Float.valueOf(..)
// Add these also so that static result are invocable on the type: e.g. Float.valueOf(..)
Method[] methods = getMethods(type); Method[] methods = getMethods(type);
for (Method method : methods) { for (Method method : methods) {
if (Modifier.isStatic(method.getModifiers())) { if (Modifier.isStatic(method.getModifiers())) {
result.add(method); result.add(method);
} }
} }
// Also expose methods from java.lang.Class itself
result.addAll(Arrays.asList(getMethods(Class.class)));
return result; return result;
} }
else { else {

26
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.expression.spel;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@@ -1836,7 +1837,7 @@ public class SpelReproTests extends ExpressionTestCase {
} }
@Test @Test
public void SPR12502() throws Exception { public void SPR12502() {
SpelExpressionParser parser = new SpelExpressionParser(); SpelExpressionParser parser = new SpelExpressionParser();
Expression expression = parser.parseExpression("#root.getClass().getName()"); Expression expression = parser.parseExpression("#root.getClass().getName()");
assertEquals(UnnamedUser.class.getName(), expression.getValue(new UnnamedUser())); assertEquals(UnnamedUser.class.getName(), expression.getValue(new UnnamedUser()));
@@ -1844,7 +1845,7 @@ public class SpelReproTests extends ExpressionTestCase {
} }
@Test @Test
public void SPR12803() throws Exception { public void SPR12803() {
StandardEvaluationContext sec = new StandardEvaluationContext(); StandardEvaluationContext sec = new StandardEvaluationContext();
sec.setVariable("iterable", Collections.emptyList()); sec.setVariable("iterable", Collections.emptyList());
SpelExpressionParser parser = new SpelExpressionParser(); SpelExpressionParser parser = new SpelExpressionParser();
@@ -1852,10 +1853,20 @@ public class SpelReproTests extends ExpressionTestCase {
assertTrue(expression.getValue(sec) instanceof ArrayList); assertTrue(expression.getValue(sec) instanceof ArrayList);
} }
@Test
public void SPR13918() {
EvaluationContext context = new StandardEvaluationContext();
context.setVariable("encoding", "UTF-8");
private static enum ABC { A, B, C } Expression ex = parser.parseExpression("T(java.nio.charset.Charset).forName(#encoding)");
Object result = ex.getValue(context);
assertEquals(Charset.forName("UTF-8"), result);
}
private static enum XYZ { X, Y, Z }
private enum ABC { A, B, C }
private enum XYZ { X, Y, Z }
public static class BooleanHolder { public static class BooleanHolder {
@@ -1882,7 +1893,7 @@ public class SpelReproTests extends ExpressionTestCase {
} }
private static interface GenericInterface<T extends Number> { private interface GenericInterface<T extends Number> {
public T getProperty(); public T getProperty();
} }
@@ -1909,9 +1920,9 @@ public class SpelReproTests extends ExpressionTestCase {
} }
public static interface StaticFinal { public interface StaticFinal {
public static final String VALUE = "interfaceValue"; String VALUE = "interfaceValue";
} }
@@ -1988,6 +1999,7 @@ public class SpelReproTests extends ExpressionTestCase {
} }
@SuppressWarnings({"rawtypes", "serial"})
public static class MapWithConstant extends HashMap { public static class MapWithConstant extends HashMap {
public static final int X = 1; public static final int X = 1;