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

DATACASS-114 - Fixed bug that crept in after refactoring

Browse Source 
applyQueryOptions/applyWriteOptions.
This commit is contained in:
David T Webb
2014-03-21 16:07:26 -04:00
parent 34d558eb23
commit bfa943b0f9
3 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
View File

@@ -123,7 +123,7 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations {
* @param options
* @return the {@link Query} given.
*/
public static Query addWriteOptions(Insert q, WriteOptions options) {
public static Insert addWriteOptions(Insert q, WriteOptions options) {
if (options == null) {
return q;
@@ -149,33 +149,7 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations {
* @param options
* @return the {@link Query} given.
*/
public static Query addWriteOptions(Update q, WriteOptions options) {
if (options == null) {
return q;
}
if (options.getConsistencyLevel() != null) {
q.setConsistencyLevel(ConsistencyLevelResolver.resolve(options.getConsistencyLevel()));
}
if (options.getRetryPolicy() != null) {
q.setRetryPolicy(RetryPolicyResolver.resolve(options.getRetryPolicy()));
}
if (options.getTtl() != null) {
q.using(QueryBuilder.ttl(options.getTtl()));
}
return q;
}
/**
* Add common {@link Query} options for Batch queries.
*
* @param q
* @param options
* @return the {@link Query} given.
*/
public static Query addWriteOptions(Batch q, WriteOptions options) {
public static Update addWriteOptions(Update q, WriteOptions options) {
if (options == null) {
return q;

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

@@ -597,7 +597,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation
/*
* Add Query Options
*/
CqlTemplate.addQueryOptions(q, options);
CqlTemplate.addWriteOptions(q, options);
return q;
}
@@ -624,7 +624,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation
/*
* Add Query Options
*/
CqlTemplate.addQueryOptions(q, options);
CqlTemplate.addWriteOptions(q, options);
return q;
}

1
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java
View File

@@ -103,6 +103,7 @@ public class CassandraDataOperationsTest extends AbstractSpringDataEmbeddedCassa
b5.setPages(265);
template.insert(b5, options);
}
@Test