From e71c446a3f0408b77a5ca9bf624611e2c5ef846b Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Mon, 10 Feb 2014 23:17:48 -0600 Subject: [PATCH] DATACASS-91 - renamed Java config @Bean converter() to cassandraConverter() in order to match DefaultDataBeanNames --- .../java/AbstractSpringDataCassandraConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java index 992da0ac6..5d1e35dc8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java @@ -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());