Minor improvements.

rapidoid · Jun 11, 2016 · ccbf6cf · ccbf6cf
1 parent c604ece
commit ccbf6cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java
@@ -211,8 +211,10 @@ public static List<Class<?>> findBeans(String... packages) {
 		return beansCache.get(U.list(packages));
 	}
 
-	public static void scan(String... packages) {
+	public static boolean scan(String... packages) {
-		beans(App.findBeans(packages).toArray());
+		List<Class<?>> beans = App.findBeans(packages);
+		beans(beans.toArray());
+		return !beans.isEmpty();
 	}
 
 	public static void beans(Object... beans) {

diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java
@@ -156,10 +156,10 @@ public FastHttp http() {
 		}
 
 		synchronized (this) {
-			if (isAdmin() && ON.http != null && appAndAdminOnSameServer()) {
+			if (isAdminAndSameAsApp() && ON.http != null) {
 				return ON.http;
 
-			} else if (isApp() && ADMIN.http != null && appAndAdminOnSameServer()) {
+			} else if (isAppAndSameAsAdmin() && ADMIN.http != null) {
 				return ADMIN.http;
 			}
 
@@ -205,17 +205,25 @@ public synchronized Server listen() {
 	}
 
 	private boolean delegateAdminToApp() {
-		return isAdmin() && ON.server != null && appAndAdminOnSameServer();
+		return isAdminAndSameAsApp() && ON.server != null;
 	}
 
 	private boolean delegateAppToAdmin() {
-		return isApp() && ADMIN.server != null && appAndAdminOnSameServer();
+		return isAppAndSameAsAdmin() && ADMIN.server != null;
 	}
 
 	public static boolean appAndAdminOnSameServer() {
 		return U.eq(ADMIN.calcPort(), ON.calcPort());
 	}
 
+	public boolean isAppAndSameAsAdmin() {
+		return isApp() && appAndAdminOnSameServer();
+	}
+
+	public boolean isAdminAndSameAsApp() {
+		return isAdmin() && appAndAdminOnSameServer();
+	}
+
 	public boolean isAdmin() {
 		return this == ADMIN;
 	}

diff --git a/rapidoid-standalone/src/main/resources/templates/_welcome.html b/rapidoid-standalone/src/main/resources/templates/_welcome.html
@@ -1,3 +1,3 @@
 <h1>Welcome to Rapidoid!</h1>
 <br>
-<h4>Your can upload/deploy your application JAR in the <a href="${adminUrl}">Admin Center</a>.</h4>
+<h4>Your can upload / deploy your application JAR in the <a href="${adminUrl}">Admin Center</a>.</h4>