create table generator code review

spring-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.util.Collection;

spring-cassandra/src/main/java/org/springframework/cassandra/core/KeyType.java

@@ -1,19 +0,0 @@
-package org.springframework.cassandra.core;
-
-/**
- * Values representing primary key column types.
- * 
- * @author Matthew T. Adams
- */
-public enum KeyType {
-
-	/**
-	 * Used for a column that is a primary key and that also is or is part of the partition key.
-	 */
-	PARTITION,
-
-	/**
-	 * Used for a primary key column that is not part of the partition key.
-	 */
-	PRIMARY
-}

spring-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java

@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+/**
+ * Values representing primary key column types.
+ * 
+ * @author Matthew T. Adams
+ * @author Alex Shvid
+ */
+public enum PrimaryKeyType {
+
+	/**
+	 * Used for a column that is part of the partition key.
+	 */
+	PARTITION,
+
+	/**
+	 * Used for a column that is clustered key.
+	 */
+	CLUSTERED
+}

spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import org.springframework.dao.DataAccessException;

spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetFutureExtractor.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import org.springframework.dao.DataAccessException;

spring-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import com.datastax.driver.core.Row;

spring-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import com.datastax.driver.core.Row;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql;
 
 import java.util.regex.Pattern;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java

@@ -1,8 +1,23 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;
-import static org.springframework.cassandra.core.KeyType.PARTITION;
-import static org.springframework.cassandra.core.KeyType.PRIMARY;
+import static org.springframework.cassandra.core.PrimaryKeyType.PARTITION;
+import static org.springframework.cassandra.core.PrimaryKeyType.CLUSTERED;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +31,7 @@ import org.springframework.cassandra.core.keyspace.Option;
  * CQL generator for generating a <code>CREATE TABLE</code> statement.
  * 
  * @author Matthew T. Adams
