Polish

spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -179,7 +179,7 @@ public class ConcurrentMapCacheManager implements CacheManager, BeanClassLoaderA
 	 */
 	protected Cache createConcurrentMapCache(String name) {
 		SerializationDelegate actualSerialization =
-				this.storeByValue ? serialization : null;
+				this.storeByValue ? this.serialization : null;
 		return new ConcurrentMapCache(name, new ConcurrentHashMap<Object, Object>(256),
 				isAllowNullValues(), actualSerialization);
 

spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -197,14 +197,14 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
 
 		Props(Element root) {
 			String defaultCache = root.getAttribute("cache");
-			key = root.getAttribute("key");
+			this.key = root.getAttribute("key");
-			keyGenerator = root.getAttribute("key-generator");
+			this.keyGenerator = root.getAttribute("key-generator");
-			cacheManager = root.getAttribute("cache-manager");
+			this.cacheManager = root.getAttribute("cache-manager");
-			condition = root.getAttribute("condition");
+			this.condition = root.getAttribute("condition");
-			method = root.getAttribute(METHOD_ATTRIBUTE);
+			this.method = root.getAttribute(METHOD_ATTRIBUTE);
 
 			if (StringUtils.hasText(defaultCache)) {
-				caches = StringUtils.commaDelimitedListToStringArray(defaultCache.trim());
+				this.caches = StringUtils.commaDelimitedListToStringArray(defaultCache.trim());
 			}
 		}
 
@@ -212,12 +212,12 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
 			String cache = element.getAttribute("cache");
 
 			// sanity check
-			String[] localCaches = caches;
+			String[] localCaches = this.caches;
 			if (StringUtils.hasText(cache)) {
 				localCaches = StringUtils.commaDelimitedListToStringArray(cache.trim());
 			}
 			else {
-				if (caches == null) {
+				if (this.caches == null) {
 					readerCtx.error("No cache specified specified for " + element.getNodeName(), element);
 				}
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -101,7 +101,7 @@ public abstract class CacheOperation implements BasicOperation {
 	}
 
 	public void setCacheResolver(String cacheResolver) {
-		Assert.notNull(cacheManager);
+		Assert.notNull(this.cacheManager);
 		this.cacheResolver = cacheResolver;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -52,7 +52,7 @@ public interface CacheOperationInvoker {
 		}
 
 		public Throwable getOriginal() {
-			return original;
+			return this.original;
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 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,7 +29,7 @@ public class CachePutOperation extends CacheOperation {
 
 
 	public String getUnless() {
-		return unless;
+		return this.unless;
 	}
 
 	public void setUnless(String unless) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -31,7 +31,7 @@ public class CacheableOperation extends CacheOperation {
 
 
 	public String getUnless() {
-		return unless;
+		return this.unless;
 	}
 
 	public void setUnless(String unless) {
@@ -39,7 +39,7 @@ public class CacheableOperation extends CacheOperation {
 	}
 
 	public boolean isSync() {
-		return sync;
+		return this.sync;
 	}
 
 	public void setSync(boolean sync) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -51,7 +51,7 @@ public class NamedCacheResolver extends AbstractCacheResolver {
 
 	@Override
 	protected Collection<String> getCacheNames(CacheOperationInvocationContext<?> context) {
-		return cacheNames;
+		return this.cacheNames;
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -57,7 +57,7 @@ public class SimpleKey implements Serializable {
 
 	@Override
 	public final int hashCode() {
-		return hashCode;
+		return this.hashCode;
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -37,6 +37,6 @@ class VariableNotAvailableException extends EvaluationException {
 
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 }