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

@@ -42,8 +42,12 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.PropertiesConfigurationLayout;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.FileBasedConfiguration;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -145,28 +149,45 @@ private void run(String[] args) {
                 System.exit(0);
             }
 
-            Properties configDefaults = new Properties();
+            Parameters params = new Parameters();
+            // Read data from this file
+            File propertiesFile = new File(line.getOptionValue("c", "conf" + File.separator + "mirth-cli-config.properties"));
+            
+            FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+                   new FileBasedConfigurationBuilder<PropertiesConfiguration>(PropertiesConfiguration.class)
+                .configure(params.fileBased()
+                .setFile(propertiesFile));
+
+            Configuration config = null;
             try {
-                configDefaults.load(new FileInputStream(line.getOptionValue("c", "conf" + File.separator + "mirth-cli-config.properties")));
-            } catch (IOException e) {
-                // 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 (ConfigurationException cex) {
+                // 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);
                 }
+                error("Loading configuration failed.", null);
+                System.exit(2);
             }
+            if (config != null) {
+                String server = line.getOptionValue("a", config.getString("address"));
+                String user = line.getOptionValue("u", config.getString("user"));
+                String password = line.getOptionValue("p", config.getString("password"));
+                String script = line.getOptionValue("s", config.getString("script"));
 
-            String server = line.getOptionValue("a", configDefaults.getProperty("address"));
-            String user = line.getOptionValue("u", configDefaults.getProperty("user"));
-            String password = line.getOptionValue("p", configDefaults.getProperty("password"));
-            String script = line.getOptionValue("s", configDefaults.getProperty("script"));
+                if ((server != null) && (user != null) && (password != null)) {
+                    runShell(server, user, password, script, line.hasOption("d"));
+                } else {
+                    new HelpFormatter().printHelp("Shell", options);
+                    error("all of address, user, password, and version options must be supplied as arguments or in the default configuration file", null);
+                    System.exit(2);
+                }
 
-            if ((server != null) && (user != null) && (password != null)) {
-                runShell(server, user, password, script, line.hasOption("d"));
-            } else {
-                new HelpFormatter().printHelp("Shell", options);
-                error("all of address, user, password, and version options must be supplied as arguments or in the default configuration file", null);
-                System.exit(2);
             }
         } catch (ParseException e) {
             error("Could not parse input arguments.", e);