From eccc92dd0dc35d403caab7f6d917a16121a927c6 Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Fri, 7 Feb 2014 09:11:24 -0600 Subject: [PATCH] DATACASS-33 - removed unused imports & class --- .../AbstractSpringDataCassandraConfiguration.java | 1 - .../cassandra/core/CassandraAdminTemplate.java | 6 ------ .../data/cassandra/core/CassandraTemplate.java | 1 - .../UserRepositoryJavaConfigIntegrationTests.java | 4 ++-- .../support/AbstractDataTestJavaConfig.java | 14 -------------- 5 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractDataTestJavaConfig.java 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 5a505d5c4..736aa0922 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 @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.config.java; -import java.lang.annotation.Annotation; import java.util.HashSet; import java.util.Set; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java index c7641f026..901607df7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java @@ -6,20 +6,14 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cassandra.core.SessionCallback; -import org.springframework.cassandra.core.cql.generator.AlterTableCqlGenerator; import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; -import org.springframework.cassandra.core.cql.generator.DropTableCqlGenerator; -import org.springframework.cassandra.core.keyspace.AlterTableSpecification; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; import org.springframework.cassandra.core.keyspace.DropTableSpecification; import org.springframework.dao.DataAccessException; -import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.cassandra.convert.CassandraConverter; import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.util.CqlUtils; import org.springframework.util.Assert; -import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.TableMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index 438291ed1..2cc461678 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.mortbay.log.Log; import org.springframework.cassandra.core.CqlTemplate; import org.springframework.cassandra.core.QueryOptions; import org.springframework.cassandra.core.SessionCallback; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java index 2de6a2a07..7c1236543 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.test.integration.AbstractSpringDataEmbeddedCassandraIntegrationTest; -import org.springframework.data.cassandra.test.integration.support.AbstractDataTestJavaConfig; +import org.springframework.data.cassandra.test.integration.config.TestConfig; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -46,7 +46,7 @@ public class UserRepositoryJavaConfigIntegrationTests extends AbstractSpringData @Configuration @EnableCassandraRepositories(basePackageClasses = UserRepository.class) - public static class Config extends AbstractDataTestJavaConfig { + public static class Config extends TestConfig { @Override protected String getKeyspaceName() { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractDataTestJavaConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractDataTestJavaConfig.java deleted file mode 100644 index f9c7fd362..000000000 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractDataTestJavaConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springframework.data.cassandra.test.integration.support; - -import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration; - -public abstract class AbstractDataTestJavaConfig extends AbstractSpringDataCassandraConfiguration { - - public static final SpringDataBuildProperties PROPS = new SpringDataBuildProperties(); - public static final int PORT = PROPS.getCassandraPort(); - - @Override - protected int getPort() { - return PORT; - } -}