Consistent resolution of Class methods and static methods

Issue: SPR-12502
(cherry picked from commit 9ef0bdc)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -17,12 +17,13 @@
 package org.springframework.expression.spel.support;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -107,7 +108,7 @@ public MethodExecutor resolve(EvaluationContext context, Object targetObject, St
 		try {
 			TypeConverter typeConverter = context.getTypeConverter();
 			Class<?> type = (targetObject instanceof Class ? (Class<?>) targetObject : targetObject.getClass());
-			List<Method> methods = new ArrayList<Method>(Arrays.asList(getMethods(type, targetObject)));
+			List<Method> methods = new ArrayList<Method>((getMethods(type, targetObject)));
 
 			// If a filter is registered for this type, call it
 			MethodFilter filter = (this.filters != null ? this.filters.get(type) : null);
@@ -201,14 +202,22 @@ else if (matchRequiringConversion != null) {
 		}
 	}
 
-	private Method[] getMethods(Class<?> type, Object targetObject) {
+	private Collection<Method> getMethods(Class<?> type, Object targetObject) {
 		if (targetObject instanceof Class) {
-			Set<Method> methods = new HashSet<Method>();
-			methods.addAll(Arrays.asList(getMethods(type)));
-			methods.addAll(Arrays.asList(getMethods(targetObject.getClass())));
-			return methods.toArray(new Method[methods.size()]);
+			Set<Method> result = new LinkedHashSet<Method>();
+			result.addAll(Arrays.asList(getMethods(targetObject.getClass())));
+			// Add these also so that static result are invocable on the type: e.g. Float.valueOf(..)
+			Method[] methods = getMethods(type);
+			for (Method method : methods) {
+				if (Modifier.isStatic(method.getModifiers())) {
+					result.add(method);
+				}
+			}
+			return result;
+		}
+		else {
+			return Arrays.asList(getMethods(type));
 		}
-		return getMethods(type);
 	}
 
 	/**

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

@@ -1208,7 +1208,7 @@ public boolean canWrite(EvaluationContext context, Object target, String name) t
 
 		@Override
 		public Class<?>[] getSpecificTargetClasses() {
-			return new Class[] { ContextObject.class };
+			return new Class<?>[] {ContextObject.class};
 		}
 
 		@Override
@@ -1278,7 +1278,7 @@ public void customStaticFunctions_SPR9038() {
 			protected Method[] getMethods(Class<?> type) {
 				try {
 					return new Method[] {
-							Integer.class.getDeclaredMethod("parseInt", new Class[] { String.class, Integer.TYPE }) };
+							Integer.class.getDeclaredMethod("parseInt", new Class<?>[] {String.class, Integer.TYPE})};
 				}
 				catch (NoSuchMethodException ex) {
 					return new Method[0];
@@ -1877,6 +1877,14 @@ public void SPR9735() {
 		assertEquals("child1", exp.getValue(context));
 	}
 
+	@Test
+	public void SPR12502() throws Exception {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		Expression expression = parser.parseExpression("#root.getClass().getName()");
+		assertEquals(UnnamedUser.class.getName(), expression.getValue(new UnnamedUser()));
+		assertEquals(NamedUser.class.getName(), expression.getValue(new NamedUser()));
+	}
+
 
 	private static enum ABC { A, B, C }
 
@@ -2149,4 +2157,16 @@ public List<Item> subList(int fromIndex, int toIndex) {
 		}
 	}
 
+
+	public static class UnnamedUser {
+	}
+
+
+	public static class NamedUser {
+
+		public String getName() {
+			return "foo";
+		}
+	}
+
 }