From de106043c3cd4cb877287ec96fd1a012677b583d Mon Sep 17 00:00:00 2001 From: Michael Reiche Date: Tue, 22 Feb 2022 10:08:12 -0800 Subject: [PATCH] Fix update to cache documentation. Closes #1358. --- src/main/asciidoc/caching.adoc | 14 +++++++------- .../data/couchbase/domain/Config.java | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/asciidoc/caching.adoc b/src/main/asciidoc/caching.adoc index 5aacff6a5..e0bfcfb37 100644 --- a/src/main/asciidoc/caching.adoc +++ b/src/main/asciidoc/caching.adoc @@ -22,13 +22,13 @@ To make it work, you need to add the `@EnableCaching` annotation and configure t public class Config extends AbstractCouchbaseConfiguration { // general methods - @Bean - public CouchbaseCacheManager cacheManager(CouchbaseTemplate couchbaseTemplate) throws Exception { - CouchbaseCacheManager.CouchbaseCacheManagerBuilder builder = CouchbaseCacheManager.CouchbaseCacheManagerBuilder - .fromConnectionFactory(couchbaseTemplate.getCouchbaseClientFactory()); - builder.withCacheConfiguration("mySpringCache", CouchbaseCacheConfiguration.defaultCacheConfig()); - return builder.build(); - } + @Bean + public CouchbaseCacheManager cacheManager(CouchbaseTemplate couchbaseTemplate) throws Exception { + CouchbaseCacheManager.CouchbaseCacheManagerBuilder builder = CouchbaseCacheManager.CouchbaseCacheManagerBuilder + .fromConnectionFactory(couchbaseTemplate.getCouchbaseClientFactory()); + return builder.build(); + } + ---- ==== diff --git a/src/test/java/org/springframework/data/couchbase/domain/Config.java b/src/test/java/org/springframework/data/couchbase/domain/Config.java index 2966bbeec..9e72e582f 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/Config.java +++ b/src/test/java/org/springframework/data/couchbase/domain/Config.java @@ -223,7 +223,6 @@ public TranslationService couchbaseTranslationService() { public CouchbaseCacheManager cacheManager(CouchbaseTemplate couchbaseTemplate) throws Exception { CouchbaseCacheManager.CouchbaseCacheManagerBuilder builder = CouchbaseCacheManager.CouchbaseCacheManagerBuilder .fromConnectionFactory(couchbaseTemplate.getCouchbaseClientFactory()); - //CouchbaseCacheConfiguration cfg = CouchbaseCacheConfiguration.defaultCacheConfig().withCacheConfiguration("mySpringCache", CouchbaseCacheConfiguration.defaultCacheConfig()); return builder.build(); }