Cleaning-up the 'On' and 'Admin' API, moving some parts to 'App'.

rapidoid-integration-tests/src/test/java/org/rapidoid/docs/httpcfgfull/Main.java

@@ -53,7 +53,7 @@ public static void main(String[] args) {
 
 		/* Wrap every result into a renderPage */
 
-		On.defaults().wrappers((data, next) ->
+		App.defaults().wrappers((data, next) ->
 			next.invokeAndTransformResult(x -> {
 				return page(x).menu(menu).brand(cfg.get("title"));
 			})

rapidoid-integration-tests/src/test/java/org/rapidoid/docs/httpguiedit/Main.java

@@ -20,14 +20,15 @@
 
 package org.rapidoid.docs.httpguiedit;
 
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 
 public class Main {
 
 	public static void main(String[] args) {
 		/* A wrapper executes before the handler */
 
-		On.defaults().wrappers((req, next) -> {
+		App.defaults().wrappers((req, next) -> {
 			return next.invokeAndTransformResult(result -> "Hey: " + result);
 		});
 

rapidoid-integration-tests/src/test/java/org/rapidoid/docs/httpguipage/Main.java

@@ -20,14 +20,15 @@
 
 package org.rapidoid.docs.httpguipage;
 
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 
 public class Main {
 
 	public static void main(String[] args) {
 		/* A wrapper executes before the handler */
 
-		On.defaults().wrappers((req, next) -> next.invokeAndTransformResult(result -> "Hey: " + result));
+		App.defaults().wrappers((req, next) -> next.invokeAndTransformResult(result -> "Hey: " + result));
 
 		/* and provides transformation for the result */
 

rapidoid-integration-tests/src/test/java/org/rapidoid/docs/httpwrap/Main.java

@@ -20,14 +20,15 @@
 
 package org.rapidoid.docs.httpwrap;
 
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 
 public class Main {
 
 	public static void main(String[] args) {
 		/* A wrapper executes before the handler */
 
-		On.defaults().wrappers((req, next) -> next.invokeAndTransformResult(result -> "Hey: " + result));
+		App.defaults().wrappers((req, next) -> next.invokeAndTransformResult(result -> "Hey: " + result));
 
 		/* and provides transformation for the result */
 

rapidoid-integration-tests/src/test/java/org/rapidoid/http/CustomizationTest.java

@@ -39,22 +39,22 @@ public class CustomizationTest extends IsolatedIntegrationTest {
 
 	@Test
 	public void testSerializationConfig() {
-		On.custom().jsonResponseRenderer((req, value, out) -> JSON.prettify(value, out));
+		App.custom().jsonResponseRenderer((req, value, out) -> JSON.prettify(value, out));
 
 		On.get("/").json(() -> U.map("foo", 12, "bar", 345));
 		On.get("/a").json(() -> U.map("foo", 12, "bar", 345));
 
 		onlyGet("/");
 
-		On.custom().jsonResponseRenderer((req, value, out) -> JSON.stringify(value, out));
+		App.custom().jsonResponseRenderer((req, value, out) -> JSON.stringify(value, out));
 
 		onlyGet("/a");
 	}
 
 	@Test
 	public void testAuthConfig() {
-		On.custom().loginProvider((req, username, password) -> password.equals(username + "!"));
-		On.custom().rolesProvider((req, username) -> username.equals("root") ? U.set("admin") : U.set());
+		App.custom().loginProvider((req, username, password) -> password.equals(username + "!"));
+		App.custom().rolesProvider((req, username) -> username.equals("root") ? U.set("admin") : U.set());
 		// FIXME complete the test
 	}
 
@@ -75,7 +75,7 @@ Object aa(Num num) {
 
 		// customization
 		ObjectMapper mapper = new ObjectMapper();
-		On.custom().beanParameterFactory((req, type, name, props) -> mapper.convertValue(req.posted(), type));
+		App.custom().beanParameterFactory((req, type, name, props) -> mapper.convertValue(req.posted(), type));
 
 		// after customization
 		onlyPost("/aa?id=3", U.map("the-name", "three"));

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpReregistrationTest.java

@@ -46,7 +46,7 @@ public void testControllerDeregistration() {
 		onlyGet("/inc?x=5");
 		notFound("/dec");
 
-		On.deregister(ctrl1);
+		App.setup().deregister(ctrl1);
 		verifyNoRoutes();
 
 		App.beans(ctrl2);
@@ -55,7 +55,7 @@ public void testControllerDeregistration() {
 		onlyPost("/dec?x=12");
 		notFound("/inc");
 
-		On.deregister(ctrl2.getClass());
+		App.setup().deregister(ctrl2.getClass());
 		verifyNoRoutes();
 
 		notFound("/inc");
@@ -83,7 +83,7 @@ public void testControllerReregistration() {
 		onlyGet("/inc?x=300");
 
 		// can deregister with other instance, only the class matters for deregistration, not the instance
-		On.deregister(ctrl1("invisible"));
+		App.setup().deregister(ctrl1("invisible"));
 		verifyNoRoutes();
 
 		notFound("/inc");
@@ -99,7 +99,7 @@ public void testLambdaDeregistration() {
 
 		getAndPost("/foo?a=12&x=3");
 
-		On.deregister("GET,POST", "/foo");
+		App.setup().deregister("GET,POST", "/foo");
 		verifyNoRoutes();
 
 		notFound("/foo");

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRolesTest.java

@@ -35,7 +35,7 @@ public class HttpRolesTest extends IsolatedIntegrationTest {
 	public void testRoles() {
 		App.scan(path());
 
-		On.defaults().roles("aa", "bb");
+		App.defaults().roles("aa", "bb");
 
 		On.get("/a").json(() -> "ok");
 		On.get("/ok").roles().json(() -> "ok");

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpStaticFilesTest.java

@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.io.Res;
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
@@ -32,7 +33,7 @@ public class HttpStaticFilesTest extends IsolatedIntegrationTest {
 
 	@Test
 	public void serveStaticFiles() {
-		On.custom().staticFilesPath("static1", "non-existing-location", "static2");
+		App.custom().staticFilesPath("static1", "non-existing-location", "static2");
 
 		On.get("/c").managed(false).contentType(MediaType.JSON).serve("override");
 

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTemplatesPathTest.java

@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.render.Templates;
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.My;
 import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
@@ -34,7 +35,7 @@ public class HttpTemplatesPathTest extends IsolatedIntegrationTest {
 
 	@Test
 	public void testTemplatesPath1() {
-		On.custom().templatesPath("test-templates");
+		App.custom().templatesPath("test-templates");
 
 		Templates.setPath("something-different");
 		eq(Templates.getPath(), U.array("something-different"));
@@ -44,15 +45,15 @@ public void testTemplatesPath1() {
 
 	@Test
 	public void testTemplatesPath2() {
-		On.custom().templatesPath("test-templates");
-		eq(On.custom().templatesPath(), U.array("test-templates"));
+		App.custom().templatesPath("test-templates");
+		eq(App.custom().templatesPath(), U.array("test-templates"));
 		setupAndTest();
 	}
 
 	@Test
 	public void testTemplatesPath3() {
 		My.templatesPath("test-templates");
-		eq(On.custom().templatesPath(), U.array("test-templates"));
+		eq(App.custom().templatesPath(), U.array("test-templates"));
 		setupAndTest();
 	}
 

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpWrapTest.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
@@ -31,8 +32,8 @@ public class HttpWrapTest extends IsolatedIntegrationTest {
 
 	@Test
 	public void testWrap() {
-		On.defaults().wrappers((req, invocation) -> invocation.invokeAndTransformResult(x -> x + "!"));
-		On.defaults().contentType(MediaType.BINARY);
+		App.defaults().wrappers((req, invocation) -> invocation.invokeAndTransformResult(x -> x + "!"));
+		App.defaults().contentType(MediaType.BINARY);
 
 		On.get("/").html(() -> "a");
 

rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpWrappersTest.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.App;
 import org.rapidoid.setup.My;
 import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
@@ -36,20 +37,20 @@ public void testWrappers() {
 		HttpWrapper hey = wrapper("hey");
 		My.wrappers(hey);
 
-		On.defaults().wrappers(wrapper("on-def"));
+		App.defaults().wrappers(wrapper("on-def"));
 
 		On.get("/def").plain("D");
 
-		On.defaults().wrappers((HttpWrapper[]) null); // reset the default wrappers
+		App.defaults().wrappers((HttpWrapper[]) null); // reset the default wrappers
 
-		HttpWrapper[] wrappers = On.custom().wrappers();
+		HttpWrapper[] wrappers = App.custom().wrappers();
 		eq(U.array(hey), wrappers);
 
 		On.get("/").wrappers(wrapper("index")).plain("home");
 		On.post("/x").wrappers(wrapper("x"), wrapper("x2")).json("X");
 		On.get("/y").html("YYY");
 
-		On.custom().wrappers(wrapper("on"));
+		App.custom().wrappers(wrapper("on"));
 
 		onlyGet("/");
 		onlyPost("/x");

rapidoid-integration-tests/src/test/java/org/rapidoid/http/IsolatedIntegrationTest.java

@@ -389,7 +389,7 @@ protected static Map<String, Object> reqResp(Req req, Resp resp) {
 	}
 
 	protected String appRoutes() {
-		List<String> routes = Do.map(On.routes().all()).toList(Object::toString);
+		List<String> routes = Do.map(App.routes().all()).toList(Object::toString);
 		Collections.sort(routes);
 		return U.join("\n", routes);
 	}
@@ -403,7 +403,7 @@ protected void verifyRoutes(String name) {
 	}
 
 	protected void verifyNoRoutes() {
-		isTrue(On.routes().all().isEmpty());
+		isTrue(App.routes().all().isEmpty());
 	}
 
 	protected void verifyJson(String name, Object actual) {

rapidoid-integration-tests/src/test/java/org/rapidoid/validation/HttpBeanValidationTest.java

@@ -61,14 +61,14 @@ public void testCustomValidation() {
 		On.get("/invalid1").html((@Valid Bar bar) -> "ok");
 		On.get("/invalid2").json((@Valid Bar bar) -> "ok");
 
-		On.custom().validator((req, bean) -> {
+		App.custom().validator((req, bean) -> {
 			throw U.rte("Invalid!");
 		});
 
 		onlyGet("/invalid1?err");
 		onlyGet("/invalid2?err");
 
-		On.custom().validator(null);
+		App.custom().validator(null);
 		My.validator((req, bean) -> {
 			throw new ValidationException("Validation failed!");
 		});
@@ -77,7 +77,7 @@ public void testCustomValidation() {
 		onlyGet("/invalid2?val");
 
 		My.validator(null);
-		On.custom().validator((req, bean) -> {
+		App.custom().validator((req, bean) -> {
 			throw new InvalidData("Invalid data!");
 		});
 

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

@@ -31,11 +31,7 @@
 @Since("5.1.0")
 public class Admin extends RapidoidThing {
 
-	private static final LazyInit<Setup> setup = new LazyInit<>(Admin::createAdminSetup);
-
-	private static Setup createAdminSetup() {
-		return Setups.create("admin");
-	}
+	private static final LazyInit<Setup> setup = new LazyInit<>(() -> Setups.create("admin"));
 
 	public static synchronized Setup setup() {
 		return setup.get();

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

@@ -28,9 +28,13 @@
 import org.rapidoid.collection.Coll;
 import org.rapidoid.commons.RapidoidInitializer;
 import org.rapidoid.config.Conf;
+import org.rapidoid.config.Config;
 import org.rapidoid.data.JSON;
 import org.rapidoid.env.Env;
 import org.rapidoid.group.Groups;
+import org.rapidoid.http.HttpRoutes;
+import org.rapidoid.http.customize.Customization;
+import org.rapidoid.http.impl.RouteOptions;
 import org.rapidoid.io.Res;
 import org.rapidoid.ioc.Beans;
 import org.rapidoid.ioc.IoC;
@@ -364,4 +368,19 @@ public static Screen gui() {
 		return setup().gui();
 	}
 
+	public static Config config() {
+		return On.setup().config();
+	}
+
+	public static Customization custom() {
+		return On.setup().custom();
+	}
+
+	public static HttpRoutes routes() {
+		return On.setup().routes();
+	}
+
+	public static RouteOptions defaults() {
+		return On.setup().defaults();
+	}
 }

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

@@ -24,13 +24,9 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.config.Config;
-import org.rapidoid.http.HttpRoutes;
 import org.rapidoid.http.ReqHandler;
 import org.rapidoid.http.ReqRespHandler;
-import org.rapidoid.http.customize.Customization;
 import org.rapidoid.http.handler.HttpHandler;
-import org.rapidoid.http.impl.RouteOptions;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.3.0")
@@ -108,30 +104,6 @@ public static synchronized OnError error(Class<? extends Throwable> error) {
 		return setup().error(error);
 	}
 
-	public static Setup deregister(String verb, String path) {
-		return setup().deregister(verb, path);
-	}
-
-	public static Setup deregister(Object... controllers) {
-		return setup().deregister(controllers);
-	}
-
-	public static Config config() {
-		return setup().config();
-	}
-
-	public static Customization custom() {
-		return setup().custom();
-	}
-
-	public static HttpRoutes routes() {
-		return setup().routes();
-	}
-
-	public static RouteOptions defaults() {
-		return setup().defaults();
-	}
-
 	public static OnChanges changes() {
 		return OnChanges.INSTANCE;
 	}