From 246f5ce8eb8e943ecc35286dc11329e204735437 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 14 Jan 2020 12:25:44 +0100 Subject: [PATCH] Polish Cassandra v4 support --- .../autoconfigure/cassandra/CassandraAutoConfiguration.java | 4 ++-- .../cassandra/DriverConfigLoaderBuilderCustomizer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java index 6334683ee8..8d37d33fbd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java @@ -91,11 +91,11 @@ public class CassandraAutoConfiguration { @Bean @ConditionalOnMissingBean - public DriverConfigLoader driverConfigLoader(CassandraProperties properties, + public DriverConfigLoader cassandraDriverConfigLoader(CassandraProperties properties, ObjectProvider builderCustomizers) { ProgrammaticDriverConfigLoaderBuilder builder = new DefaultProgrammaticDriverConfigLoaderBuilder( () -> cassandraConfiguration(properties), DefaultDriverConfigLoader.DEFAULT_ROOT_PATH); - builderCustomizers.orderedStream().forEach((customizer) -> customizer.customizer(builder)); + builderCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder)); return builder.build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java index 493d232e66..020191e673 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java @@ -34,6 +34,6 @@ public interface DriverConfigLoaderBuilderCustomizer { * builder}. * @param builder the builder to customize */ - void customizer(ProgrammaticDriverConfigLoaderBuilder builder); + void customize(ProgrammaticDriverConfigLoaderBuilder builder); }