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

DATACASS-55: removed CassandraTemplate @Bean from AbstractCassandraTemplate

Browse Source
This commit is contained in:
Matthew Adams
2014-01-07 13:01:43 -06:00
parent ae24cf2f67
commit fb3b99ddba
3 changed files with 7 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java
View File

@@ -67,11 +67,6 @@ public abstract class AbstractCassandraConfiguration {
return bean;
}
@Bean
public CassandraOperations template() throws Exception {
return new CassandraTemplate(session().getObject());
}
protected List<String> getStartupScripts() {
return Collections.emptyList();
}

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

@@ -60,10 +60,12 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
/**
* Creates a {@link CassandraAdminTemplate}.
*
* @throws Exception
*/
@Bean
public CassandraAdminOperations adminTemplate() {
return new CassandraAdminTemplate(session());
public CassandraAdminOperations adminTemplate() throws Exception {
return new CassandraAdminTemplate(session().getObject());
}
/**

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

@@ -1,8 +1,5 @@
package org.springframework.data.cassandra.test.integration.config;
import org.springframework.cassandra.config.CassandraSessionFactoryBean;
import org.springframework.cassandra.core.CassandraOperations;
import org.springframework.cassandra.core.CassandraTemplate;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration;
@@ -12,9 +9,6 @@ import org.springframework.data.cassandra.core.CassandraDataOperations;
import org.springframework.data.cassandra.core.CassandraDataTemplate;
import org.springframework.data.cassandra.mapping.CassandraMappingContext;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Cluster.Builder;
/**
* Setup any spring configuration for unit tests
*
@@ -31,47 +25,13 @@ public class TestConfig extends AbstractSpringDataCassandraConfiguration {
return keyspaceName;
}
@Override
@Bean
public Cluster cluster() {
Builder builder = Cluster.builder();
builder.addContactPoint("127.0.0.1").withPort(9042);
return builder.build();
}
@Bean
public CassandraSessionFactoryBean sessionFactoryBean() {
CassandraSessionFactoryBean bean = new CassandraSessionFactoryBean();
bean.setCluster(cluster());
bean.setKeyspaceName(getKeyspaceName());
return bean;
}
@Bean
public CassandraOperations cassandraTemplate() {
CassandraOperations template = new CassandraTemplate(sessionFactoryBean().getObject());
return template;
}
@Bean
public CassandraConverter cassandraConverter() {
CassandraConverter converter = new MappingCassandraConverter(new CassandraMappingContext());
return converter;
return new MappingCassandraConverter(new CassandraMappingContext());
}
@Bean
public CassandraDataOperations cassandraDataTemplate() throws ClassNotFoundException {
CassandraDataOperations template = new CassandraDataTemplate(sessionFactoryBean().getObject(), converter(),
keyspaceName);
return template;
public CassandraDataOperations cassandraDataTemplate() throws Exception {
return new CassandraDataTemplate(session().getObject(), converter(), keyspaceName);
}
}