Renamed "insideDocker" to "dockerized".

rapidoid · Sep 20, 2016 · 66bba5a · 66bba5a
1 parent f4194f7
commit 66bba5a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Environment.java b/rapidoid-commons/src/main/java/org/rapidoid/commons/Environment.java
@@ -124,7 +124,7 @@ private static EnvMode inferMode() {
 			return EnvMode.TEST;
 
 		} else {
-			if (Msc.insideDocker()) return EnvMode.PRODUCTION;
+			if (Msc.dockerized()) return EnvMode.PRODUCTION;
 
 			return ClasspathUtil.getClasspathFolders().isEmpty() ? EnvMode.PRODUCTION : EnvMode.DEV;
 		}

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java b/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java
@@ -60,7 +60,7 @@ public static String version() {
 	public static List<String> notes() {
 		List<String> notes = U.list();
 
-		if (Msc.insideDocker()) notes.add("Dockerized");
+		if (Msc.dockerized()) notes.add("Dockerized");
 		if (Msc.uniformOutput()) notes.add("Uniform output");
 
 		return notes;

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java b/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java
@@ -69,13 +69,13 @@ static void applyConfig(Config config) {
 
 		if (config == ROOT) {
 
-			if (Msc.insideDocker()) {
+			if (Msc.dockerized()) {
 				if (!ROOT.has("root")) ROOT.set("root", "/app");
 			}
 
 			String root = Msc.rootPath();
 
-			if (Msc.insideDocker()) {
+			if (Msc.dockerized()) {
 				U.must(U.notEmpty(root), "The root must be configured in a Dockerized environment!");
 
 				if (!APP.has("jar")) APP.set("jar", Msc.path(root, "app.jar"));

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java b/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
@@ -1045,7 +1045,7 @@ public static boolean bootService(String setup, String service) {
 		return false;
 	}
 
-	public static boolean insideDocker() {
+	public static boolean dockerized() {
 		return U.eq(System.getenv("RAPIDOID_JAR"), "/opt/rapidoid.jar")
 			&& U.eq(System.getenv("RAPIDOID_TMP"), "/tmp/rapidoid")
 			&& U.notEmpty(System.getenv("RAPIDOID_VERSION"))

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java b/rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java
@@ -88,7 +88,7 @@ public void testPath() {
 
 	@Test
 	public void testInsideDocker() throws Exception {
-		isFalse(Msc.insideDocker());
+		isFalse(Msc.dockerized());
 	}
 
 }
diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/AppVerification.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/AppVerification.java
@@ -39,7 +39,7 @@ static void selfVerify(String[] args) {
 	}
 
 	private static void dockerSelfVerify() {
-		U.must(Msc.insideDocker(), "Docker environment couldn't be detected!");
+		U.must(Msc.dockerized(), "Docker environment couldn't be detected!");
 		U.must("/app".equals(Msc.rootPath()), "The default root path for Docker environment must be '/app'!");
 
 		Log.info("Docker environment was verified!");