From be3d08671b4b2e9390c01091baa52ecc7035939e Mon Sep 17 00:00:00 2001 From: David Webb Date: Thu, 23 Jan 2014 22:36:07 -0500 Subject: [PATCH] DATACASS-74 - Renamed Core Template Classes --- .../config/CassandraClusterFactoryBean.java | 8 ++++---- .../config/CassandraSessionFactoryBean.java | 4 ++-- .../config/CassandraTemplateFactoryBean.java | 18 ++++++++--------- ...ndraOperations.java => CqlOperations.java} | 2 +- ...assandraTemplate.java => CqlTemplate.java} | 6 +++--- .../config/xml/MinimalXmlConfigTest.java | 4 ++-- ...eholderNamespaceCreatingXmlConfigTest.java | 4 ++-- .../template/CassandraOperationsTest.java | 12 +++++------ ...NamespaceCreatingXmlConfigTest-context.xml | 2 +- .../config/xml/XmlConfigTest-context.xml | 2 +- ...erations.java => CassandraOperations.java} | 2 +- ...taTemplate.java => CassandraTemplate.java} | 14 ++++++------- .../config/EnableCassandraRepositories.java | 4 ++-- .../support/CassandraRepositoryFactory.java | 6 +++--- .../CassandraRepositoryFactoryBean.java | 8 ++++---- .../support/SimpleCassandraRepository.java | 20 +++++++++---------- .../data/cassandra/util/CqlUtils.java | 14 ++++++------- .../test/integration/config/TestConfig.java | 8 ++++---- .../UserRepositoryIntegrationTests.java | 4 ++-- .../template/CassandraAdminTest.java | 4 ++-- .../template/CassandraDataOperationsTest.java | 6 +++--- ...UserRepositoryIntegrationTests-context.xml | 4 ++-- 22 files changed, 78 insertions(+), 78 deletions(-) rename spring-cassandra/src/main/java/org/springframework/cassandra/core/{CassandraOperations.java => CqlOperations.java} (99%) rename spring-cassandra/src/main/java/org/springframework/cassandra/core/{CassandraTemplate.java => CqlTemplate.java} (99%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/{CassandraDataOperations.java => CassandraOperations.java} (99%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/{CassandraDataTemplate.java => CassandraTemplate.java} (98%) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java index acb7375af..c6f33a178 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CassandraTemplate; +import org.springframework.cassandra.core.CqlTemplate; import org.springframework.cassandra.core.cql.generator.CreateKeyspaceCqlGenerator; import org.springframework.cassandra.core.cql.generator.DropKeyspaceCqlGenerator; import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; @@ -220,12 +220,12 @@ public class CassandraClusterFactoryBean implements FactoryBean, Initia protected void executeSpecsAndScripts(@SuppressWarnings("rawtypes") List specs, List scripts) { Session system = null; - CassandraTemplate template = null; + CqlTemplate template = null; try { if (specs != null) { system = specs.size() == 0 ? null : cluster.connect(); - template = system == null ? null : new CassandraTemplate(system); + template = system == null ? null : new CqlTemplate(system); Iterator i = specs.iterator(); while (i.hasNext()) { @@ -249,7 +249,7 @@ public class CassandraClusterFactoryBean implements FactoryBean, Initia } if (template == null) { - template = system == null ? null : new CassandraTemplate(system); + template = system == null ? null : new CqlTemplate(system); } for (String script : scripts) { diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java index f8beee1e9..bf4706f34 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CassandraTemplate; +import org.springframework.cassandra.core.CqlTemplate; import org.springframework.cassandra.support.CassandraExceptionTranslator; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; @@ -93,7 +93,7 @@ public class CassandraSessionFactoryBean implements FactoryBean, Initia return; } - CassandraTemplate template = new CassandraTemplate(session); + CqlTemplate template = new CqlTemplate(session); for (String script : scripts) { diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java index 5ef44bbab..2eb92703d 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java @@ -17,29 +17,29 @@ package org.springframework.cassandra.config; 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 org.springframework.cassandra.core.CqlOperations; +import org.springframework.cassandra.core.CqlTemplate; import com.datastax.driver.core.Session; /** - * Factory for configuring a {@link CassandraTemplate}. + * Factory for configuring a {@link CqlTemplate}. * * @author Matthew T. Adams */ -public class CassandraTemplateFactoryBean implements FactoryBean, InitializingBean { +public class CassandraTemplateFactoryBean implements FactoryBean, InitializingBean { - private CassandraTemplate template; + private CqlTemplate template; private Session session; @Override - public CassandraOperations getObject() { + public CqlOperations getObject() { return template; } @Override - public Class getObjectType() { - return CassandraOperations.class; + public Class getObjectType() { + return CqlOperations.class; } @Override @@ -54,7 +54,7 @@ public class CassandraTemplateFactoryBean implements FactoryBean - + diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml index b40e1dfac..8ff54e067 100644 --- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml +++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml @@ -26,7 +26,7 @@ - + diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java index 217052354..97c08046f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java @@ -31,7 +31,7 @@ import com.datastax.driver.core.querybuilder.Select; * @author Matthew Adams * */ -public interface CassandraDataOperations { +public interface CassandraOperations { /** * The table name used for the specified class by this template. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index c4ebf9dfa..7f0e2c003 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.springframework.cassandra.core.CassandraTemplate; +import org.springframework.cassandra.core.CqlTemplate; import org.springframework.cassandra.core.QueryOptions; import org.springframework.cassandra.core.SessionCallback; import org.springframework.dao.DataAccessException; @@ -47,12 +47,12 @@ import com.datastax.driver.core.querybuilder.Select; /** * The Cassandra Data Template is a convenience API for all Cassandra Operations using POJOs. This is the "Spring Data" - * flavor of the template. For low level Cassandra Operations use the {@link CassandraTemplate} + * flavor of the template. For low level Cassandra Operations use the {@link CqlTemplate} * * @author Alex Shvid * @author David Webb */ -public class CassandraDataTemplate extends CassandraTemplate implements CassandraDataOperations { +public class CassandraTemplate extends CqlTemplate implements CassandraOperations { /* * List of iterable classes when testing POJOs for specific operations. @@ -80,7 +80,7 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr /** * Default Constructor for wiring in the required components later */ - public CassandraDataTemplate() { + public CassandraTemplate() { } /** @@ -88,7 +88,7 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr * * @param session must not be {@literal null} */ - public CassandraDataTemplate(Session session) { + public CassandraTemplate(Session session) { this(session, null, null); } @@ -98,7 +98,7 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr * @param session must not be {@literal null} * @param converter must not be {@literal null}. */ - public CassandraDataTemplate(Session session, CassandraConverter converter) { + public CassandraTemplate(Session session, CassandraConverter converter) { this(session, converter, null); } @@ -108,7 +108,7 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr * @param session must not be {@literal null}. * @param converter must not be {@literal null}. */ - public CassandraDataTemplate(Session session, CassandraConverter converter, String keyspace) { + public CassandraTemplate(Session session, CassandraConverter converter, String keyspace) { setSession(session); this.keyspace = keyspace; this.cassandraConverter = converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/EnableCassandraRepositories.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/EnableCassandraRepositories.java index 26a471b7a..caa4b7781 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/EnableCassandraRepositories.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/EnableCassandraRepositories.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Import; -import org.springframework.data.cassandra.core.CassandraDataTemplate; +import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.repository.support.CassandraRepositoryFactoryBean; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.QueryLookupStrategy.Key; @@ -109,7 +109,7 @@ public @interface EnableCassandraRepositories { Class repositoryFactoryBeanClass() default CassandraRepositoryFactoryBean.class; /** - * Configures the name of the {@link CassandraDataTemplate} bean to be used with the repositories detected. + * Configures the name of the {@link CassandraTemplate} bean to be used with the repositories detected. * * @return */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java index e59caa323..c3ae675c1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.repository.support; import java.io.Serializable; -import org.springframework.data.cassandra.core.CassandraDataTemplate; +import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.repository.CassandraRepository; @@ -37,7 +37,7 @@ import org.springframework.util.Assert; public class CassandraRepositoryFactory extends RepositoryFactorySupport { - private final CassandraDataTemplate cassandraDataTemplate; + private final CassandraTemplate cassandraDataTemplate; private final MappingContext, CassandraPersistentProperty> mappingContext; /** @@ -45,7 +45,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { * * @param mongoOperations must not be {@literal null} */ - public CassandraRepositoryFactory(CassandraDataTemplate cassandraDataTemplate) { + public CassandraRepositoryFactory(CassandraTemplate cassandraDataTemplate) { Assert.notNull(cassandraDataTemplate); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java index ce3af5980..7c2909309 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.repository.support; import java.io.Serializable; -import org.springframework.data.cassandra.core.CassandraDataTemplate; +import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport; @@ -33,7 +33,7 @@ import org.springframework.util.Assert; public class CassandraRepositoryFactoryBean, S, ID extends Serializable> extends RepositoryFactoryBeanSupport { - private CassandraDataTemplate cassandraDataTemplate; + private CassandraTemplate cassandraDataTemplate; @Override protected RepositoryFactorySupport createRepositoryFactory() { @@ -41,11 +41,11 @@ public class CassandraRepositoryFactoryBean, S, ID e } /** - * Configures the {@link CassandraDataTemplate} to be used. + * Configures the {@link CassandraTemplate} to be used. * * @param operations the operations to set */ - public void setCassandraDataTemplate(CassandraDataTemplate cassandraDataTemplate) { + public void setCassandraDataTemplate(CassandraTemplate cassandraDataTemplate) { this.cassandraDataTemplate = cassandraDataTemplate; setMappingContext(cassandraDataTemplate.getConverter().getMappingContext()); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java index 8bc527e4e..fa28288ee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.core.CassandraDataOperations; -import org.springframework.data.cassandra.core.CassandraDataTemplate; +import org.springframework.cassandra.core.CqlOperations; +import org.springframework.data.cassandra.core.CassandraOperations; +import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.data.cassandra.repository.query.CassandraEntityInformation; import org.springframework.util.Assert; @@ -41,18 +41,18 @@ import com.datastax.driver.core.querybuilder.Select; public class SimpleCassandraRepository implements CassandraRepository { - private final CassandraDataTemplate cassandraDataTemplate; + private final CassandraTemplate cassandraDataTemplate; private final CassandraEntityInformation entityInformation; /** * Creates a new {@link SimpleCassandraRepository} for the given {@link CassandraEntityInformation} and - * {@link CassandraDataTemplate}. + * {@link CassandraTemplate}. * * @param metadata must not be {@literal null}. * @param template must not be {@literal null}. */ public SimpleCassandraRepository(CassandraEntityInformation metadata, - CassandraDataTemplate cassandraDataTemplate) { + CassandraTemplate cassandraDataTemplate) { Assert.notNull(cassandraDataTemplate); Assert.notNull(metadata); @@ -224,20 +224,20 @@ public class SimpleCassandraRepository implements Ca } /** - * Returns the underlying {@link CassandraOperations} instance. + * Returns the underlying {@link CqlOperations} instance. * * @return */ - protected CassandraOperations getCassandraOperations() { + protected CqlOperations getCassandraOperations() { return this.cassandraDataTemplate; } /** - * Returns the underlying {@link CassandraDataOperations} instance. + * Returns the underlying {@link CassandraOperations} instance. * * @return */ - protected CassandraDataOperations getCassandraDataOperations() { + protected CassandraOperations getCassandraDataOperations() { return this.cassandraDataTemplate; } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java index 6018d0770..8273aa2dc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java @@ -3,7 +3,7 @@ package org.springframework.data.cassandra.util; import java.util.ArrayList; import java.util.List; -import org.springframework.cassandra.core.CassandraTemplate; +import org.springframework.cassandra.core.CqlTemplate; import org.springframework.cassandra.core.QueryOptions; import org.springframework.data.cassandra.exception.EntityWriterException; import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; @@ -140,7 +140,7 @@ public abstract class CqlUtils { /* * Add Query Options */ - CassandraTemplate.addQueryOptions(q, options); + CqlTemplate.addQueryOptions(q, options); /* * Add TTL to Insert object @@ -178,7 +178,7 @@ public abstract class CqlUtils { /* * Add Query Options */ - CassandraTemplate.addQueryOptions(q, options); + CqlTemplate.addQueryOptions(q, options); /* * Add TTL to Insert object @@ -221,7 +221,7 @@ public abstract class CqlUtils { /* * Add Query Options */ - CassandraTemplate.addQueryOptions(b, options); + CqlTemplate.addQueryOptions(b, options); return b; @@ -257,7 +257,7 @@ public abstract class CqlUtils { /* * Add Query Options */ - CassandraTemplate.addQueryOptions(b, options); + CqlTemplate.addQueryOptions(b, options); return b; @@ -286,7 +286,7 @@ public abstract class CqlUtils { */ entityWriter.write(objectToRemove, w); - CassandraTemplate.addQueryOptions(q, options); + CqlTemplate.addQueryOptions(q, options); return q; @@ -355,7 +355,7 @@ public abstract class CqlUtils { } - CassandraTemplate.addQueryOptions(b, options); + CqlTemplate.addQueryOptions(b, options); return b; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java index e5abe0393..3894d4142 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration; import org.springframework.data.cassandra.convert.CassandraConverter; import org.springframework.data.cassandra.convert.MappingCassandraConverter; -import org.springframework.data.cassandra.core.CassandraDataOperations; -import org.springframework.data.cassandra.core.CassandraDataTemplate; +import org.springframework.data.cassandra.core.CassandraOperations; +import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.mapping.DefaultCassandraMappingContext; import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties; @@ -41,7 +41,7 @@ public class TestConfig extends AbstractSpringDataCassandraConfiguration { } @Bean - public CassandraDataOperations cassandraDataTemplate() throws Exception { - return new CassandraDataTemplate(session().getObject(), converter(), KEYSPACE_NAME); + public CassandraOperations cassandraDataTemplate() throws Exception { + return new CassandraTemplate(session().getObject(), converter(), KEYSPACE_NAME); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java index c43bb4a99..a6c28a178 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java @@ -33,7 +33,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.cassandra.core.CassandraDataOperations; +import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.test.integration.table.User; import com.google.common.collect.Lists; @@ -52,7 +52,7 @@ public class UserRepositoryIntegrationTests { protected UserRepository repository; @Autowired - protected CassandraDataOperations dataOperations; + protected CassandraOperations dataOperations; User tom, bob, alice, scott; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java index b8dd809a1..3392612d5 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cassandra.core.CassandraOperations; +import org.springframework.cassandra.core.CqlOperations; import org.springframework.context.ApplicationContext; import org.springframework.data.cassandra.test.integration.config.TestConfig; import org.springframework.test.context.ContextConfiguration; @@ -46,7 +46,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; public class CassandraAdminTest { @Autowired - private CassandraOperations cassandraTemplate; + private CqlOperations cassandraTemplate; @Mock ApplicationContext context; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java index 1ff710eb9..d9e5c8adc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java @@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.core.ConsistencyLevel; import org.springframework.cassandra.core.QueryOptions; import org.springframework.cassandra.core.RetryPolicy; -import org.springframework.data.cassandra.core.CassandraDataOperations; +import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.test.integration.config.TestConfig; import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties; import org.springframework.data.cassandra.test.integration.table.Book; @@ -51,7 +51,7 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; /** - * Unit Tests for CassandraTemplate + * Unit Tests for CqlTemplate * * @author David Webb * @@ -61,7 +61,7 @@ import com.datastax.driver.core.querybuilder.Select; public class CassandraDataOperationsTest { @Autowired - private CassandraDataOperations cassandraDataTemplate; + private CassandraOperations cassandraDataTemplate; private static Logger log = LoggerFactory.getLogger(CassandraDataOperationsTest.class); diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml index b9c70f96d..1b0675ade 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml @@ -40,11 +40,11 @@ - + - +