Renamed AbstractEntity class to Entity.

rapidoid · Feb 4, 2015 · 8fb8bac · 8fb8bac
1 parent 1f8af79
commit 8fb8bac
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/DbClassSecurityTest.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/DbClassSecurityTest.java
@@ -32,15 +32,15 @@
 @CanInsert({ "ADMIN", "MANAGER" })
 @CanRead({ "AUTHOR" })
 @SuppressWarnings("serial")
-class Foo extends AbstractEntity {
+class Foo extends Entity {
 	public String name = "no name";
 }
 
 @CanInsert("LOGGED_IN")
 @CanRead("ANYBODY")
 @CanChange("MANAGER")
 @SuppressWarnings("serial")
-class Bar extends AbstractEntity {
+class Bar extends Entity {
 
 	@CanRead(MODERATOR)
 	@CanChange({})

diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java
@@ -2,7 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 
 /*
  * #%L
@@ -27,7 +27,7 @@
 @SuppressWarnings("serial")
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Company extends AbstractEntity {
+public class Company extends Entity {
 
 	public String name;
 

diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Post.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Post.java
@@ -2,7 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 import org.rapidoid.db.DB;
 import org.rapidoid.db.DbRef;
 import org.rapidoid.db.DbSet;
@@ -29,7 +29,7 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Post extends AbstractEntity {
+public class Post extends Entity {
 
 	private static final long serialVersionUID = 3776106825040831514L;
 

diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Profile.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Profile.java
@@ -22,13 +22,13 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 import org.rapidoid.db.DB;
 import org.rapidoid.db.DbList;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Profile extends AbstractEntity {
+public class Profile extends Entity {
 
 	private static final long serialVersionUID = 7386682836039719457L;
 

diff --git a/.../java/org/rapidoid/db/AbstractEntity.java → ...src/main/java/org/rapidoid/db/Entity.java b/.../java/org/rapidoid/db/AbstractEntity.java → ...src/main/java/org/rapidoid/db/Entity.java
@@ -32,7 +32,7 @@
  */
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public abstract class AbstractEntity implements CommonRoles, Serializable {
+public abstract class Entity implements CommonRoles, Serializable {
 
 	private static final long serialVersionUID = 8414835674684110203L;
 
@@ -56,7 +56,7 @@ public boolean equals(Object obj) {
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
-		AbstractEntity other = (AbstractEntity) obj;
+		Entity other = (Entity) obj;
 		if (id != other.id)
 			return false;
 		return true;

diff --git a/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/Comment.java b/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/Comment.java
@@ -3,7 +3,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.DbEntity;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 import org.rapidoid.db.DB;
 import org.rapidoid.db.DbRef;
 import org.rapidoid.db.DbSet;
@@ -32,7 +32,7 @@
 @DbEntity
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Comment extends AbstractEntity {
+public class Comment extends Entity {
 
 	public String content;
 

diff --git a/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/Task.java b/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/Task.java
@@ -7,7 +7,7 @@
 import org.rapidoid.annotation.Programmatic;
 import org.rapidoid.annotation.Scaffold;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 import org.rapidoid.db.DB;
 import org.rapidoid.db.DbList;
 import org.rapidoid.db.DbRef;
@@ -47,7 +47,7 @@
 @DbEntity
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Task extends AbstractEntity {
+public class Task extends Entity {
 
 	@Display
 	@CanChange({ MODERATOR, OWNER })

diff --git a/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/User.java b/rapidoid-demo/src/main/java/org/rapidoid/demo/taskplanner/model/User.java
@@ -26,15 +26,15 @@
 import org.rapidoid.annotation.Display;
 import org.rapidoid.annotation.Scaffold;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.db.AbstractEntity;
+import org.rapidoid.db.Entity;
 import org.rapidoid.db.DB;
 import org.rapidoid.db.DbSet;
 
 @Scaffold
 @SuppressWarnings("serial")
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class User extends AbstractEntity {
+public class User extends Entity {
 
 	@Display
 	public String username;