From bfa943b0f9d732af5112daf122da7c72638203d0 Mon Sep 17 00:00:00 2001 From: David T Webb Date: Fri, 21 Mar 2014 16:07:26 -0400 Subject: [PATCH] DATACASS-114 - Fixed bug that crept in after refactoring applyQueryOptions/applyWriteOptions. --- .../cassandra/core/CqlTemplate.java | 30 ++----------------- .../cassandra/core/CassandraTemplate.java | 4 +-- .../template/CassandraDataOperationsTest.java | 1 + 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java b/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java index 42fa2a740..267247a70 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java @@ -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; 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 17f604318..657de9a38 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 @@ -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; } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java index 6667b6d1b..48dc82ea5 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java @@ -103,6 +103,7 @@ public class CassandraDataOperationsTest extends AbstractSpringDataEmbeddedCassa b5.setPages(265); template.insert(b5, options); + } @Test