From e5baf2af8fdd0ad5c9c6f8aae061c35fa1d7a30c Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Mon, 23 Dec 2013 10:38:32 -0600
Subject: [PATCH] DATACASS-68 : Move IndexOperations static methods to
 Specification objects

---
 .../keyspace/CreateIndexSpecification.java    |  8 ++++
 .../core/keyspace/DropIndexSpecification.java |  8 ++++
 .../core/keyspace/IndexOperations.java        | 43 -------------------
 .../CreateIndexCqlGeneratorTests.java         |  3 +-
 .../generator/DropIndexCqlGeneratorTests.java |  5 +--
 5 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexOperations.java

diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
index 5b8d8f656..6b0a19785 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
@@ -108,4 +108,12 @@ public class CreateIndexSpecification extends IndexNameSpecification<CreateIndex
 		return this;
 	}
 
+	/**
+	 * Entry point into the {@link CreateIndexSpecification}'s fluent API to create a index. Convenient if imported
+	 * statically.
+	 */
+	public static CreateIndexSpecification createIndex() {
+		return new CreateIndexSpecification();
+	}
+
 }
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
index d895781d9..1502a7cc6 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
@@ -25,6 +25,14 @@ public class DropIndexSpecification extends IndexNameSpecification<DropIndexSpec
 
 	private boolean ifExists;
 
+	/**
+	 * Entry point into the {@link DropIndexSpecification}'s fluent API to drop a table. Convenient if imported
+	 * statically.
+	 */
+	public static DropIndexSpecification dropIndex() {
+		return new DropIndexSpecification();
+	}
+
 	/*
 	 * In CQL 3.1 this is supported so we can uncomment the exposure then.
 	 * In the meantime, it will always be false and tests will pass.
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexOperations.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexOperations.java
deleted file mode 100644
index 5360a2fe0..000000000
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexOperations.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011-2013 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cassandra.core.keyspace;
-
-/**
- * Class that offers static methods as entry points into the fluent API for building create, drop and alter index
- * specifications. These methods are most convenient when imported statically.
- * 
- * @author Matthew T. Adams
- * @author David Webb
- */
-public class IndexOperations {
-
-	/**
-	 * Entry point into the {@link CreateIndexSpecification}'s fluent API to create a index. Convenient if imported
-	 * statically.
-	 */
-	public static CreateIndexSpecification createIndex() {
-		return new CreateIndexSpecification();
-	}
-
-	/**
-	 * Entry point into the {@link DropIndexSpecification}'s fluent API to drop a table. Convenient if imported
-	 * statically.
-	 */
-	public static DropIndexSpecification dropIndex() {
-		return new DropIndexSpecification();
-	}
-
-}
\ No newline at end of file
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
index 177028806..aaaf9ec12 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
@@ -1,7 +1,6 @@
 package org.springframework.cassandra.test.unit.core.cql.generator;
 
 import static org.junit.Assert.assertTrue;
-import static org.springframework.cassandra.core.keyspace.IndexOperations.createIndex;
 
 import org.junit.Test;
 import org.springframework.cassandra.core.cql.generator.CreateIndexCqlGenerator;
@@ -44,7 +43,7 @@ public class CreateIndexCqlGeneratorTests {
 		public String column1 = "column1";
 
 		public CreateIndexSpecification specification() {
-			return createIndex().name(name).tableName(tableName).columnName(column1);
+			return CreateIndexSpecification.createIndex().name(name).tableName(tableName).columnName(column1);
 		}
 
 		@Test
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
index 0c091b037..6db90bc65 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
@@ -1,7 +1,6 @@
 package org.springframework.cassandra.test.unit.core.cql.generator;
 
 import static org.junit.Assert.assertTrue;
-import static org.springframework.cassandra.core.keyspace.IndexOperations.dropIndex;
 
 import org.junit.Test;
 import org.springframework.cassandra.core.cql.generator.DropIndexCqlGenerator;
@@ -28,7 +27,7 @@ public class DropIndexCqlGeneratorTests {
 		public String name = "myindex";
 
 		public DropIndexSpecification specification() {
-			return dropIndex().name(name);
+			return DropIndexSpecification.dropIndex().name(name);
 		}
 
 		public DropIndexCqlGenerator generator() {
@@ -49,7 +48,7 @@ public class DropIndexCqlGeneratorTests {
 		public String name = "myindex";
 
 		public DropIndexSpecification specification() {
-			return dropIndex().name(name)
+			return DropIndexSpecification.dropIndex().name(name)
 			// .ifExists()
 			;
 		}