Merge pull request #86 from SentryMan/profiles

Avaje Profiles

Author: rob-bygrave

README.md

@@ -76,7 +76,7 @@ Below is the how it looks for configuration properties.
 
 - loads via system property `props.file` or environment variable `PROPS_FILE` (if defined)
 
-- loads via system property `config.profiles` or environment variable `CONFIG_PROFILES` (if defined).
+- loads via system property `avaje.profiles` or environment variable `AVAJE_PROFILES` (if defined).
 
 Setting the `config.profiles` or environment variable `CONFIG_PROFILES` will cause avaje config to load the property files in the form `application-${profile}.properties` (will also work for yml/yaml files). 
 

avaje-config/src/main/java/io/avaje/config/InitialLoadContext.java

@@ -59,6 +59,7 @@ void loadEnvironmentVars() {
     initSystemProperty(System.getenv("POD_VERSION"), "app.version");
     initSystemProperty(System.getenv("POD_IP"), "app.ipAddress");
     initSystemProperty(System.getenv("CONFIG_PROFILES"), "config.profiles");
+    initSystemProperty(System.getenv("AVAJE_PROFILES"), "avaje.profiles");
   }
 
   private void initSystemProperty(String envValue, String key) {
@@ -133,18 +134,24 @@ CoreMap evalAll() {
    * Read the special properties that can point to an external properties source.
    */
   String indirectLocation() {
-    CoreEntry indirectLocation = map.get("load.properties");
+    var indirectLocation = map.get("load.properties");
     if (indirectLocation == null) {
       indirectLocation = map.get("load.properties.override");
     }
     return indirectLocation == null ? null : indirectLocation.value();
   }
 
   String profiles() {
-    final CoreEntry indirectLocation = map.get("config.profiles");
-    return indirectLocation == null
-        ? System.getProperty("config.profiles")
-        : indirectLocation.value();
+    final var configEntry = map.get("config.profiles");
+    final var configProfile =
+        configEntry == null ? System.getProperty("config.profiles") : configEntry.value();
+
+    if (configProfile != null) {
+      return configProfile;
+    }
+
+    final var avajeProfile = map.get("avaje.profiles");
+    return avajeProfile == null ? System.getProperty("avaje.profiles") : avajeProfile.value();
   }
 
   /**
@@ -155,7 +162,7 @@ int size() {
   }
 
   String getAppName() {
-    final CoreEntry appName = map.get("app.name");
+    final var appName = map.get("app.name");
     return (appName != null) ? appName.value() : System.getProperty("app.name");
   }
 }