Polishing

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -29,19 +29,18 @@ import org.springframework.core.BridgeMethodResolver;
 import org.springframework.util.ClassUtils;
 
 /**
- * Abstract implementation of {@link JCacheOperationSource} that caches
+ * Abstract implementation of {@link JCacheOperationSource} that caches attributes
- * attributes for methods and implements a fallback policy: 1. specific
+ * for methods and implements a fallback policy: 1. specific target method;
- * target method; 2. declaring method.
+ * 2. declaring method.
  *
- * <p>This implementation caches attributes by method after they are
+ * <p>This implementation caches attributes by method after they are first used.
- * first used.
  *
  * @author Stephane Nicoll
+ * @author Juergen Hoeller
  * @since 4.1
  * @see org.springframework.cache.interceptor.AbstractFallbackCacheOperationSource
  */
-public abstract class AbstractFallbackJCacheOperationSource
+public abstract class AbstractFallbackJCacheOperationSource implements JCacheOperationSource {
-		implements JCacheOperationSource {
 
 	/**
 	 * Canonical value held in cache to indicate no caching attribute was
@@ -49,34 +48,31 @@ public abstract class AbstractFallbackJCacheOperationSource
 	 */
 	private final static Object NULL_CACHING_ATTRIBUTE = new Object();
 
+
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private final Map<Object, Object> cache =
+	private final Map<Object, Object> cache = new ConcurrentHashMap<Object, Object>(1024);
-			new ConcurrentHashMap<Object, Object>(1024);
+
 
 	@Override
 	public JCacheOperation<?> getCacheOperation(Method method, Class<?> targetClass) {
-		// First, see if we have a cached value.
 		Object cacheKey = new MethodCacheKey(method, targetClass);
 		Object cached = this.cache.get(cacheKey);
+
 		if (cached != null) {
-			if (cached == NULL_CACHING_ATTRIBUTE) {
+			return (cached != NULL_CACHING_ATTRIBUTE ? (JCacheOperation<?>) cached : null);
-				return null;
-			}
-			return (JCacheOperation<?>) cached;
 		}
 		else {
 			JCacheOperation<?> operation = computeCacheOperation(method, targetClass);
-			if (operation == null) {
+			if (operation != null) {
-				this.cache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
-			}
-			else {
 				if (logger.isDebugEnabled()) {
-					logger.debug("Adding cacheable method '" + method.getName()
+					logger.debug("Adding cacheable method '" + method.getName() + "' with operation: " + operation);
-							+ "' with operation: " + operation);
 				}
 				this.cache.put(cacheKey, operation);
 			}
+			else {
+				this.cache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
+			}
 			return operation;
 		}
 	}
@@ -108,6 +104,7 @@ public abstract class AbstractFallbackJCacheOperationSource
 		return null;
 	}
 
+
 	/**
 	 * Subclasses need to implement this to return the caching operation
 	 * for the given method, if any.

spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -59,6 +59,7 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	 */
 	private final static Collection<CacheOperation> NULL_CACHING_ATTRIBUTE = Collections.emptyList();
 
+
 	/**
 	 * Logger available to subclasses.
 	 * <p>As this base class is not marked Serializable, the logger will be recreated
@@ -71,9 +72,10 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	 * <p>As this base class is not marked Serializable, the cache will be recreated
 	 * after serialization - provided that the concrete subclass is Serializable.
 	 */
-	final Map<Object, Collection<CacheOperation>> attributeCache =
+	private final Map<Object, Collection<CacheOperation>> attributeCache =
 			new ConcurrentHashMap<Object, Collection<CacheOperation>>(1024);
 
+
 	/**
 	 * Determine the caching attribute for this method invocation.
 	 * <p>Defaults to the class's caching attribute if no method attribute is found.
@@ -84,30 +86,23 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	 */
 	@Override
 	public Collection<CacheOperation> getCacheOperations(Method method, Class<?> targetClass) {
-		// First, see if we have a cached value.
 		Object cacheKey = getCacheKey(method, targetClass);
 		Collection<CacheOperation> cached = this.attributeCache.get(cacheKey);
+
 		if (cached != null) {
-			if (cached == NULL_CACHING_ATTRIBUTE) {
+			return (cached != NULL_CACHING_ATTRIBUTE ? cached : null);
-				return null;
-			}
-			// Value will either be canonical value indicating there is no caching attribute,
-			// or an actual caching attribute.
-			return cached;
 		}
 		else {
-			// We need to work it out.
 			Collection<CacheOperation> cacheOps = computeCacheOperations(method, targetClass);
-			// Put it in the cache.
+			if (cacheOps != null) {
-			if (cacheOps == null) {
-				this.attributeCache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
-			}
-			else {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Adding cacheable method '" + method.getName() + "' with attribute: " + cacheOps);
 				}
 				this.attributeCache.put(cacheKey, cacheOps);
 			}
+			else {
+				this.attributeCache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
+			}
 			return cacheOps;
 		}
 	}
@@ -186,4 +181,5 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	protected boolean allowPublicMethodsOnly() {
 		return false;
 	}
+
 }