Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DATACASS-33'

Browse Source
This commit is contained in:
Matthew Adams
2014-02-07 10:18:31 -06:00
parent 1e6a68b378 c91611ff31
commit c2fa3dd811
18 changed files with 28 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
View File

@@ -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();
/**

2
spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
View File

@@ -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

8
spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java → spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
View File

@@ -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();

0
spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties → spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties
View File

2
spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:property-placeholder
location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
<cass:cluster port="${build.cassandra.native_transport_port}">
<cass:keyspace action="CREATE_DROP" durable-writes="true"

2
spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:property-placeholder
location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
<cass:cluster port="${build.cassandra.native_transport_port}">
<cass:keyspace action="CREATE_DROP" name="minimal" />

2
spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
View File

@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:property-placeholder
location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
<cassandra:cluster port="${build.cassandra.native_transport_port}" />

2
spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
View File

@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:property-placeholder
location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
<cassandra:cluster id="cassandra-cluster"
contact-points="localhost" port="${build.cassandra.native_transport_port}">

1
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.config.java;
import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Set;

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java
View File

@@ -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;

1
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java
View File

@@ -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;

4
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
View File

@@ -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<TableMetadata> TABLES;
static {
SpringDataBuildProperties props = new SpringDataBuildProperties();
SpringDataCassandraBuildProperties props = new SpringDataCassandraBuildProperties();
CASSANDRA_NATIVE_PORT = props.getCassandraPort();
}

21
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
View File

@@ -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());
}
}

4
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java
View File

@@ -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() {

14
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractDataTestJavaConfig.java
View File

@@ -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;
}
}

11
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java
View File

@@ -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");
}
}

11
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java Normal file
View File

@@ -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");
}
}

0
spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties → spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties
View File