From 656d7c833e0306bc5d84cecb583907114e5ac01b Mon Sep 17 00:00:00 2001 From: David Webb Date: Fri, 13 Dec 2013 16:54:02 -0500 Subject: [PATCH] DATACASS-64 : DONE : Removed old QueryOptions Map. --- .../cassandra/core/QueryOptions.java | 34 ------------- .../template/CassandraDataOperationsTest.java | 50 ------------------- 2 files changed, 84 deletions(-) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java index ac0f16772..4d9df0f50 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java @@ -15,8 +15,6 @@ */ package org.springframework.cassandra.core; -import java.util.HashMap; -import java.util.Map; /** * Contains Query Options for Cassandra queries. This controls the Consistency Tuning and Retry Policy for a Query. @@ -30,26 +28,6 @@ public class QueryOptions { private RetryPolicy retryPolicy; private Integer ttl; - /** - * Create a Map of all these options. - */ - public Map toMap() { - - Map m = new HashMap(); - - if (getConsistencyLevel() != null) { - m.put(QueryOptionMapKeys.CONSISTENCY_LEVEL, getConsistencyLevel()); - } - if (getRetryPolicy() != null) { - m.put(QueryOptionMapKeys.RETRY_POLICY, getRetryPolicy()); - } - if (getTtl() != null) { - m.put(QueryOptionMapKeys.TTL, getTtl()); - } - - return m; - } - /** * @return Returns the consistencyLevel. */ @@ -91,16 +69,4 @@ public class QueryOptions { public void setTtl(Integer ttl) { this.ttl = ttl; } - - /** - * Constants for looking up Map Elements by Key - * - * @author David Webb - * - */ - public static interface QueryOptionMapKeys { - public final String CONSISTENCY_LEVEL = "ConsistencyLevel"; - public final String RETRY_POLICY = "RetryPolicy"; - public final String TTL = "TTL"; - } } 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 9a462246e..bc4bff66c 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 @@ -17,9 +17,7 @@ package org.springframework.data.cassandra.test.integration.template; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; import org.apache.cassandra.exceptions.ConfigurationException; @@ -206,11 +204,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20); @@ -238,11 +231,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20); @@ -292,11 +280,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - /* * Test Single Insert with entity */ @@ -349,11 +332,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - /* * Test Single Insert with entity */ @@ -404,11 +382,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20); @@ -452,11 +425,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20); @@ -514,10 +482,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - /* * Test Single Insert with entity */ @@ -558,10 +522,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - /* * Test Single Insert with entity */ @@ -600,11 +560,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20); @@ -640,11 +595,6 @@ public class CassandraDataOperationsTest { options.setConsistencyLevel(ConsistencyLevel.ONE); options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY); - Map optionsByName = new HashMap(); - optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL); - optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH); - optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30); - List books = null; books = getBookList(20);