StubbornJava
diff --git a/‎stubbornjava-common/src/main/java/com/stubbornjava/common/Configs.java
Lines changed: 5 additions & 3 deletions b/‎stubbornjava-common/src/main/java/com/stubbornjava/common/Configs.java
Lines changed: 5 additions & 3 deletions
diff --git a/‎stubbornjava-common/src/test/resources/application.conf
Lines changed: 0 additions & 28 deletions b/‎stubbornjava-common/src/test/resources/application.conf
Lines changed: 0 additions & 28 deletions
diff --git a/‎stubbornjava-common/src/test/resources/application.local.conf
Lines changed: 0 additions & 1 deletion b/‎stubbornjava-common/src/test/resources/application.local.conf
Lines changed: 0 additions & 1 deletion
diff --git a/‎stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/WebappBoostrap.java
Lines changed: 38 additions & 0 deletions b/‎stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/WebappBoostrap.java
Lines changed: 38 additions & 0 deletions
diff --git a/‎stubbornjava-webapp/src/main/resources/application.conf
Lines changed: 0 additions & 27 deletions b/‎stubbornjava-webapp/src/main/resources/application.conf
Lines changed: 0 additions & 27 deletions
diff --git a/‎stubbornjava-webapp/src/main/resources/application.prod.conf renamed to ‎stubbornjava-webapp/src/main/resources/sjweb.conf
Lines changed: 2 additions & 0 deletions b/‎stubbornjava-webapp/src/main/resources/application.prod.conf renamed to ‎stubbornjava-webapp/src/main/resources/sjweb.conf
Lines changed: 2 additions & 0 deletions
@@ -90,8 +90,10 @@ public Builder() {
         }
 
         public Builder withResource(String resource) {
-            conf = conf.withFallback(ConfigFactory.parseResources(resource));
-            log.info("Loaded config file from resource ({})", resource);
+            Config resourceConfig = ConfigFactory.parseResources(resource);
+            String empty = resourceConfig.entrySet().size() == 0 ? " contains no values" : "";
+            conf = conf.withFallback(resourceConfig);
+            log.info("Loaded config file from resource ({}){}", resource, empty);
             return this;
         }
 
@@ -132,7 +134,7 @@ public Config build() {
             conf = conf.resolve();
             if (log.isDebugEnabled()) {
                 log.debug("Logging properties. Make sure sensitive data such as passwords or secrets are not logged!");
-                log.debug(conf.root().render(ConfigRenderOptions.concise().setFormatted(true)));
+                log.debug(conf.root().render());
             }
             return conf;
         }
 
@@ -0,0 +1,38 @@
+package com.stubbornjava.webapp;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.stubbornjava.common.Configs;
+import com.stubbornjava.common.Env;
+import com.stubbornjava.common.Json;
+import com.typesafe.config.Config;
+
+public class WebappBoostrap {
+    private static final Logger logger = LoggerFactory.getLogger(WebappBoostrap.class);
+
+    public static Config getConfig() {
+        Config config = Configs.newBuilder()
+           .withOptionalRelativeFile("./secure.conf")
+           .withResource("sjweb." + Env.get().getName() + ".conf")
+           .withResource("sjweb.conf")
+           .withResource("cms.application." + Env.get().getName() + ".conf")
+           .withResource("cms.application.conf")
+           .withResource("application." + Env.get().getName() + ".conf")
+           .withResource("application.conf")
+           .build();
+        logger.debug(Json.serializer().toPrettyString(Configs.asMap(config)));
+        return config;
+    }
+
+    public static <T> void run(Runnable runnable) {
+        try {
+            Configs.initProperties(getConfig());
+            runnable.run();
+        } catch (Throwable ex) {
+            logger.error("", ex);
+        } finally {
+            // Close pools and stuff
+        }
+    }
+}
@@ -1,3 +1,5 @@
+assets.root = "ui/assets"
+
 mailchimp {
   lists {
     subscribe = "05c0e98feb"
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,10 @@ public Builder() {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public Builder withResource(String resource) {`
`93`		`- conf = conf.withFallback(ConfigFactory.parseResources(resource));`
`94`		`- log.info("Loaded config file from resource ({})", resource);`
	`93`	`+ Config resourceConfig = ConfigFactory.parseResources(resource);`
	`94`	`+ String empty = resourceConfig.entrySet().size() == 0 ? " contains no values" : "";`
	`95`	`+ conf = conf.withFallback(resourceConfig);`
	`96`	`+ log.info("Loaded config file from resource ({}){}", resource, empty);`
`95`	`97`	`return this;`
`96`	`98`	`}`
`97`	`99`
`@@ -132,7 +134,7 @@ public Config build() {`
`132`	`134`	`conf = conf.resolve();`
`133`	`135`	`if (log.isDebugEnabled()) {`
`134`	`136`	`log.debug("Logging properties. Make sure sensitive data such as passwords or secrets are not logged!");`
`135`		`- log.debug(conf.root().render(ConfigRenderOptions.concise().setFormatted(true)));`
	`137`	`+ log.debug(conf.root().render());`
`136`	`138`	`}`
`137`	`139`	`return conf;`
`138`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+assets.root = "ui/assets"`
	`2`	`+`
`1`	`3`	`mailchimp {`
`2`	`4`	`lists {`
`3`	`5`	`subscribe = "05c0e98feb"`