diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java index 255c68157c2..c1b7e703903 100644 --- a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java +++ b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java @@ -453,7 +453,7 @@ public abstract class CacheAspectSupport implements InitializingBean { if (StringUtils.hasText(this.operation.getKey())) { return evaluator.key(this.operation.getKey(), this.method, this.evalContext); } - return keyGenerator.extract(this.target, this.method, this.args); + return keyGenerator.generate(this.target, this.method, this.args); } protected Collection getCaches() { diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java index 7d80b372d9b..55cd2a54a27 100644 --- a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java +++ b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java @@ -35,7 +35,7 @@ public class DefaultKeyGenerator implements KeyGenerator { public static final int NO_PARAM_KEY = 0; public static final int NULL_PARAM_KEY = 53; - public Object extract(Object target, Method method, Object... params) { + public Object generate(Object target, Method method, Object... params) { if (params.length == 1) { return (params[0] == null ? NULL_PARAM_KEY : params[0]); } diff --git a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java index 45b65343070..b9009b8cefe 100644 --- a/org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java +++ b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/KeyGenerator.java @@ -19,14 +19,15 @@ package org.springframework.cache.interceptor; import java.lang.reflect.Method; /** - * Cache 'key' extractor. Used for creating a key based on the given method + * Cache key generator. Used for creating a key based on the given method * (used as context) and its parameters. * * @author Costin Leau + * @author Chris Beams * @since 3.1 */ public interface KeyGenerator { - Object extract(Object target, Method method, Object... params); + Object generate(Object target, Method method, Object... params); }