diff --git a/config/src/main/java/com/typesafe/config/ConfigFactory.java b/config/src/main/java/com/typesafe/config/ConfigFactory.java index 8236713c..f2fb0ae4 100644 --- a/config/src/main/java/com/typesafe/config/ConfigFactory.java +++ b/config/src/main/java/com/typesafe/config/ConfigFactory.java @@ -1091,12 +1091,12 @@ public final class ConfigFactory { } /** - * Parse only any application overrides (those specified by config.{resource,file,url}), returning + * Parse only any application replacement (specified by one of config.{resource,file,url}), returning * an empty Config if no overrides were set. * @param parseOptions parse options * @return the parsed configuration */ - public static Config parseApplicationOverride(ConfigParseOptions parseOptions) { + public static Config parseApplicationReplacement(ConfigParseOptions parseOptions) { ClassLoader loader = parseOptions.getClassLoader(); if (loader == null) diff --git a/config/src/main/java/com/typesafe/config/DefaultConfigLoadingStrategy.java b/config/src/main/java/com/typesafe/config/DefaultConfigLoadingStrategy.java index 18216020..dd621a2a 100644 --- a/config/src/main/java/com/typesafe/config/DefaultConfigLoadingStrategy.java +++ b/config/src/main/java/com/typesafe/config/DefaultConfigLoadingStrategy.java @@ -8,11 +8,11 @@ package com.typesafe.config; public class DefaultConfigLoadingStrategy implements ConfigLoadingStrategy { @Override public Config parseApplicationConfig(ConfigParseOptions parseOptions) { - Config overrideConfig = ConfigFactory.parseApplicationOverride(parseOptions); - if (overrideConfig.isEmpty()) { + Config applicationReplacement = ConfigFactory.parseApplicationReplacement(parseOptions); + if (applicationReplacement.isEmpty()) { return ConfigFactory.parseResourcesAnySyntax("application", parseOptions); } else { - return overrideConfig; + return applicationReplacement; } } }