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

Allow to customize Cluster.Builder rather than Cluster

Browse Source 
Rework cb3d14a so that the customizer operates on the Builder rather than
the Cluster. The former exposes many more options.

See gh-7320
Closes gh-7669
This commit is contained in:
Stephane Nicoll
2016-12-22 10:32:54 +01:00
parent 78ee8637bc
commit eb294956d8
3 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
View File

@@ -64,12 +64,21 @@ public class CassandraAutoConfigurationTests {
@Test
public void createCustomizeCluster() {
load(ClusterConfig.class);
load(MockCustomizerConfig.class);
assertThat(this.context.getBeanNamesForType(Cluster.class).length).isEqualTo(1);
assertThat(this.context.getBeanNamesForType(ClusterCustomizer.class).length)
assertThat(this.context.getBeanNamesForType(ClusterBuilderCustomizer.class).length)
.isEqualTo(1);
}
@Test
public void customizerOverridesAutoConfig() {
load(SimpleCustomizerConfig.class,
"spring.data.cassandra.cluster-name=testcluster");
assertThat(this.context.getBeanNamesForType(Cluster.class).length).isEqualTo(1);
Cluster cluster = this.context.getBean(Cluster.class);
assertThat(cluster.getClusterName()).isEqualTo("overridden-name");
}
private void load(String... environment) {
load(null, environment);
}
@@ -87,11 +96,26 @@ public class CassandraAutoConfigurationTests {
}
@Configuration
static class ClusterConfig {
static class MockCustomizerConfig {
@Bean
public ClusterCustomizer customizer() {
return mock(ClusterCustomizer.class);
public ClusterBuilderCustomizer customizer() {
return mock(ClusterBuilderCustomizer.class);
}
}
@Configuration
static class SimpleCustomizerConfig {
@Bean
public ClusterBuilderCustomizer customizer() {
return new ClusterBuilderCustomizer() {
@Override
public void customize(Cluster.Builder clusterBuilder) {
clusterBuilder.withClusterName("overridden-name");
}
};
}
}