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

DATACASS-64 : DONE : Removed old QueryOptions Map.

Browse Source
This commit is contained in:
David Webb
2013-12-13 16:54:02 -05:00
parent 8d97077c3c
commit 656d7c833e
2 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java
View File

@@ -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<String, Object> toMap() {
Map<String, Object> m = new HashMap<String, Object>();
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";
}
}

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

@@ -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<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
@@ -238,11 +231,6 @@ public class CassandraDataOperationsTest {
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
@@ -292,11 +280,6 @@ public class CassandraDataOperationsTest {
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
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<String, Object> optionsByName = new HashMap<String, Object>();
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<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
@@ -452,11 +425,6 @@ public class CassandraDataOperationsTest {
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
@@ -514,10 +482,6 @@ public class CassandraDataOperationsTest {
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
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<String, Object> optionsByName = new HashMap<String, Object>();
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<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
@@ -640,11 +595,6 @@ public class CassandraDataOperationsTest {
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);