Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-91 - renamed Java config @Bean converter() to cassandraConverter() in order to match DefaultDataBeanNames

Browse Source
This commit is contained in:
Matthew Adams
2014-02-10 23:17:48 -06:00
parent e3a131007c
commit e71c446a3f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
View File

@@ -69,7 +69,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
CassandraDataSessionFactoryBean bean = new CassandraDataSessionFactoryBean();
bean.setCluster(cluster().getObject());
bean.setConverter(converter().getObject());
bean.setConverter(cassandraConverter().getObject());
bean.setSchemaAction(getSchemaAction());
bean.setKeyspaceName(getKeyspaceName());
bean.setStartupScripts(getStartupScripts());
@@ -85,7 +85,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
*/
@Bean
public CassandraAdminOperations cassandraTemplate() throws Exception {
return new CassandraAdminTemplate(session().getObject(), converter().getObject());
return new CassandraAdminTemplate(session().getObject(), cassandraConverter().getObject());
}
/**
@@ -107,7 +107,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
* Return the {@link CassandraConverter} instance to convert Rows to Objects, Objects to BuiltStatements
*/
@Bean
public CassandraMappingConverterFactoryBean converter() throws Exception {
public CassandraMappingConverterFactoryBean cassandraConverter() throws Exception {
CassandraMappingConverterFactoryBean bean = new CassandraMappingConverterFactoryBean();
bean.setMappingContext(cassandraMapping().getObject());