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

SpEL support for static finals on interfaces

Browse Source 
Issue: SPR-10125
Backport-Issue: SPR-10174
This commit is contained in:
Juergen Hoeller
2013-01-15 16:51:35 +01:00
parent 7f7fbe8172
commit e5783b1bfa
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
View File

@@ -287,7 +287,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
private Method findGetterForProperty(String propertyName, Class<?> clazz, Object target) { private Method findGetterForProperty(String propertyName, Class<?> clazz, Object target) {
Method method = findGetterForProperty(propertyName, clazz, target instanceof Class); Method method = findGetterForProperty(propertyName, clazz, target instanceof Class);
if(method == null && target instanceof Class) { if (method == null && target instanceof Class) {
method = findGetterForProperty(propertyName, target.getClass(), false); method = findGetterForProperty(propertyName, target.getClass(), false);
} }
return method; return method;
@@ -295,7 +295,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
private Method findSetterForProperty(String propertyName, Class<?> clazz, Object target) { private Method findSetterForProperty(String propertyName, Class<?> clazz, Object target) {
Method method = findSetterForProperty(propertyName, clazz, target instanceof Class); Method method = findSetterForProperty(propertyName, clazz, target instanceof Class);
if(method == null && target instanceof Class) { if (method == null && target instanceof Class) {
method = findSetterForProperty(propertyName, target.getClass(), false); method = findSetterForProperty(propertyName, target.getClass(), false);
} }
return method; return method;
@@ -303,7 +303,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
private Field findField(String name, Class<?> clazz, Object target) { private Field findField(String name, Class<?> clazz, Object target) {
Field field = findField(name, clazz, target instanceof Class); Field field = findField(name, clazz, target instanceof Class);
if(field == null && target instanceof Class) { if (field == null && target instanceof Class) {
field = findField(name, target.getClass(), false); field = findField(name, target.getClass(), false);
} }
return field; return field;
@@ -374,6 +374,20 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
return field; return field;
} }
} }
// We'll search superclasses and implemented interfaces explicitly,
// although it shouldn't be necessary - however, see SPR-10125.
if (clazz.getSuperclass() != null) {
Field field = findField(name, clazz.getSuperclass(), mustBeStatic);
if (field != null) {
return field;
}
}
for (Class<?> implementedInterface : clazz.getInterfaces()) {
Field field = findField(name, implementedInterface, mustBeStatic);
if (field != null) {
return field;
}
}
return null; return null;
} }