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

DATACASS-245 - Adapted to API changes in Spring Data Commons.

Browse Source 
Related ticket: DATACMNS-89.
This commit is contained in:
Oliver Gierke
2015-12-14 20:35:56 +01:00
parent 52fd0a6a62
commit 91a4f0b232
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java
View File

@@ -17,6 +17,7 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.cassandra.mapping.CassandraMappingContext;
import org.springframework.data.cassandra.repository.Query;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.query.QueryMethod;
import org.springframework.data.util.ClassTypeInformation;
@@ -61,9 +62,9 @@ public class CassandraQueryMethod extends QueryMethod {
protected Set<Integer> stringLikeParameterIndexes = new HashSet<Integer>();
protected Set<Integer> dateParameterIndexes = new HashSet<Integer>();
public CassandraQueryMethod(Method method, RepositoryMetadata metadata, CassandraMappingContext mappingContext) {
public CassandraQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory, CassandraMappingContext mappingContext) {
super(method, metadata);
super(method, metadata, factory);
verify(method, metadata);

10
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java
View File

@@ -27,6 +27,7 @@ import org.springframework.data.cassandra.repository.query.CassandraEntityInform
import org.springframework.data.cassandra.repository.query.CassandraQueryMethod;
import org.springframework.data.cassandra.repository.query.StringBasedCassandraQuery;
import org.springframework.data.mapping.model.MappingException;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.repository.core.NamedQueries;
import org.springframework.data.repository.core.RepositoryInformation;
import org.springframework.data.repository.core.RepositoryMetadata;
@@ -99,10 +100,15 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
private class CassandraQueryLookupStrategy implements QueryLookupStrategy {
/*
* (non-Javadoc)
* @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
*/
@Override
public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) {
public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
NamedQueries namedQueries) {
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, mappingContext);
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, factory, mappingContext);
String namedQueryName = queryMethod.getNamedQueryName();
if (namedQueries.hasQuery(namedQueryName)) {

19
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/querymethods/declared/StringBasedCassandraQueryIntegrationTests.java
View File

@@ -30,7 +30,11 @@ import org.springframework.data.cassandra.repository.Query;
import org.springframework.data.cassandra.repository.query.CassandraParametersParameterAccessor;
import org.springframework.data.cassandra.repository.query.CassandraQueryMethod;
import org.springframework.data.cassandra.repository.query.StringBasedCassandraQuery;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.querybuilder.QueryBuilder;
@@ -39,8 +43,7 @@ import com.datastax.driver.core.querybuilder.Select;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;
/**
* Unit tests for {@link StringBasedCassandraQuery}.
@@ -50,24 +53,26 @@ public class StringBasedCassandraQueryIntegrationTests {
@Mock
CassandraOperations operations;
@Mock
RepositoryMetadata metadata;
CassandraConverter converter;
ProjectionFactory factory;
@Before
public void setUp() {
when(operations.getConverter()).thenReturn(converter);
this.metadata = AbstractRepositoryMetadata.getMetadata(SampleRepository.class);
this.converter = new MappingCassandraConverter(new BasicCassandraMappingContext());
this.factory = new SpelAwareProxyProjectionFactory();
}
@Test
public void bindsSimplePropertyCorrectly() throws Exception {
Method method = SampleRepository.class.getMethod("findByLastname", String.class);
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, converter.getMappingContext());
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, factory, converter.getMappingContext());
StringBasedCassandraQuery cassandraQuery = new StringBasedCassandraQuery(queryMethod, operations);
CassandraParametersParameterAccessor accesor = new CassandraParametersParameterAccessor(queryMethod, "Matthews");
@@ -86,7 +91,7 @@ public class StringBasedCassandraQueryIntegrationTests {
public void bindsMultipleParametersCorrectly() throws Exception {
Method method = SampleRepository.class.getMethod("findByLastnameAndFirstname", String.class, String.class);
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, converter.getMappingContext());
CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, metadata, factory, converter.getMappingContext());
StringBasedCassandraQuery cassandraQuery = new StringBasedCassandraQuery(queryMethod, operations);
CassandraParametersParameterAccessor accesor = new CassandraParametersParameterAccessor(queryMethod, "Matthews",
"John");
@@ -102,7 +107,7 @@ public class StringBasedCassandraQueryIntegrationTests {
assertThat(actual.getQueryString(), is(expected.getQueryString()));
}
private interface SampleRepository {
private interface SampleRepository extends Repository<Person, String> {
@Query("SELECT * FROM person WHERE lastname=?0;")
Person findByLastname(String lastname);