Browse Source

Harmonize Cassandra bean names

pull/19711/head
Stephane Nicoll 6 years ago
parent
commit
dee71f064b
  1. 6
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

@ -63,14 +63,14 @@ public class CassandraAutoConfiguration { @@ -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<CqlSessionBuilderCustomizer> builderCustomizers) {
public CqlSessionBuilder cassandraSessionBuilder(CassandraProperties properties,
DriverConfigLoader driverConfigLoader, ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers) {
CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader);
configureSsl(properties, builder);
builder.withKeyspace(properties.getKeyspaceName());

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

@ -96,7 +96,7 @@ public class CassandraDataAutoConfiguration { @@ -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);

Loading…
Cancel
Save