Renamed annotation "Relation" to "Rel".

rapidoid · Feb 17, 2015 · 983979c · 983979c
1 parent 5f8d70c
commit 983979c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/...ava/org/rapidoid/annotation/Relation.java → ...ain/java/org/rapidoid/annotation/Rel.java b/...ava/org/rapidoid/annotation/Relation.java → ...ain/java/org/rapidoid/annotation/Rel.java
@@ -30,7 +30,7 @@
 @Retention(RUNTIME)
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public @interface Relation {
+public @interface Rel {
 
 	String value();
 

diff --git a/rapidoid-db-impl/src/main/java/org/rapidoid/db/impl/EntityImpl.java b/rapidoid-db-impl/src/main/java/org/rapidoid/db/impl/EntityImpl.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Relation;
+import org.rapidoid.annotation.Rel;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.Beany;
 import org.rapidoid.beany.Metadata;
@@ -127,8 +127,8 @@ public DbRef<?> ref(Method method) {
 		return res;
 	}
 
-	private static Relation rel(Method method) {
+	private static Rel rel(Method method) {
-		Relation rel = Metadata.get(method.getAnnotations(), Relation.class);
+		Rel rel = Metadata.get(method.getAnnotations(), Rel.class);
 		U.must(rel != null, "@Relation is required for method: %s", method);
 		return rel;
 	}

diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/IPost.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/IPost.java
@@ -1,7 +1,7 @@
 package org.rapidoid.db.model;
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Relation;
+import org.rapidoid.annotation.Rel;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.db.DbColumn;
 import org.rapidoid.db.DbRef;
@@ -34,10 +34,10 @@ public interface IPost extends IEntity {
 
 	DbColumn<String> content();
 
-	@Relation("^posted")
+	@Rel("^posted")
 	DbRef<IProfile> postedOn();
 
-	@Relation("likes")
+	@Rel("likes")
 	DbSet<IPerson> likes();
 
 }
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/IProfile.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/IProfile.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Relation;
+import org.rapidoid.annotation.Rel;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.db.DbList;
 import org.rapidoid.db.IEntity;
@@ -30,7 +30,7 @@
 @Since("2.0.0")
 public interface IProfile extends IEntity {
 
-	@Relation("posted")
+	@Rel("posted")
 	public DbList<IPost> posts();
 
 }
diff --git a/rapidoid-inmem/src/main/java/org/rapidoid/inmem/InMem.java b/rapidoid-inmem/src/main/java/org/rapidoid/inmem/InMem.java
@@ -48,7 +48,7 @@
 import java.util.regex.Pattern;
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Relation;
+import org.rapidoid.annotation.Rel;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.Beany;
 import org.rapidoid.beany.Prop;
@@ -390,7 +390,7 @@ private Prop findRelProperty(Class<?> fromCls, String rel, Class<?> toCls) {
 					relName = links.relationName();
 				}
 			} else {
-				Relation relation = prop.getAnnotation(Relation.class);
+				Rel relation = prop.getAnnotation(Rel.class);
 				if (relation != null) {
 					relName = relation.value();
 				}

diff --git a/rapidoid-ioc/src/test/java/org/rapidoid/inject/db/Database.java b/rapidoid-ioc/src/test/java/org/rapidoid/inject/db/Database.java
@@ -36,6 +36,6 @@ public class Database {
 
 	final Map<String, Table> tables = IoC.autoExpandingInjectingMap(Table.class);
 
-	final Map<String, Rel> relations = IoC.autoExpandingInjectingMap(Rel.class);
+	final Map<String, Relat> relations = IoC.autoExpandingInjectingMap(Relat.class);
 
 }
diff --git a/...test/java/org/rapidoid/inject/db/Rel.java → ...st/java/org/rapidoid/inject/db/Relat.java b/...test/java/org/rapidoid/inject/db/Rel.java → ...st/java/org/rapidoid/inject/db/Relat.java
@@ -26,7 +26,7 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public class Rel {
+public class Relat {
 	@Inject
 	Database db;
 }