Rename HBaseEntity to HEntity for consistency with other annotations

ghelmling · Feb 12, 2010 · 54131ce · 54131ce
1 parent 5df1302
commit 54131ce
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/java/meetup/beeno/HBaseEntity.java → src/java/meetup/beeno/HEntity.java b/src/java/meetup/beeno/HBaseEntity.java → src/java/meetup/beeno/HEntity.java
@@ -11,6 +11,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Inherited
-public @interface HBaseEntity {
+public @interface HEntity {
 	String name();
 }
diff --git a/src/java/meetup/beeno/mapping/EntityInfo.java b/src/java/meetup/beeno/mapping/EntityInfo.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import meetup.beeno.HBaseEntity;
+import meetup.beeno.HEntity;
 import meetup.beeno.HIndex;
 import meetup.beeno.HProperty;
 import meetup.beeno.HRowKey;
@@ -40,7 +40,7 @@ public EntityInfo(Class clazz) {
 	public Class getEntityClass() { return this.entityClass; }
 
 	/**
-	 * Returns the HBase table identified by the entity's {@link HBaseEntity} 
+	 * Returns the HBase table identified by the entity's {@link HEntity} 
 	 * annotation.
 	 * @return
 	 */

diff --git a/src/java/meetup/beeno/mapping/EntityMetadata.java b/src/java/meetup/beeno/mapping/EntityMetadata.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import meetup.beeno.HBaseEntity;
+import meetup.beeno.HEntity;
 import meetup.beeno.HProperty;
 import meetup.beeno.HRowKey;
 
@@ -19,7 +19,7 @@
 
 /**
  * Central cache for parsed mapping metadata on entity classes.  Given an entity class reference,
- * this will parse out {@link HBaseEntity}. {@link HRowKey}, {@link HProperty} annotations for the class
+ * this will parse out {@link HEntity}. {@link HRowKey}, {@link HProperty} annotations for the class
  * and cache the results for future queries.
  * 
  * @author garyh
@@ -80,7 +80,7 @@ public EntityInfo getInfo(Class entityClass) throws MappingException {
 	 */
 	protected EntityInfo parseEntity(Class clazz) throws MappingException {
 		// lookup any class mappings
-		HBaseEntity classTable = (HBaseEntity) clazz.getAnnotation(HBaseEntity.class);
+		HEntity classTable = (HEntity) clazz.getAnnotation(HEntity.class);
 		if (classTable ==  null) {
 			throw new MappingException(clazz, "Not an entity class!");
 		}

diff --git a/test/java/meetup/beeno/TestEntities.java b/test/java/meetup/beeno/TestEntities.java
@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import meetup.beeno.HBaseEntity;
+import meetup.beeno.HEntity;
 import meetup.beeno.HIndex;
 import meetup.beeno.HProperty;
 import meetup.beeno.HRowKey;
@@ -25,7 +25,7 @@ public class TestEntities {
 	 * @author garyh
 	 *
 	 */
-	@HBaseEntity(name="test_simple")
+	@HEntity(name="test_simple")
 	public static class SimpleEntity {
 		String id;
 		String stringProperty;
@@ -94,7 +94,7 @@ public void setLongProperty( long longProperty ) {
 	 * More complex entity class containing mapped collections
 	 * @author garyh
 	 */
-	@HBaseEntity(name="test_complex")
+	@HEntity(name="test_complex")
 	public static class ComplexEntity {
 		String id;
 		List<String> stringList = new ArrayList<String>();
@@ -134,7 +134,7 @@ public void setExtendedProps(Map<String,String> props) {
 		}
 	}
 
-	@HBaseEntity(name="test_nokey")
+	@HEntity(name="test_nokey")
 	public static class NoKeyEntity {
 		String prop1;
 
@@ -143,7 +143,7 @@ public static class NoKeyEntity {
 		public void setProp1(String prop) { this.prop1 = prop; }
 	}
 
-	@HBaseEntity(name="test_dupekey")
+	@HEntity(name="test_dupekey")
 	public static class DupeKeyEntity {
 		String id1;
 		String id2;
@@ -154,7 +154,7 @@ public static class DupeKeyEntity {
 		public String getId2() { return this.id2; }
 	}
 
-	@HBaseEntity(name="test_dupefield")
+	@HEntity(name="test_dupefield")
 	public static class DupeFieldEntity {
 		String id;
 		String prop1;
@@ -173,7 +173,7 @@ public static class DupeFieldEntity {
 	 * @author garyh
 	 *
 	 */
-	@HBaseEntity(name="test_indexed")
+	@HEntity(name="test_indexed")
 	public static class IndexedEntity {
 		String id;
 		String stringProperty;