Introspect interface-declared methods in case of proxy (for varargs)

Issue: SPR-16122
spring-projects · Oct 27, 2017 · 419b444 · 419b444
1 parent 2611aa0
commit 419b444
Show file tree

Hide file tree

Showing 2 changed files with 492 additions and 465 deletions.
diff --git a/...n/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java b/...n/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -230,6 +231,14 @@ private Collection<Method> getMethods(Class<?> type, Object targetObject) {
 			result.addAll(Arrays.asList(getMethods(Class.class)));
 			return result;
 		}
+		else if (Proxy.isProxyClass(type)) {
+			Set<Method> result = new LinkedHashSet<>();
+			// Expose interface methods (not proxy-declared overrides) for proper vararg introspection
+			for (Class<?> ifc : type.getInterfaces()) {
+				result.addAll(Arrays.asList(getMethods(ifc)));
+			}
+			return result;
+		}
 		else {
 			return Arrays.asList(getMethods(type));
 		}