From 9f3c1cf7626dc6a9b15f13476baa3278966a6e5f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Mon, 28 Jul 2014 23:05:08 +0200
Subject: [PATCH] Polishing

---
 ...avaConfigTests.java => JCacheAspectJJavaConfigTests.java} | 5 ++---
 ...nfigTests.java => JCacheAspectJNamespaceConfigTests.java} | 3 +--
 .../cache/annotation/CachingConfigurationSelector.java       | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename spring-aspects/src/test/java/org/springframework/cache/aspectj/{AspectJJcacheJavaConfigTests.java => JCacheAspectJJavaConfigTests.java} (94%)
 rename spring-aspects/src/test/java/org/springframework/cache/aspectj/{AspectJJcacheNamespaceConfigTests.java => JCacheAspectJNamespaceConfigTests.java} (94%)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheJavaConfigTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJJavaConfigTests.java
similarity index 94%
rename from spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheJavaConfigTests.java
rename to spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJJavaConfigTests.java
index 2fb8bf401f..3dd06ee0fe 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheJavaConfigTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJJavaConfigTests.java
@@ -24,7 +24,6 @@ import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.config.AnnotatedJCacheableService;
 import org.springframework.cache.jcache.config.AbstractJCacheAnnotationTests;
-import org.springframework.cache.jcache.config.JCacheableService;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AdviceMode;
@@ -33,16 +32,16 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- *
  * @author Stephane Nicoll
  */
-public class AspectJJcacheJavaConfigTests extends AbstractJCacheAnnotationTests {
+public class JCacheAspectJJavaConfigTests extends AbstractJCacheAnnotationTests {
 
 	@Override
 	protected ApplicationContext getApplicationContext() {
 		return new AnnotationConfigApplicationContext(EnableCachingConfig.class);
 	}
 
+
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
 	public static class EnableCachingConfig {
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheNamespaceConfigTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
similarity index 94%
rename from spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheNamespaceConfigTests.java
rename to spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
index 9eb2a9a35f..8f423ce340 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJJcacheNamespaceConfigTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
@@ -21,10 +21,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 
 /**
- *
  * @author Stephane Nicoll
  */
-public class AspectJJcacheNamespaceConfigTests extends AbstractJCacheAnnotationTests {
+public class JCacheAspectJNamespaceConfigTests extends AbstractJCacheAnnotationTests {
 
 	@Override
 	protected ApplicationContext getApplicationContext() {
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
index 5e78343346..f99b40d756 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
@@ -25,10 +25,11 @@ import org.springframework.context.annotation.AutoProxyRegistrar;
 import org.springframework.util.ClassUtils;
 
 /**
- * Select which implementation of {@link AbstractCachingConfiguration} should be used
+ * Selects which implementation of {@link AbstractCachingConfiguration} should be used
  * based on the value of {@link EnableCaching#mode} on the importing {@code @Configuration}
  * class.
- * <p>Detect the presence of JSR-107 and enables JCache support accordingly.
+ *
+ * <p>Detects the presence of JSR-107 and enables JCache support accordingly.
  *
  * @author Chris Beams
  * @author Stephane Nicoll