Renamed plugins API.

rapidoid · May 7, 2015 · 229973c · 229973c
1 parent 8b00476
commit 229973c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java
@@ -70,7 +70,7 @@ public static <T> GridWidget grid(Class<T> type) {
 	}
 
 	public static <T> GridWidget grid(String type) {
-		return grid(Plugins.entity().getEntityType(type));
+		return grid(Plugins.entities().getEntityType(type));
 	}
 
 	public static <T> GridWidget grid(Predicate<T> match) {

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppPageGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppPageGeneric.java
@@ -211,7 +211,7 @@ protected Object genericScreen() {
 		if (m.find()) {
 			String type = m.group(1);
 
-			Class<?> entityType = Plugins.entity().getEntityType(type);
+			Class<?> entityType = Plugins.entities().getEntityType(type);
 			if (entityType == null || !Metadata.isAnnotated(entityType, Scaffold.class)) {
 				return null;
 			}
@@ -243,8 +243,8 @@ protected Object genericScreen() {
 		if (m.find()) {
 			String type = m.group(1);
 
-			String type2 = U.or(Plugins.language().pluralToSingular(type), type);
-			Class<?> entityType = Plugins.entity().getEntityType(type2);
+			String type2 = U.or(Plugins.languages().pluralToSingular(type), type);
+			Class<?> entityType = Plugins.entities().getEntityType(type2);
 			if (entityType == null || !Metadata.isAnnotated(entityType, Scaffold.class)) {
 				return null;
 			}

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/ListEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/ListEntityScreenGeneric.java
@@ -50,7 +50,7 @@ public Object content() {
 		Tag caption = titleBox(entityName + " List");
 		GridWidget grid = grid(entityType, 10);
 
-		boolean canAdd = Secure.canInsert(Secure.username(), Plugins.entity().create(entityType));
+		boolean canAdd = Secure.canInsert(Secure.username(), Plugins.entities().create(entityType));
 		ButtonWidget btnAdd = canAdd ? btn("Add " + entityName).primary().command("Add") : null;
 
 		return row(caption, grid, btnAdd);

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/NewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/NewEntityScreenGeneric.java
@@ -42,7 +42,7 @@ public NewEntityScreenGeneric(Class<?> entityType) {
 	}
 
 	public Object content() {
-		target = Plugins.entity().create(entityType);
+		target = Plugins.entities().create(entityType);
 
 		Tag caption = h2("New " + U.capitalized(ctx().pathSegment(0).substring(3)));
 		FormWidget form = create(target).buttons(SAVE, CANCEL);

diff --git a/...n/java/org/rapidoid/plugins/DbPlugin.java → ...n/java/org/rapidoid/plugins/DBPlugin.java b/...n/java/org/rapidoid/plugins/DbPlugin.java → ...n/java/org/rapidoid/plugins/DBPlugin.java
@@ -32,7 +32,7 @@
  * @author Nikolche Mihajlovski
  * @since 3.0.0
  */
-public interface DbPlugin {
+public interface DBPlugin {
 
 	long insert(Object entity);
 

diff --git a/...va/org/rapidoid/plugins/EntityPlugin.java → .../org/rapidoid/plugins/EntitiesPlugin.java b/...va/org/rapidoid/plugins/EntityPlugin.java → .../org/rapidoid/plugins/EntitiesPlugin.java
@@ -24,7 +24,7 @@
  * @author Nikolche Mihajlovski
  * @since 3.0.0
  */
-public interface EntityPlugin {
+public interface EntitiesPlugin {
 
 	Class<?> getEntityType(String simpleTypeName);
 

diff --git a/.../org/rapidoid/plugins/LanguagePlugin.java → ...org/rapidoid/plugins/LanguagesPlugin.java b/.../org/rapidoid/plugins/LanguagePlugin.java → ...org/rapidoid/plugins/LanguagesPlugin.java
@@ -24,7 +24,7 @@
  * @author Nikolche Mihajlovski
  * @since 3.0.0
  */
-public interface LanguagePlugin {
+public interface LanguagesPlugin {
 
 	String singularToPlural(String noun);
 

diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java
@@ -30,11 +30,11 @@ public static DbPlugin db() {
 		return null;
 	}
 
-	public static EntityPlugin entity() {
+	public static EntitiesPlugin entities() {
 		return null;
 	}
 
-	public static LanguagePlugin language() {
+	public static LanguagesPlugin languages() {
 		return null;
 	}
 

diff --git a/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/InMemDbPlugin.java b/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/InMemDbPlugin.java
@@ -30,11 +30,11 @@
 import org.rapidoid.lambda.Callback;
 import org.rapidoid.lambda.Operation;
 import org.rapidoid.lambda.Predicate;
-import org.rapidoid.plugins.DbPlugin;
+import org.rapidoid.plugins.DBPlugin;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
-public class InMemDbPlugin implements DbPlugin {
+public class InMemDbPlugin implements DBPlugin {
 
 	@Override
 	public long insert(Object entity) {