Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-509 - Align environment naming in configurer

Browse Source
This commit is contained in:
Michael Nitschinger
2020-03-09 11:01:23 +01:00
parent e918fa8793
commit 573e389f22
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
View File

@@ -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();

2
src/main/java/org/springframework/data/couchbase/config/CouchbaseConfigurer.java
View File

@@ -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