+ * @author Alex Shvid
  */
 public class CreateTableCqlGenerator extends TableCqlGenerator<CreateTableSpecification> {
 
@@ -49,92 +65,54 @@ public class CreateTableCqlGenerator extends TableCqlGenerator<CreateTableSpecif
 		cql.append(" (");
 
 		List<ColumnSpecification> partitionKeys = new ArrayList<ColumnSpecification>();
-		List<ColumnSpecification> primaryKeys = new ArrayList<ColumnSpecification>();
+		List<ColumnSpecification> clusteredKeys = new ArrayList<ColumnSpecification>();
 		for (ColumnSpecification col : spec().getColumns()) {
 			col.toCql(cql).append(", ");
 
 			if (col.getKeyType() == PARTITION) {
 				partitionKeys.add(col);
-			} else if (col.getKeyType() == PRIMARY) {
-				primaryKeys.add(col);
+			} else if (col.getKeyType() == CLUSTERED) {
+				clusteredKeys.add(col);
 			}
 		}
 
 		// begin primary key clause
-		cql.append("PRIMARY KEY ");
-		StringBuilder partitions = new StringBuilder();
-		StringBuilder primaries = new StringBuilder();
+		cql.append("PRIMARY KEY (");
 
 		if (partitionKeys.size() > 1) {
-			partitions.append("(");
+			// begin partition key clause
+			cql.append("(");
 		}
 
-		boolean first = true;
-		for (ColumnSpecification col : partitionKeys) {
-			if (first) {
-				first = false;
-			} else {
-				partitions.append(", ");
-			}
-			partitions.append(col.getName());
+		appendColumnNames(cql, partitionKeys);
 
-		}
 		if (partitionKeys.size() > 1) {
-			partitions.append(")");
+			cql.append(")");
+			// end partition key clause
 		}
 
-		StringBuilder clustering = null;
-		boolean clusteringFirst = true;
-		first = true;
-		for (ColumnSpecification col : primaryKeys) {
-			if (first) {
-				first = false;
-			} else {
-				primaries.append(", ");
-			}
-			primaries.append(col.getName());
+		appendColumnNames(cql, clusteredKeys);
 
-			if (col.getOrdering() != null) { // then ordering specified
-				if (clustering == null) { // then initialize clustering clause
-					clustering = new StringBuilder().append("CLUSTERING ORDER BY (");
-				}
-				if (clusteringFirst) {
-					clusteringFirst = false;
-				} else {
-					clustering.append(", ");
-				}
-				clustering.append(col.getName()).append(" ").append(col.getOrdering().cql());
-			}
-		}
-		if (clustering != null) { // then end clustering option
-			clustering.append(")");
-		}
-
-		boolean parenthesize = true;// partitionKeys.size() + primaryKeys.size() > 1;
-
-		cql.append(parenthesize ? "(" : "");
-		cql.append(partitions);
-		cql.append(primaryKeys.size() > 0 ? ", " : "");
-		cql.append(primaries);
-		cql.append(parenthesize ? ")" : "");
+		cql.append(")");
 		// end primary key clause
 
 		cql.append(")");
 		// end columns
 
+		StringBuilder ordering = createOrderingClause(clusteredKeys);
 		// begin options
 		// begin option clause
 		Map<String, Object> options = spec().getOptions();
 
-		if (clustering != null || !options.isEmpty()) {
+		if (ordering != null || !options.isEmpty()) {
 
 			// option preamble
-			first = true;
+			boolean first = true;
 			cql.append(" WITH ");
 			// end option preamble
 
-			if (clustering != null) {
-				cql.append(clustering);
+			if (ordering != null) {
+				cql.append(ordering);
 				first = false;
 			}
 			if (!options.isEmpty()) {
@@ -170,4 +148,43 @@ public class CreateTableCqlGenerator extends TableCqlGenerator<CreateTableSpecif
 
 		return cql;
 	}
+
+	private static StringBuilder createOrderingClause(List<ColumnSpecification> columns) {
+		StringBuilder ordering = null;
+		boolean first = true;
+		for (ColumnSpecification col : columns) {
+
+			if (col.getOrdering() != null) { // then ordering specified
+				if (ordering == null) { // then initialize ordering clause
+					ordering = new StringBuilder().append("CLUSTERING ORDER BY (");
+				}
+				if (first) {
+					first = false;
+				} else {
+					ordering.append(", ");
+				}
+				ordering.append(col.getName()).append(" ").append(col.getOrdering().cql());
+			}
+		}
+		if (ordering != null) { // then end ordering option
+			ordering.append(")");
+		}
+		return ordering;
+	}
+
+	private static void appendColumnNames(StringBuilder str, List<ColumnSpecification> columns) {
+
+		boolean first = true;
+		for (ColumnSpecification col : columns) {
+			if (first) {
+				first = false;
+			} else {
+				str.append(", ");
+			}
+			str.append(col.getName());
+
+		}
+
+	}
+
 }

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import org.springframework.cassandra.core.keyspace.TableNameSpecification;

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.cql.generator;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import com.datastax.driver.core.DataType;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import com.datastax.driver.core.DataType;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.util.ArrayList;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java

@@ -1,13 +1,28 @@
+/*
+ * 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;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier;
 import static org.springframework.cassandra.core.cql.CqlStringUtils.identifize;
 import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;
-import static org.springframework.cassandra.core.KeyType.PARTITION;
-import static org.springframework.cassandra.core.KeyType.PRIMARY;
+import static org.springframework.cassandra.core.PrimaryKeyType.PARTITION;
+import static org.springframework.cassandra.core.PrimaryKeyType.CLUSTERED;
 import static org.springframework.cassandra.core.Ordering.ASCENDING;
 
-import org.springframework.cassandra.core.KeyType;
+import org.springframework.cassandra.core.PrimaryKeyType;
 import org.springframework.cassandra.core.Ordering;
 
 import com.datastax.driver.core.DataType;
@@ -31,7 +46,7 @@ public class ColumnSpecification {
 
 	private String name;
 	private DataType type; // TODO: determining if we should be coupling this to Datastax Java Driver type?
-	private KeyType keyType;
+	private PrimaryKeyType keyType;
 	private Ordering ordering;
 
 	/**
@@ -57,7 +72,7 @@ public class ColumnSpecification {
 
 	/**
 	 * Identifies this column as a primary key column that is also part of a partition key. Sets the column's
-	 * {@link #keyType} to {@link KeyType#PARTITION} and its {@link #ordering} to <code>null</code>.
+	 * {@link #keyType} to {@link PrimaryKeyType#PARTITION} and its {@link #ordering} to <code>null</code>.
 	 * 
 	 * @return this
 	 */
@@ -68,7 +83,7 @@ public class ColumnSpecification {
 	/**
 	 * Toggles the identification of this column as a primary key column that also is or is part of a partition key. Sets
 	 * {@link #ordering} to <code>null</code> and, if the given boolean is <code>true</code>, then sets the column's
-	 * {@link #keyType} to {@link KeyType#PARTITION}, else sets it to <code>null</code>.
+	 * {@link #keyType} to {@link PrimaryKeyType#PARTITION}, else sets it to <code>null</code>.
 	 * 
 	 * @return this
 	 */
@@ -80,7 +95,7 @@ public class ColumnSpecification {
 
 	/**
 	 * Identifies this column as a primary key column with default ordering. Sets the column's {@link #keyType} to
-	 * {@link KeyType#PRIMARY} and its {@link #ordering} to {@link #DEFAULT_ORDERING}.
+	 * {@link PrimaryKeyType#CLUSTERED} and its {@link #ordering} to {@link #DEFAULT_ORDERING}.
 	 * 
 	 * @return this
 	 */
@@ -90,7 +105,7 @@ public class ColumnSpecification {
 
 	/**
 	 * Identifies this column as a primary key column with the given ordering. Sets the column's {@link #keyType} to
-	 * {@link KeyType#PRIMARY} and its {@link #ordering} to the given {@link Ordering}.
+	 * {@link PrimaryKeyType#CLUSTERED} and its {@link #ordering} to the given {@link Ordering}.
 	 * 
 	 * @return this
 	 */
@@ -100,13 +115,13 @@ public class ColumnSpecification {
 
 	/**
 	 * Toggles the identification of this column as a primary key column. If the given boolean is <code>true</code>, then
-	 * sets the column's {@link #keyType} to {@link KeyType#PARTITION} and {@link #ordering} to the given {@link Ordering}
-	 * , else sets both {@link #keyType} and {@link #ordering} to <code>null</code>.
+	 * sets the column's {@link #keyType} to {@link PrimaryKeyType#PARTITION} and {@link #ordering} to the given
+	 * {@link Ordering} , else sets both {@link #keyType} and {@link #ordering} to <code>null</code>.
 	 * 
 	 * @return this
 	 */
 	public ColumnSpecification primary(Ordering order, boolean primary) {
-		this.keyType = primary ? PRIMARY : null;
+		this.keyType = primary ? CLUSTERED : null;
 		this.ordering = primary ? order : null;
 		return this;
 	}
@@ -116,7 +131,7 @@ public class ColumnSpecification {
 	 * 
 	 * @return this
 	 */
-	/* package */ColumnSpecification keyType(KeyType keyType) {
+	/* package */ColumnSpecification keyType(PrimaryKeyType keyType) {
 		this.keyType = keyType;
 		return this;
 	}
@@ -143,7 +158,7 @@ public class ColumnSpecification {
 		return type;
 	}
 
-	public KeyType getKeyType() {
+	public PrimaryKeyType getKeyType() {
 		return keyType;
 	}
 

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import org.springframework.util.Assert;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 public class DropColumnSpecification extends ColumnChangeSpecification {

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.util.List;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOperations.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 /**

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.util.Map;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java

@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle;

spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java

@@ -1,14 +1,29 @@
+/*
+ * 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;
 
-import static org.springframework.cassandra.core.KeyType.PARTITION;
-import static org.springframework.cassandra.core.KeyType.PRIMARY;
+import static org.springframework.cassandra.core.PrimaryKeyType.PARTITION;
+import static org.springframework.cassandra.core.PrimaryKeyType.CLUSTERED;
 import static org.springframework.cassandra.core.Ordering.ASCENDING;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.cassandra.core.KeyType;
+import org.springframework.cassandra.core.PrimaryKeyType;
 import org.springframework.cassandra.core.Ordering;
 
 import com.datastax.driver.core.DataType;
@@ -83,7 +98,7 @@ public class TableSpecification<T> extends TableOptionsSpecification<TableSpecif
 	 * @return this
 	 */
 	public T primaryKeyColumn(String name, DataType type, Ordering ordering) {
-		return column(name, type, PRIMARY, ordering);
+		return column(name, type, CLUSTERED, ordering);
 	}
 
 	/**
@@ -93,23 +108,23 @@ public class TableSpecification<T> extends TableOptionsSpecification<TableSpecif
 	 * @param name The column name; must be a valid unquoted or quoted identifier without the surrounding double quotes.
 	 * @param type The data type of the column.
 	 * @param keyType Indicates key type. Null means that the column is not a key column.
-	 * @param ordering If the given {@link KeyType} is {@link KeyType#PRIMARY}, then the given ordering is used, else
-	 *          ignored.
+	 * @param ordering If the given {@link PrimaryKeyType} is {@link PrimaryKeyType#CLUSTERED}, then the given ordering is
+	 *          used, else ignored.
 	 * @return this
 	 */
 	@SuppressWarnings("unchecked")
-	protected T column(String name, DataType type, KeyType keyType, Ordering ordering) {
+	protected T column(String name, DataType type, PrimaryKeyType keyType, Ordering ordering) {
 
 		ColumnSpecification column = new ColumnSpecification().name(name).type(type).keyType(keyType)
-				.ordering(keyType == PRIMARY ? ordering : null);
+				.ordering(keyType == CLUSTERED ? ordering : null);
 
 		columns.add(column);
 
-		if (keyType == KeyType.PARTITION) {
+		if (keyType == PrimaryKeyType.PARTITION) {
 			partitionKeyColumns.add(column);
 		}
 
-		if (keyType == KeyType.PRIMARY) {
+		if (keyType == PrimaryKeyType.CLUSTERED) {
 			primaryKeyColumns.add(column);
 		}
 

spring-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java

@@ -1,3 +1,18 @@
+/*
+ * 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.util;
 
 import java.util.Collection;