Merge pull request #14 from runnerway/bucket-from-template

Take bucket name from CouchbaseTemplate

Author: mkopylec

src/main/java/com/github/mkopylec/sessioncouchbase/configuration/PersistentConfiguration.java

@@ -25,8 +25,6 @@
 @ConditionalOnProperty(name = "session-couchbase.in-memory.enabled", havingValue = "false", matchIfMissing = true)
 public class PersistentConfiguration {
 
-    @Autowired
-    protected CouchbaseProperties couchbase;
     @Autowired
     protected SessionCouchbaseProperties sessionCouchbase;
 
@@ -51,6 +49,6 @@ public RetryTemplate sessionCouchbaseRetryTemplate(RetryLoggingListener listener
     @Bean
     @ConditionalOnMissingBean
     public SessionDao sessionDao(CouchbaseTemplate couchbaseTemplate, @Qualifier("sessionCouchbaseRetryTemplate") RetryTemplate retryTemplate) {
-        return new PersistentDao(couchbase, sessionCouchbase, couchbaseTemplate, retryTemplate);
+        return new PersistentDao(sessionCouchbase, couchbaseTemplate, retryTemplate);
     }
 }

src/main/java/com/github/mkopylec/sessioncouchbase/data/PersistentDao.java

@@ -33,8 +33,8 @@ public class PersistentDao implements SessionDao {
     protected final CouchbaseTemplate couchbaseTemplate;
     protected final RetryTemplate retryTemplate;
 
-    public PersistentDao(CouchbaseProperties couchbase, SessionCouchbaseProperties sessionCouchbase, CouchbaseTemplate couchbaseTemplate, RetryTemplate retryTemplate) {
-        bucket = couchbase.getBucket().getName();
+    public PersistentDao(SessionCouchbaseProperties sessionCouchbase, CouchbaseTemplate couchbaseTemplate, RetryTemplate retryTemplate) {
+        bucket = couchbaseTemplate.getCouchbaseBucket().name();
         queryConsistency = sessionCouchbase.getPersistent().getQueryConsistency();
         this.couchbaseTemplate = couchbaseTemplate;
         this.retryTemplate = retryTemplate;