Copied "On" API as "Dev" and "Admin".

rapidoid · Mar 1, 2016 · ef42aec · ef42aec
1 parent cf4aa90
commit ef42aec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Admin.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Admin.java
@@ -118,10 +118,6 @@ public static synchronized Setup processor(HttpProcessor listener) {
 		return SETUP.processor(listener);
 	}
 
-	public static synchronized Setup instance() {
-		return SETUP;
-	}
-
 	public static Setup args(String... args) {
 		return SETUP.args(args);
 	}
@@ -143,6 +139,10 @@ public static Setup deregister(Object... controllers) {
 		return SETUP.deregister(controllers);
 	}
 
+	public static synchronized Setup setup() {
+		return SETUP;
+	}
+
 	public static Config config() {
 		return SETUP.config();
 	}

diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Dev.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Dev.java
@@ -118,10 +118,6 @@ public static synchronized Setup processor(HttpProcessor listener) {
 		return SETUP.processor(listener);
 	}
 
-	public static synchronized Setup instance() {
-		return SETUP;
-	}
-
 	public static Setup args(String... args) {
 		return SETUP.args(args);
 	}
@@ -143,6 +139,10 @@ public static Setup deregister(Object... controllers) {
 		return SETUP.deregister(controllers);
 	}
 
+	public static synchronized Setup setup() {
+		return SETUP;
+	}
+
 	public static Config config() {
 		return SETUP.config();
 	}

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java
@@ -84,8 +84,8 @@ public void openContext() {
 	public void closeContext() {
 		System.out.println("--- STOPPING SERVER ---");
 
-		Admin.instance().shutdown();
-		Dev.instance().shutdown();
+		Admin.setup().shutdown();
+		Dev.setup().shutdown();
 
 		System.out.println("--- SERVER STOPPED ---");
 	}