Harmonize Cassandra bean names

pull/19711/head
Stephane Nicoll 5 years ago
parent aefe52e4d0
commit dee71f064b

@ -63,14 +63,14 @@ public class CassandraAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@Lazy @Lazy
public CqlSession cqlSession(CqlSessionBuilder cqlSessionBuilder) { public CqlSession cassandraSession(CqlSessionBuilder cqlSessionBuilder) {
return cqlSessionBuilder.build(); return cqlSessionBuilder.build();
} }
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public CqlSessionBuilder cqlSessionBuilder(CassandraProperties properties, DriverConfigLoader driverConfigLoader, public CqlSessionBuilder cassandraSessionBuilder(CassandraProperties properties,
ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers) { DriverConfigLoader driverConfigLoader, ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers) {
CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader); CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader);
configureSsl(properties, builder); configureSsl(properties, builder);
builder.withKeyspace(properties.getKeyspaceName()); builder.withKeyspace(properties.getKeyspaceName());

@ -96,7 +96,7 @@ public class CassandraDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(SessionFactory.class) @ConditionalOnMissingBean(SessionFactory.class)
public SessionFactoryFactoryBean cassandraSession(Environment environment, CassandraConverter converter) { public SessionFactoryFactoryBean cassandraSessionFactory(Environment environment, CassandraConverter converter) {
SessionFactoryFactoryBean session = new SessionFactoryFactoryBean(); SessionFactoryFactoryBean session = new SessionFactoryFactoryBean();
session.setSession(this.session); session.setSession(this.session);
session.setConverter(converter); session.setConverter(converter);

Loading…
Cancel
Save