Commit 23a923d1 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #17004 from nosan

* pr/17004:
  Polish CassandraDataAutoConfiguration

Closes gh-17004
parents 2a66dafb 54061bd5
...@@ -69,8 +69,8 @@ public class CassandraDataAutoConfiguration { ...@@ -69,8 +69,8 @@ public class CassandraDataAutoConfiguration {
private final Cluster cluster; private final Cluster cluster;
public CassandraDataAutoConfiguration(BeanFactory beanFactory, public CassandraDataAutoConfiguration(CassandraProperties properties,
CassandraProperties properties, Cluster cluster, Environment environment) { Cluster cluster) {
this.properties = properties; this.properties = properties;
this.cluster = cluster; this.cluster = cluster;
} }
...@@ -109,7 +109,7 @@ public class CassandraDataAutoConfiguration { ...@@ -109,7 +109,7 @@ public class CassandraDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(Session.class) @ConditionalOnMissingBean(Session.class)
public CassandraSessionFactoryBean cassandraSession(Environment environment, public CassandraSessionFactoryBean cassandraSession(Environment environment,
CassandraConverter converter) throws Exception { CassandraConverter converter) {
CassandraSessionFactoryBean session = new CassandraSessionFactoryBean(); CassandraSessionFactoryBean session = new CassandraSessionFactoryBean();
session.setCluster(this.cluster); session.setCluster(this.cluster);
session.setConverter(converter); session.setConverter(converter);
...@@ -123,7 +123,7 @@ public class CassandraDataAutoConfiguration { ...@@ -123,7 +123,7 @@ public class CassandraDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public CassandraTemplate cassandraTemplate(Session session, public CassandraTemplate cassandraTemplate(Session session,
CassandraConverter converter) throws Exception { CassandraConverter converter) {
return new CassandraTemplate(session, converter); return new CassandraTemplate(session, converter);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment