Harmonize Caffeine CacheManager bean name

Closes gh-6980

Harmonize Caffeine CacheManager bean name
Closes gh-6980
7dfa3a8c · Stephane Nicoll · 7d73abc0 · 7dfa3a8c
Commit 7dfa3a8c authored Sep 26, 2016 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CaffeineCacheConfiguration.java .../boot/autoconfigure/cache/CaffeineCacheConfiguration.java +1 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
@@ -68,7 +68,7 @@ class CaffeineCacheConfiguration {
 	}

 	@Bean
-	public CaffeineCacheManager caffeineCacheManager() {
+	public CaffeineCacheManager cacheManager() {
 		CaffeineCacheManager cacheManager = createCacheManager();
 		List<String> cacheNames = this.cacheProperties.getCacheNames();
 		if (!CollectionUtils.isEmpty(cacheNames)) {