Revert "javalite-1393 Implement ability to fall through from AppConfig property file to System.getenv() w..."

ipolevoy · ipolevoy · commit 5854d454e7c8 · 2025-05-20T09:44:35.000-05:00
This reverts commit 3cddeb6.
diff --git a/app-config/src/main/java/org/javalite/app_config/AppConfig.java b/app-config/src/main/java/org/javalite/app_config/AppConfig.java
@@ -204,28 +204,14 @@ public static void reload(){
     private static void overloadFromSystemEnv() {
         Map<String, String> sysEnv = new HashMap<>();
         for (String key: props.keySet()){
-            String val = System.getenv(propertyNameToEnvVarName(key));
+            String val = System.getenv(key.replace(".", "_").replace("-", "_").toUpperCase());
             if(!blank(val)){
                 sysEnv.put(key, val);
             }
         }
         registerMap(sysEnv, "System.getenv()");
     }
 
-    /**
-     * Translates a property name to an environment variable name.
-     * A typical Java property name uses lower case words punctuated by dots:
-     * <code>server.port</code>. However, environment variables typically use upper case
-     * characters and cannot have dots in a name. This method converts property names to environment variable names:
-     * <code>server.port</code> is converted to <code>SERVER_PORT</code>
-     * @param propName name of a Java property
-     *
-     * @return name of a property converted to system environment variable name.
-     */
-    public static String propertyNameToEnvVarName(String propName) {
-        return propName.replace(".", "_").replace("-", "_").toUpperCase();
-    }
-
     /**
      * Will merge defined values into placeholders like ${placeholder}
      */
@@ -346,21 +332,18 @@ public static Property getAsProperty(String key) {
 
     /**
      * Returns property value for a key.
-     * <br/>
-     *
-     * If this method does not find a property defined in the property files, it converts the property name to
-     * environment variable name {@link #propertyNameToEnvVarName} and falls through
-     * to a corresponding environment variable value.
+     * If the value is null, it  will be sourced from the system environment
+     * variables.
      *
-     * @param propertyName name of a property.
-     * @return value for this property, <code>null</code> if not found.
+     * @param key key of property.
+     * @return value for this key, <code>null</code> if not found.
      */
-    public static String getProperty(String propertyName) {
+    public static String getProperty(String key) {
         if (!isInited()) {
             init();
         }
-        Property p = props.get(propertyName);
-        return p == null ? System.getenv(propertyNameToEnvVarName(propertyName)) : p.getValue();
+        Property p = props.get(key);
+        return p == null ? System.getenv(key) : p.getValue();
     }
 
 
