SpEL support for static finals on interfaces

Update ReflectivePropertyAccessor to search for fields on super classes
and implemented interfaces.

Although the javadoc Class.getFields() implies that all public fields
of class should be returned SpelReproTests demonstrates that this is
not always the case.

Issue: SPR-10125

Author: philwebb

spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java

@@ -383,6 +383,18 @@ protected Field findField(String name, Class<?> clazz, boolean mustBeStatic) {
 				return field;
 			}
 		}
+		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;
 	}
 

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

@@ -16,8 +16,10 @@
 
 package org.springframework.expression.spel;
 
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -1720,6 +1722,15 @@ private void doTestSpr10146(String expression, String expectedMessage) {
 		new SpelExpressionParser().parseExpression(expression);
 	}
 
+	@Test
+	public void SPR_10125() throws Exception {
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		String fromInterface = parser.parseExpression("T("+StaticFinalImpl1.class.getName()+").VALUE").getValue(context, String.class);
+		assertThat(fromInterface, is("interfaceValue"));
+		String fromClass = parser.parseExpression("T("+StaticFinalImpl2.class.getName()+").VALUE").getValue(context, String.class);
+		assertThat(fromClass, is("interfaceValue"));
+	}
+
 	public static class BooleanHolder {
 
 		private Boolean simpleProperty = true;
@@ -1768,4 +1779,16 @@ public static class OnlyBridgeMethod extends PackagePrivateClassWithGetter {
 
 	}
 
+	public static interface StaticFinal {
+		public static final String VALUE = "interfaceValue";
+	}
+
+	public abstract static class AbstractStaticFinal implements StaticFinal {
+	}
+
+	public static class StaticFinalImpl1 extends AbstractStaticFinal implements StaticFinal {
+	}
+
+	public static class StaticFinalImpl2 extends AbstractStaticFinal {
+	}
 }