From dee71f064be85d8885814bbcb3169626a69cadfe Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 14 Jan 2020 15:12:00 +0100 Subject: [PATCH] Harmonize Cassandra bean names --- .../autoconfigure/cassandra/CassandraAutoConfiguration.java | 6 +++--- .../data/cassandra/CassandraDataAutoConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 4 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 8d37d33fbd..161a03869c 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 @@ -63,14 +63,14 @@ public class CassandraAutoConfiguration { @Bean @ConditionalOnMissingBean @Lazy - public CqlSession cqlSession(CqlSessionBuilder cqlSessionBuilder) { + public CqlSession cassandraSession(CqlSessionBuilder cqlSessionBuilder) { return cqlSessionBuilder.build(); } @Bean @ConditionalOnMissingBean - public CqlSessionBuilder cqlSessionBuilder(CassandraProperties properties, DriverConfigLoader driverConfigLoader, - ObjectProvider builderCustomizers) { + public CqlSessionBuilder cassandraSessionBuilder(CassandraProperties properties, + DriverConfigLoader driverConfigLoader, ObjectProvider builderCustomizers) { CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader); configureSsl(properties, builder); builder.withKeyspace(properties.getKeyspaceName()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java index 8f29bd9143..557a58d1dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java @@ -96,7 +96,7 @@ public class CassandraDataAutoConfiguration { @Bean @ConditionalOnMissingBean(SessionFactory.class) - public SessionFactoryFactoryBean cassandraSession(Environment environment, CassandraConverter converter) { + public SessionFactoryFactoryBean cassandraSessionFactory(Environment environment, CassandraConverter converter) { SessionFactoryFactoryBean session = new SessionFactoryFactoryBean(); session.setSession(this.session); session.setConverter(converter);