From 573e389f221d8b689be05f49b42fa26fba5f0174 Mon Sep 17 00:00:00 2001 From: Michael Nitschinger Date: Mon, 9 Mar 2020 11:01:23 +0100 Subject: [PATCH] DATACOUCH-509 - Align environment naming in configurer --- .../couchbase/config/AbstractCouchbaseConfiguration.java | 5 ++--- .../data/couchbase/config/CouchbaseConfigurer.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java index 44153367..c36d5e8b 100644 --- a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java +++ b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.Set; import com.couchbase.client.java.Cluster; -import com.couchbase.client.java.ClusterOptions; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; @@ -95,13 +94,13 @@ public abstract class AbstractCouchbaseConfiguration implements CouchbaseConfigu public Cluster couchbaseCluster() throws Exception { return Cluster.connect( getConnectionString(), - clusterOptions(authenticator()).environment(couchbaseConfigurer().clusterEnvironment()) + clusterOptions(authenticator()).environment(couchbaseConfigurer().couchbaseClusterEnvironment()) ); } @Override @Bean(destroyMethod = "shutdown") - public ClusterEnvironment clusterEnvironment() { + public ClusterEnvironment couchbaseClusterEnvironment() { ClusterEnvironment.Builder builder = ClusterEnvironment.builder(); configureEnvironment(builder); return builder.build(); diff --git a/src/main/java/org/springframework/data/couchbase/config/CouchbaseConfigurer.java b/src/main/java/org/springframework/data/couchbase/config/CouchbaseConfigurer.java index 07c8786b..041e583a 100644 --- a/src/main/java/org/springframework/data/couchbase/config/CouchbaseConfigurer.java +++ b/src/main/java/org/springframework/data/couchbase/config/CouchbaseConfigurer.java @@ -35,7 +35,7 @@ public interface CouchbaseConfigurer { * * @throws Exception in case of error during the ClusterEnvironment instantiation. */ - ClusterEnvironment clusterEnvironment() throws Exception; + ClusterEnvironment couchbaseClusterEnvironment() throws Exception; /** * Set up the underlying main {@link Cluster} reference to be used by the Spring Data framework