Introducing internal HTTP routes.

rapidoid-http-fast/src/main/java/org/rapidoid/http/HttpRoutes.java

@@ -47,9 +47,9 @@ public interface HttpRoutes {
 
 	Set<Route> all();
 
-	Set<Route> allAdmin();
+	Set<Route> allInternal();
 
-	Set<Route> allNonAdmin();
+	Set<Route> allExceptInternal();
 
 	Customization custom();
 

rapidoid-http-fast/src/main/java/org/rapidoid/http/Route.java

@@ -47,6 +47,6 @@ public interface Route {
 
 	boolean isAPI();
 
-	boolean isAdminOnly();
+	boolean isInternal();
 
 }

rapidoid-http-fast/src/main/java/org/rapidoid/http/RouteConfig.java

@@ -72,6 +72,10 @@ public interface RouteConfig {
 
 	RouteOptions cacheCapacity(int cacheCapacity);
 
+	boolean internal();
+
+	RouteOptions internal(boolean internal);
+
 	RouteMeta meta();
 
 	RouteOptions meta(RouteMeta meta);

rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/HttpRoutesImpl.java

@@ -565,13 +565,13 @@ public Set<Route> all() {
 	}
 
 	@Override
-	public Set<Route> allAdmin() {
-		return U.set(Do.findIn(all()).all(Route::isAdminOnly));
+	public Set<Route> allInternal() {
+		return U.set(Do.findIn(all()).all(Route::isInternal));
 	}
 
 	@Override
-	public Set<Route> allNonAdmin() {
-		return U.set(Do.findIn(all()).all(route -> !route.isAdminOnly()));
+	public Set<Route> allExceptInternal() {
+		return U.set(Do.findIn(all()).all(route -> !route.isInternal()));
 	}
 
 	@Override

rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RouteImpl.java

@@ -143,7 +143,7 @@ public boolean isAPI() {
 	}
 
 	@Override
-	public boolean isAdminOnly() {
-		return options.zone().equalsIgnoreCase("admin");
+	public boolean isInternal() {
+		return options.internal();
 	}
 }

rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RouteOptions.java

@@ -61,6 +61,8 @@ public class RouteOptions extends RapidoidThing implements RouteConfig {
 
 	private volatile int cacheCapacity = 100;
 
+	private volatile boolean internal;
+
 	private volatile RouteMeta meta = new RouteMeta();
 
 	@Override
@@ -77,6 +79,7 @@ public String toString() {
 			", wrappers=" + Arrays.toString(wrappers) +
 			", cacheTTL=" + cacheTTL +
 			", cacheCapacity=" + cacheCapacity +
+			", internal=" + internal +
 			", meta=" + meta +
 			'}';
 	}
@@ -204,6 +207,17 @@ public RouteOptions meta(RouteMeta meta) {
 		return this;
 	}
 
+	@Override
+	public boolean internal() {
+		return internal;
+	}
+
+	@Override
+	public RouteOptions internal(boolean internal) {
+		this.internal = internal;
+		return this;
+	}
+
 	public RouteOptions copy() {
 		RouteOptions copy = new RouteOptions();
 
@@ -217,6 +231,7 @@ public RouteOptions copy() {
 		copy.managed = this.managed;
 		copy.cacheTTL = this.cacheTTL;
 		copy.cacheCapacity = this.cacheCapacity;
+		copy.internal = this.internal;
 		copy.meta = this.meta.copy();
 
 		return copy;
@@ -231,12 +246,12 @@ public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		RouteOptions that = (RouteOptions) o;
-
 		return contentTypeCustomized == that.contentTypeCustomized &&
 			mvc == that.mvc &&
 			managed == that.managed &&
 			cacheTTL == that.cacheTTL &&
 			cacheCapacity == that.cacheCapacity &&
+			internal == that.internal &&
 			Objects.equals(contentType, that.contentType) &&
 			Objects.equals(view, that.view) &&
 			Objects.equals(zone, that.zone) &&
@@ -248,7 +263,7 @@ public boolean equals(Object o) {
 
 	@Override
 	public int hashCode() {
-		int result = Objects.hash(contentType, contentTypeCustomized, view, mvc, zone, managed, transaction, roles, cacheTTL, cacheCapacity, meta);
+		int result = Objects.hash(contentType, contentTypeCustomized, view, mvc, zone, managed, transaction, roles, cacheTTL, cacheCapacity, internal, meta);
 		result = 31 * result + Arrays.hashCode(wrappers);
 		return result;
 	}

rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java

@@ -84,16 +84,23 @@ public static void register(Setup setup, OAuthStateCheck stateCheck, OAuthProvid
 			Value<String> clientId = providerConfig.entry("clientId").str();
 			Value<String> clientSecret = providerConfig.entry("clientSecret").str();
 
-			setup.get(loginUri).html(new OAuthLoginHandler(provider, DOMAIN));
-			setup.get(callbackUri).html(new OAuthTokenHandler(provider, setup.custom(), DOMAIN, stateCheck, clientId, clientSecret, callbackUri));
+			setup.get(loginUri)
+				.internal(true)
+				.html(new OAuthLoginHandler(provider, DOMAIN));
+
+			setup.get(callbackUri)
+				.internal(true)
+				.html(new OAuthTokenHandler(provider, setup.custom(), DOMAIN, stateCheck, clientId, clientSecret, callbackUri));
 
 			loginHtml.append(LOGIN_BTN.render(U.map("uri", loginUri, "provider", provider.getName())));
 		}
 
 		loginHtml.append("</div>");
 		final String loginPage = loginHtml.toString();
 
-		setup.get(Msc.specialUri("oauth")).mvc((ReqHandler) x -> GUI.hardcoded(loginPage));
+		setup.get(Msc.specialUri("oauth"))
+			.internal(true)
+			.mvc((ReqHandler) x -> GUI.hardcoded(loginPage));
 	}
 
 	public static String getLoginURL(Req req, OAuthProvider provider, String oauthDomain) {

rapidoid-openapi/src/main/java/org/rapidoid/openapi/OpenAPI.java

@@ -35,8 +35,13 @@ public class OpenAPI extends RapidoidThing {
 	public static void bootstrap(Setup setup) {
 		OpenAPIDescriptor descriptor = new OpenAPIDescriptor(setup, Conf.OPENAPI);
 
-		setup.get(Msc.specialUri("api/openapi.json")).json(descriptor::getAPIDocs);
-		setup.get(Msc.specialUri("api/openapi.yaml")).plain(() -> YAML.stringify(descriptor.getAPIDocs()));
+		setup.get(Msc.specialUri("api/openapi.json"))
+			.internal(true)
+			.json(descriptor::getAPIDocs);
+
+		setup.get(Msc.specialUri("api/openapi.yaml"))
+			.internal(true)
+			.plain(() -> YAML.stringify(descriptor.getAPIDocs()));
 	}
 
 }

rapidoid-openapi/src/main/java/org/rapidoid/openapi/OpenAPIDescriptor.java

@@ -82,16 +82,15 @@ public Map<String, Object> getAPIDocs() {
 
 	private List<Route> findPublishableRoutes() {
 		// admin zone routes are considered private, don't publish them
-		Set<Route> nonAdmin = setup.routes().allNonAdmin();
+		Set<Route> nonAdmin = setup.routes().allExceptInternal();
 
 		return Do.findIn(nonAdmin).all(this::isPublishable);
 	}
 
 	private boolean isPublishable(Route route) {
-		RouteMeta meta = route.config().meta();
-
 		return route.isAPI() // non-API routes (e.g. pages) won't be published
-			&& meta.publish() // routes can be marked as private/public
+			&& !route.config().internal() // don't publish internal routes
+			&& route.config().meta().publish() // a route can be configured not to be published
 			&& !route.path().startsWith("/_"); // routes having paths starting with '/_' are considered private
 	}
 

rapidoid-rest/src/main/java/org/rapidoid/setup/OnRoute.java

@@ -446,6 +446,11 @@ public OnRoute contentType(MediaType contentType) {
 		return this;
 	}
 
+	public OnRoute internal(boolean internal) {
+		options.internal(internal);
+		return this;
+	}
+
 	public OnRoute meta(RouteMeta meta) {
 		options.meta(meta);
 		return this;

rapidoid-web/src/main/java/org/rapidoid/goodies/Booter.java

@@ -68,10 +68,12 @@ public Booter adminCenter() {
 
 	public Booter auth() {
 		setup.post(uri("login"))
+			.internal(true)
 			.roles()
 			.json(new LoginHandler());
 
 		setup.get(uri("logout"))
+			.internal(true)
 			.roles(Role.LOGGED_IN)
 			.json(new LogoutHandler());
 
@@ -80,6 +82,7 @@ public Booter auth() {
 
 	public Booter lifecycle() {
 		setup.page(uri("terminate"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Terminate / Restart")
@@ -90,6 +93,7 @@ public Booter lifecycle() {
 
 	public Booter overview() {
 		setup.page(uri(""))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Overview")
@@ -100,24 +104,28 @@ public Booter overview() {
 
 	public Booter application() {
 		setup.page(uri("routes"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("Routes")
 			.mvc(new RoutesHandler());
 
 		setup.page(uri("config"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("Configuration")
 			.mvc(new ConfigHandler());
 
 		setup.page(uri("beans"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("Application", "Beans")
 			.mvc(new BeansHandler());
 
 		setup.get(uri("classpath"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("Application", "Classpath")
@@ -130,12 +138,14 @@ public Booter metrics() {
 		Metrics.bootstrap();
 
 		setup.page(uri("metrics"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("Metrics")
 			.mvc(new GraphsHandler());
 
 		setup.get(uri("graphs/{id:.*}"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.json(new GraphDataHandler());
 
@@ -144,48 +154,56 @@ public Booter metrics() {
 
 	public Booter jmx() {
 		setup.page(uri("jmx/mempool"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Memory pool")
 			.mvc(JMX.memoryPool());
 
 		setup.page(uri("jmx/threads"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "JVM Threads")
 			.mvc(JMX.threads());
 
 		setup.page(uri("jmx/os"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Operating system")
 			.mvc(JMX.os());
 
 		setup.page(uri("jmx/gc"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Garbage collection")
 			.mvc(JMX.gc());
 
 		setup.page(uri("jmx/memory"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Memory")
 			.mvc(JMX.memory());
 
 		setup.page(uri("jmx/runtime"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Runtime")
 			.mvc(JMX.runtime());
 
 		setup.page(uri("jmx/classes"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Classes")
 			.mvc(JMX.classes());
 
 		setup.page(uri("jmx/compilation"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Compilation")
@@ -196,6 +214,7 @@ public Booter jmx() {
 
 	public Booter entities() {
 		setup.page(uri("entities"))
+			.internal(true)
 			.roles(Role.ADMINISTRATOR)
 			.zone(CENTER)
 			.menu("System", "Entities")
@@ -209,6 +228,7 @@ public Booter entities() {
 				String contextPath = zone.entry("home").or(uri(""));
 
 				X.scaffold(type)
+					.internal(true)
 					.baseUri(Msc.uri(contextPath, uri))
 					.roles(Role.ADMINISTRATOR)
 					.on(setup);

rapidoid-web/src/main/java/org/rapidoid/goodies/RoutesHandler.java

@@ -32,6 +32,7 @@
 import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -45,18 +46,18 @@ public class RoutesHandler extends GUI implements Callable<Object> {
 	public Object call() {
 		List<Object> routes = U.list();
 
-		Set<Route> appRoutes = On.setup().routes().allNonAdmin();
+		Set<Route> appRoutes = On.setup().routes().allExceptInternal();
 
-		Set<Route> adminRoutes = On.setup().routes().allAdmin();
-		adminRoutes.addAll(Admin.setup().routes().allAdmin());
+		Set<Route> internalRoutes = On.setup().routes().allInternal();
+		internalRoutes.addAll(Admin.setup().routes().allInternal());
 
 		routes.add(div(h3("Application routes:"), routesOf(appRoutes, true)));
-		routes.add(div(h3("Admin routes:"), routesOf(adminRoutes, true)));
+		routes.add(div(h3("Internal routes:"), routesOf(internalRoutes, true)));
 
 		return multi(routes);
 	}
 
-	public static TableTag routesOf(Set<Route> httpRoutes, boolean withHandler) {
+	private static TableTag routesOf(Set<Route> httpRoutes, boolean withHandler) {
 		List<Route> routes = U.list(httpRoutes);
 		sortRoutes(routes);
 
@@ -93,10 +94,7 @@ private static boolean sameTarget(Route a, Route b) {
 	}
 
 	private static void sortRoutes(List<Route> routes) {
-		routes.sort((a, b) -> {
-			int cmpByPath = a.path().compareTo(b.path());
-			return cmpByPath != 0 ? cmpByPath : a.verb().compareTo(b.verb());
-		});
+		routes.sort(Comparator.comparing(Route::path).thenComparing(Route::verb));
 	}
 
 	private static Tag routeRow(Route route, List<HttpVerb> verbs, boolean withHandler) {