From 4045f52e6f925457738d2f3264e2aec302d553e0 Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Tue, 10 Dec 2013 14:27:21 -0600 Subject: [PATCH] switched from *Template to *Operations in C*TemplateFactoryBean --- .../config/java/AbstractCassandraConfiguration.java | 12 ++++-------- .../config/xml/CassandraTemplateFactoryBean.java | 10 +++++----- .../java/AbstractKeyspaceCreatingConfiguration.java | 2 +- .../test/integration/config/java/Config.java | 2 +- .../config/java/KeyspaceCreatingConfig.java | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java index 216166953..955256a70 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java @@ -36,7 +36,7 @@ public abstract class AbstractCassandraConfiguration { /** * The name of the keyspace to connect to. If {@literal null} or empty, then the system keyspace will be used. */ - protected abstract String getKeyspace(); + protected abstract String getKeyspaceName(); /** * The {@link Cluster} instance to connect to. Must not be null. @@ -51,19 +51,15 @@ public abstract class AbstractCassandraConfiguration { */ @Bean public Session session() { - String keyspace = getKeyspace(); - if (StringUtils.hasText(keyspace)) { - return cluster().connect(keyspace); - } else { - return cluster().connect(); - } + String keyspaceName = getKeyspaceName(); + return StringUtils.hasText(keyspaceName) ? cluster().connect(keyspaceName) : cluster().connect(); } /** * A {@link CassandraTemplate} created from the {@link Session} returned by {@link #session()}. */ @Bean - public CassandraOperations cassandraTemplate() { + public CassandraOperations template() { return new CassandraTemplate(session()); } } diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java index 414561b7e..cccaad77e 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java @@ -19,6 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; +import org.springframework.cassandra.core.CassandraOperations; import org.springframework.cassandra.core.CassandraTemplate; import com.datastax.driver.core.Session; @@ -28,20 +29,19 @@ import com.datastax.driver.core.Session; * * @author Matthew T. Adams */ - -public class CassandraTemplateFactoryBean implements FactoryBean, InitializingBean { +public class CassandraTemplateFactoryBean implements FactoryBean, InitializingBean { private static final Logger log = LoggerFactory.getLogger(CassandraTemplateFactoryBean.class); private CassandraTemplate template; private Session session; - public CassandraTemplate getObject() { + public CassandraOperations getObject() { return template; } - public Class getObjectType() { - return CassandraTemplate.class; + public Class getObjectType() { + return CassandraOperations.class; } public boolean isSingleton() { diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java index f0ceefb33..fe7417356 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java @@ -21,7 +21,7 @@ public abstract class AbstractKeyspaceCreatingConfiguration extends AbstractInte } protected void createKeyspaceIfNecessary() { - String keyspace = getKeyspace(); + String keyspace = getKeyspaceName(); if (!StringUtils.hasText(keyspace)) { return; } diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java index 8a1abf636..a6c26d5e2 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; public class Config extends AbstractIntegrationTestConfiguration { @Override - protected String getKeyspace() { + protected String getKeyspaceName() { return null; } } diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingConfig.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingConfig.java index 13d75dc69..39c4efcb3 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingConfig.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingConfig.java @@ -8,7 +8,7 @@ public class KeyspaceCreatingConfig extends AbstractKeyspaceCreatingConfiguratio public static final String KEYSPACE = "kcc"; @Override - protected String getKeyspace() { + protected String getKeyspaceName() { return KEYSPACE; } }