From b3ccd446dabfaf6650b45e14768f7db009f5436b Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Wed, 26 Feb 2014 14:48:24 -0600
Subject: [PATCH] DATACASS-100 - completed

---
 .../cassandra/core/CqlTemplate.java           | 32 -------------------
 .../cassandra/core/QueryOptions.java          | 24 --------------
 .../cassandra/core/CassandraTemplate.java     | 15 ---------
 3 files changed, 71 deletions(-)

diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
index 993cfe557..e417cf6ab 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
@@ -101,7 +101,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations {
 			return q;
 		}
 
-		// common options
 		if (options.getConsistencyLevel() != null) {
 			q.setConsistencyLevel(ConsistencyLevelResolver.resolve(options.getConsistencyLevel()));
 		}
@@ -109,37 +108,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations {
 			q.setRetryPolicy(RetryPolicyResolver.resolve(options.getRetryPolicy()));
 		}
 
-		Using ttl = options.getTtl() == null ? null : QueryBuilder.ttl(options.getTtl());
-		Using timestamp = options.getTimestamp() == null ? null : QueryBuilder.timestamp(options.getTimestamp());
-
-		// options for specific query types
-
-		if (q instanceof Insert) {
-			Insert i = (Insert) q;
-			if (ttl != null) {
-				i.using(ttl);
-			}
-			if (timestamp != null) {
-				i.using(timestamp);
-			}
-		}
-
-		if (q instanceof Update) {
-			Update u = ((Update) q);
-			if (ttl != null) {
-				u.using(ttl);
-			}
-			if (timestamp != null) {
-				u.using(timestamp);
-			}
-		}
-
-		if (q instanceof Delete) {
-			Delete d = (Delete) q;
-			if (timestamp != null) {
-				d.using(timestamp);
-			}
-		}
 		return q;
 	}
 
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 91e44e1a4..a25481f75 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
@@ -25,8 +25,6 @@ public class QueryOptions {
 
 	private ConsistencyLevel consistencyLevel;
 	private RetryPolicy retryPolicy;
-	private Integer ttl;
-	private Long timestamp;
 
 	/**
 	 * @return Returns the consistencyLevel.
@@ -55,26 +53,4 @@ public class QueryOptions {
 	public void setRetryPolicy(RetryPolicy retryPolicy) {
 		this.retryPolicy = retryPolicy;
 	}
-
-	/**
-	 * @return Returns the ttl in seconds.
-	 */
-	public Integer getTtl() {
-		return ttl;
-	}
-
-	/**
-	 * @param ttl The ttl in seconds to set.
-	 */
-	public void setTtl(Integer timeToLive) {
-		this.ttl = timeToLive;
-	}
-
-	public Long getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Long timestamp) {
-		this.timestamp = timestamp;
-	}
 }
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 4d4d43280..1a8f6b390 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
@@ -613,13 +613,6 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation
 		 */
 		CqlTemplate.addQueryOptions(q, options);
 
-		/*
-		 * Add TTL to Insert object
-		 */
-		if (options != null && options.getTtl() != null) {
-			q.using(QueryBuilder.ttl(options.getTtl()));
-		}
-
 		return q;
 	}
 
@@ -648,15 +641,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation
 		 */
 		CqlTemplate.addQueryOptions(q, options);
 
-		/*
-		 * Add TTL to Insert object
-		 */
-		if (options != null && options.getTtl() != null) {
-			q.using(QueryBuilder.ttl(options.getTtl()));
-		}
-
 		return q;
-
 	}
 
 	/**