Fix expression cache

Prior to this commit, only the java.lang.reflect.Method was used to
identify an annotated method. As a result, if different annotations
were placed on different methods (method overriding, interface
implementation) only the first one (cached) was used.

LazyParamAwareEvaluationContext was affected by the exact
same problem and has been also fixed.

Issue: SPR-11692

spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java

@@ -0,0 +1,122 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.config;
+
+import org.junit.Test;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *
+ * @author Stephane Nicoll
+ */
+public class ExpressionCachingIntegrationTests {
+
+	@SuppressWarnings("unchecked")
+	@Test // SPR-11692
+	public void expressionIsCacheBasedOnActualMethod() {
+		ConfigurableApplicationContext context =
+				new AnnotationConfigApplicationContext(SharedConfig.class, Spr11692Config.class);
+
+		BaseDao<User> userDao = (BaseDao<User>) context.getBean("userDao");
+		BaseDao<Order> orderDao = (BaseDao<Order>) context.getBean("orderDao");
+
+		userDao.persist(new User("1"));
+		orderDao.persist(new Order("2"));
+
+		context.close();
+	}
+
+
+
+	@Configuration
+	static class Spr11692Config {
+		@Bean
+		public BaseDao<User> userDao() {
+			return new UserDaoImpl();
+		}
+
+		@Bean
+		public BaseDao<Order> orderDao() {
+			return new OrderDaoImpl();
+		}
+	}
+
+
+	private static interface BaseDao<T> {
+		T persist(T t);
+	}
+
+	private static class UserDaoImpl implements BaseDao<User> {
+		@Override
+		@CachePut(value = "users", key = "#user.id")
+		public User persist(User user) {
+			return user;
+		}
+	}
+
+	private static class OrderDaoImpl implements BaseDao<Order> {
+		@Override
+		@CachePut(value = "orders", key = "#order.id")
+		public Order persist(Order order) {
+			return order;
+		}
+	}
+
+	private static class User {
+		private final String id;
+
+		private User(String id) {
+			this.id = id;
+		}
+
+		public String getId() {
+			return id;
+		}
+	}
+
+	private static class Order {
+		private final String id;
+
+		private Order(String id) {
+			this.id = id;
+		}
+
+		public String getId() {
+			return id;
+		}
+	}
+
+	@Configuration
+	@EnableCaching
+	static class SharedConfig extends CachingConfigurerSupport {
+		@Override
+		@Bean
+		public CacheManager cacheManager() {
+			return new ConcurrentMapCacheManager();
+		}
+	}
+
+}

spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.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.
@@ -39,6 +39,7 @@ import static org.junit.Assert.*;
  * @author Costin Leau
  * @author Phillip Webb
  * @author Sam Brannen
+ * @author Stephane Nicoll
  */
 public class ExpressionEvaluatorTests {
 
@@ -82,8 +83,10 @@ public class ExpressionEvaluatorTests {
 
 		Iterator<CacheOperation> it = ops.iterator();
 
-		Object keyA = eval.key(it.next().getKey(), method, evalCtx);
-		Object keyB = eval.key(it.next().getKey(), method, evalCtx);
+		MethodCacheKey key = new MethodCacheKey(method, AnnotatedClass.class);
+
+		Object keyA = eval.key(it.next().getKey(), key, evalCtx);
+		Object keyB = eval.key(it.next().getKey(), key, evalCtx);
 
 		assertEquals(args[0], keyA);
 		assertEquals(args[1], keyB);