Merge branch '3.1.x'

org.springframework.aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cache.aspectj;
 
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 
@@ -30,4 +32,10 @@ public class AspectJAnnotationTest extends AbstractAnnotationTest {
 	protected ApplicationContext getApplicationContext() {
 		return new GenericXmlApplicationContext("/org/springframework/cache/config/annotation-cache-aspectj.xml");
 	}
+
+	@Test
+	public void testKeyStrategy() throws Exception {
+		AnnotationCacheAspect aspect = ctx.getBean("org.springframework.cache.config.internalCacheAspect", AnnotationCacheAspect.class);
+		Assert.assertSame(ctx.getBean("keyGenerator"), aspect.getKeyGenerator());
+	}
 }

org.springframework.aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2002-2011 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.springframework.cache.interceptor.DefaultKeyGenerator;
+
+public class SomeKeyGenerator extends DefaultKeyGenerator {
+
+}

org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml

@@ -23,7 +23,9 @@
 	<bean id="annotationSource" class="org.springframework.cache.annotation.AnnotationCacheOperationSource"/>
 	-->
 
-	<cache:annotation-driven mode="aspectj"/>
+	<cache:annotation-driven mode="aspectj" key-generator="keyGenerator"/>
+
+	<bean id="keyGenerator" class="org.springframework.cache.config.SomeKeyGenerator" />
 
 	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">

org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java

@@ -76,7 +76,8 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 	 * Registers a
 	 * <pre>
 	 * <bean id="cacheAspect" class="org.springframework.cache.aspectj.AnnotationCacheAspect" factory-method="aspectOf">
-	 *   <property name="cacheManagerBeanName" value="cacheManager"/>
+	 *   <property name="cacheManager" ref="cacheManager"/>
+	 *   <property name="keyGenerator" ref="keyGenerator"/>
 	 * </bean>
 	 *
 	 * </pre>
@@ -89,6 +90,7 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 			def.setBeanClassName(CACHE_ASPECT_CLASS_NAME);
 			def.setFactoryMethodName("aspectOf");
 			parseCacheManagerProperty(element, def);
+			CacheNamespaceHandler.parseKeyGenerator(element, def);
 			parserContext.registerBeanComponent(new BeanComponentDefinition(def, CACHE_ASPECT_BEAN_NAME));
 		}
 	}

org.springframework.context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java

@@ -97,6 +97,7 @@ class LazyParamAwareEvaluationContext extends StandardEvaluationContext {
 
 		// save arguments as indexed variables
 		for (int i = 0; i < this.args.length; i++) {
+			setVariable("a" + i, this.args[i]);
 			setVariable("p" + i, this.args[i]);
 		}
 

org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java

@@ -116,7 +116,7 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 		return counter.getAndIncrement();
 	}
 
-	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"),  @CacheEvict(value = "primary", key = "#p0 + 'A'") })
+	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#a0"),  @CacheEvict(value = "primary", key = "#p0 + 'A'") })
 	public Object multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
@@ -126,7 +126,7 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 		return counter.getAndIncrement();
 	}
 
-	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
+	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#a0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Object multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}

spring-framework-reference/src/cache.xml

@@ -195,10 +195,10 @@ public Book findBook(String name)]]></programlisting>
 							<entry><screen>#root.targetClass</screen></entry>
 						</row>
 						<row>
-					  	<entry>params</entry>
+							<entry>args</entry>
 							<entry>root object</entry>
 							<entry>The arguments (as array) used for invoking the target</entry>
-					  	<entry><screen>#root.params[0]</screen></entry>
+							<entry><screen>#root.args[0]</screen></entry>
 						</row>
 						<row>
 							<entry>caches</entry>
@@ -207,12 +207,12 @@ public Book findBook(String name)]]></programlisting>
 							<entry><screen>#root.caches[0].name</screen></entry>
 						</row>
 						<row>
-					  	<entry><emphasis>parameter name</emphasis></entry>
+							<entry><emphasis>argument name</emphasis></entry>
 							<entry>evaluation context</entry>
-					  	<entry>Name of any of the method parameter. If for some reason the names are not available (ex: no debug information),
+							<entry>Name of any of the method argument. If for some reason the names are not available (ex: no debug information),
-					  	the parameter names are also available under the <literal><![CDATA[p<#arg>]]></literal> where 
+							the argument names are also available under the <literal><![CDATA[a<#arg>]]></literal> where
-					  	<emphasis><![CDATA[#arg]]></emphasis> stands for the parameter index (starting from 0).</entry>
+							<emphasis><![CDATA[#arg]]></emphasis> stands for the argument index (starting from 0).</entry>
-					  	<entry><screen>iban</screen> or <screen>p0</screen></entry>
+							<entry><screen>iban</screen> or <screen>a0</screen> (one can also use <screen>p0</screen> or <literal><![CDATA[p<#arg>]]></literal> notation as an alias).</entry>
 						</row>
 					</tbody>
 				 </tgroup>