diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java index ffeb3a01e..be6704e30 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java @@ -8,7 +8,7 @@ import org.cassandraunit.utils.EmbeddedCassandraServerHelper; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cassandra.test.integration.support.BuildProperties; +import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties; import org.springframework.cassandra.test.unit.support.Utils; import com.datastax.driver.core.Cluster; @@ -26,7 +26,7 @@ public class AbstractEmbeddedCassandraIntegrationTest { protected static String CASSANDRA_CONFIG = "spring-cassandra.yaml"; protected static String CASSANDRA_HOST = "localhost"; - protected static BuildProperties PROPS = new BuildProperties(); + protected static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties(); protected static int CASSANDRA_NATIVE_PORT = PROPS.getCassandraPort(); /** diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java index 3a3ca1f10..91ad3cc3a 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; @Configuration public abstract class AbstractTestJavaConfig extends AbstractSessionConfiguration { - public static BuildProperties PROPS = new BuildProperties(); + public static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties(); public static final int PORT = PROPS.getCassandraPort(); @Override diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java similarity index 83% rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java rename to spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java index e7bd1eb4f..fa2bf9bad 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java @@ -4,15 +4,15 @@ import java.io.InputStream; import java.util.Properties; @SuppressWarnings("serial") -public class BuildProperties extends Properties { +public class SpringCassandraBuildProperties extends Properties { protected String resourceName = null; - public BuildProperties() { - this("/" + BuildProperties.class.getName() + ".properties"); + public SpringCassandraBuildProperties() { + this("/" + SpringCassandraBuildProperties.class.getName() + ".properties"); } - protected BuildProperties(String resourceName) { + protected SpringCassandraBuildProperties(String resourceName) { this.resourceName = resourceName; loadProperties(); diff --git a/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties b/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties similarity index 100% rename from spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties rename to spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml index d97f967ce..ff1dd0201 100644 --- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml +++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" /> + location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" /> diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml index c3e6130fd..8be74d6a8 100644 --- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml +++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" /> 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 4a90de430..7f63c803a 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 @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" /> 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/AbstractSpringDataEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java index caf1cb27b..6c97490c4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest; import org.springframework.core.io.ClassPathResource; import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties; +import org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties; import org.springframework.data.cassandra.test.integration.template.CassandraDataOperationsTest.Config; import org.springframework.util.Assert; @@ -25,7 +25,7 @@ public class AbstractSpringDataEmbeddedCassandraIntegrationTest extends Abstract public static List TABLES; static { - SpringDataBuildProperties props = new SpringDataBuildProperties(); + SpringDataCassandraBuildProperties props = new SpringDataCassandraBuildProperties(); CASSANDRA_NATIVE_PORT = props.getCassandraPort(); } 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 f83cc04f4..1b66f649b 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 @@ -1,15 +1,9 @@ package org.springframework.data.cassandra.test.integration.config; import org.springframework.cassandra.test.unit.support.Utils; -import org.springframework.context.annotation.Bean; 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.CassandraAdminOperations; -import org.springframework.data.cassandra.core.CassandraAdminTemplate; -import org.springframework.data.cassandra.mapping.DefaultCassandraMappingContext; -import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties; +import org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties; /** * Setup any spring configuration for unit tests @@ -20,7 +14,7 @@ import org.springframework.data.cassandra.test.integration.support.SpringDataBui @Configuration public class TestConfig extends AbstractSpringDataCassandraConfiguration { - public static final SpringDataBuildProperties PROPS = new SpringDataBuildProperties(); + public static final SpringDataCassandraBuildProperties PROPS = new SpringDataCassandraBuildProperties(); public static final int PORT = PROPS.getCassandraPort(); public static final int RPC_PORT = PROPS.getCassandraRpcPort(); @@ -35,15 +29,4 @@ public class TestConfig extends AbstractSpringDataCassandraConfiguration { protected int getPort() { return PORT; } - - @Bean - public CassandraConverter cassandraConverter() { - return new MappingCassandraConverter(new DefaultCassandraMappingContext()); - } - - @Override - @Bean - public CassandraAdminOperations cassandraTemplate() throws Exception { - return new CassandraAdminTemplate(session().getObject(), converter()); - } } 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; - } -} diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java deleted file mode 100644 index 6e2527d27..000000000 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.springframework.data.cassandra.test.integration.support; - -import org.springframework.cassandra.test.integration.support.BuildProperties; - -@SuppressWarnings("serial") -public class SpringDataBuildProperties extends BuildProperties { - - public SpringDataBuildProperties() { - super("/" + SpringDataBuildProperties.class.getName() + ".properties"); - } -} diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java new file mode 100644 index 000000000..ff0379648 --- /dev/null +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java @@ -0,0 +1,11 @@ +package org.springframework.data.cassandra.test.integration.support; + +import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties; + +@SuppressWarnings("serial") +public class SpringDataCassandraBuildProperties extends SpringCassandraBuildProperties { + + public SpringDataCassandraBuildProperties() { + super("/" + SpringDataCassandraBuildProperties.class.getName() + ".properties"); + } +} diff --git a/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties b/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties similarity index 100% rename from spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties rename to spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties