From b0b1a6e926344c52bfd8be1b8714cff5608aa67e Mon Sep 17 00:00:00 2001
From: Alex Shvid <a@shvid.com>
Date: Mon, 2 Dec 2013 16:15:43 -0800
Subject: [PATCH] rename @RowId to @PrimaryKey same as in CQL3

---
 .../cassandra/mapping/BasicCassandraPersistentProperty.java   | 2 +-
 .../data/cassandra/mapping/{RowId.java => PrimaryKey.java}    | 2 +-
 .../data/cassandra/test/integration/table/Book.java           | 4 ++--
 .../data/cassandra/test/integration/table/LogEntry.java       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/{RowId.java => PrimaryKey.java} (97%)

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java
index c77b95204..51ecfcf5d 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java
@@ -61,7 +61,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP
 			return true;
 		}
 
-		return getField().isAnnotationPresent(RowId.class);
+		return getField().isAnnotationPresent(PrimaryKey.class);
 	}
 
 	/**
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/RowId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java
similarity index 97%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/RowId.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java
index 10ef7608a..19a6f0440 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/RowId.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java
@@ -30,5 +30,5 @@ import org.springframework.data.annotation.Id;
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = { ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Id
-public @interface RowId {
+public @interface PrimaryKey {
 }
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java
index b5e07e29f..e647f9da1 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/Book.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.cassandra.test.integration.table;
 
-import org.springframework.data.cassandra.mapping.RowId;
+import org.springframework.data.cassandra.mapping.PrimaryKey;
 import org.springframework.data.cassandra.mapping.Table;
 
 /**
@@ -27,7 +27,7 @@ import org.springframework.data.cassandra.mapping.Table;
 @Table(name = "book")
 public class Book {
 
-	@RowId
+	@PrimaryKey
 	private String isbn;
 
 	private String title;
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java
index 5797dec9f..a32e71095 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/table/LogEntry.java
@@ -19,7 +19,7 @@ import java.util.Date;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.cassandra.mapping.Column;
-import org.springframework.data.cassandra.mapping.RowId;
+import org.springframework.data.cassandra.mapping.PrimaryKey;
 import org.springframework.data.cassandra.mapping.Table;
 
 /**
@@ -37,7 +37,7 @@ public class LogEntry {
 	/*
 	 * Primary Row ID
 	 */
-	@RowId
+	@PrimaryKey
 	private Date logDate;
 
 	private String hostname;