Related to issue #205. Enable using environment variables in config file.

Signed-off-by: Ville Ranta-aho <ville@ville-pekka.com>
Signed-off-by: Tony Germano <tony@germano.name>

Author: VillePekka

command/src/com/mirth/connect/cli/CommandLineInterface.java

@@ -11,7 +11,6 @@
 
 importjava.io.BufferedReader;
 importjava.io.File;
-importjava.io.FileInputStream;
 importjava.io.FileReader;
 importjava.io.IOException;
 importjava.io.InputStreamReader;
@@ -27,7 +26,6 @@
 importjava.util.List;
 importjava.util.Map;
 importjava.util.Map.Entry;
-importjava.util.Properties;
 importjava.util.Set;
 importjava.util.TreeMap;
 importjava.util.regex.Matcher;
@@ -42,8 +40,12 @@
 importorg.apache.commons.cli.Options;
 importorg.apache.commons.cli.ParseException;
 importorg.apache.commons.collections4.CollectionUtils;
+importorg.apache.commons.configuration2.BaseConfiguration;
+importorg.apache.commons.configuration2.Configuration;
 importorg.apache.commons.configuration2.PropertiesConfiguration;
 importorg.apache.commons.configuration2.PropertiesConfigurationLayout;
+importorg.apache.commons.configuration2.builder.fluent.Parameters;
+importorg.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
 importorg.apache.commons.configuration2.ex.ConfigurationException;
 importorg.apache.commons.io.FileUtils;
 importorg.apache.commons.io.FilenameUtils;
@@ -145,21 +147,34 @@ private void run(String[] args) {
 System.exit(0);
  }
 
-PropertiesconfigDefaults = newProperties();
+Parametersparams = newParameters();
+// Read data from this file
+FilepropertiesFile = newFile(line.getOptionValue("c", "conf" + File.separator + "mirth-cli-config.properties"));
+
+FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+newFileBasedConfigurationBuilder<PropertiesConfiguration>(PropertiesConfiguration.class)
+ .configure(params.fileBased()
+ .setFile(propertiesFile));
+
+Configurationconfig = newBaseConfiguration();
 try {
-configDefaults.load(newFileInputStream(line.getOptionValue("c", "conf" + File.separator + "mirth-cli-config.properties")));
- } catch (IOExceptione) {
-// Only error out if they tried to load the config
+// Load properties using Apache Commons Configuration2. The resulting config
+// instance supports variable interpolation, including environment variables
+// using the ${env:VARIABLE_NAME} syntax (for example ${env:MC_SERVER_URL}).
+config = builder.getConfiguration();
+ } catch (ConfigurationExceptioncex) {
+// loading of the configuration file failed
 if (line.hasOption("c")) {
-error("We could not find the file: " + line.getOptionValue("c"), null);
+// An explicit configuration file was specified with -c; fail fast with a clear error
+error("Failed to load the configuration file specified with -c: " + line.getOptionValue("c"), cex);
 System.exit(2);
  }
  }
 
-Stringserver = line.getOptionValue("a", configDefaults.getProperty("address"));
-Stringuser = line.getOptionValue("u", configDefaults.getProperty("user"));
-Stringpassword = line.getOptionValue("p", configDefaults.getProperty("password"));
-Stringscript = line.getOptionValue("s", configDefaults.getProperty("script"));
+Stringserver = line.getOptionValue("a", config.getString("address"));
+Stringuser = line.getOptionValue("u", config.getString("user"));
+Stringpassword = line.getOptionValue("p", config.getString("password"));
+Stringscript = line.getOptionValue("s", config.getString("script"));
 
 if ((server != null) && (user != null) && (password != null)) {
 runShell(server, user, password, script, line.hasOption("d"));