#88 Tossing flexrepPath into AppConfig

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -102,7 +102,9 @@ public class AppConfig {
     // Comma-delimited string used for configuring forest replicas
     private String databaseNamesAndReplicaCounts;
 
-    
+    // Path to use for DeployFlexrepCommand
+    private String flexrepPath;
+
 	public AppConfig() {
         this(DEFAULT_MODULES_PATH, DEFAULT_SCHEMAS_PATH);
     }
@@ -489,4 +491,12 @@ public FileFilter getAssetFileFilter() {
     public void setAssetFileFilter(FileFilter assetFileFilter) {
         this.assetFileFilter = assetFileFilter;
     }
+
+    public String getFlexrepPath() {
+        return flexrepPath;
+    }
+
+    public void setFlexrepPath(String flexrepPath) {
+        this.flexrepPath = flexrepPath;
+    }
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -107,6 +107,11 @@ public AppConfig newAppConfig() {
             c.setDatabaseNamesAndReplicaCounts(prop);
         }
 
+        prop = getProperty("mlFlexrepPath");
+        if (prop != null) {
+            logger.info("Flexrep path: " + prop);
+            c.setFlexrepPath(prop);
+        }
         return c;
     }
 

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployFlexrepCommand.java

@@ -21,14 +21,7 @@
  */
 public class DeployFlexrepCommand extends AbstractCommand implements UndoableCommand {
 
-    private String path;
-
     public DeployFlexrepCommand() {
-        this("master");
-    }
-
-    public DeployFlexrepCommand(String path) {
-        this.path = path;
         setExecuteSortOrder(SortOrderConstants.DEPLOY_OTHER_SERVERS);
     }
 
@@ -72,6 +65,7 @@ public void undo(CommandContext context) {
     }
 
     protected File getFlexrepBaseDir(AppConfig appConfig) {
+        String path = appConfig.getFlexrepPath();
         if (path == null) {
             return null;
         }
@@ -88,9 +82,4 @@ protected File getFlexrepBaseDir(AppConfig appConfig) {
 
         return flexrepBaseDir;
     }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
 }

src/test/java/com/marklogic/appdeployer/command/flexrep/DeployFlexrepTest.java

@@ -60,7 +60,8 @@ public void noFlexrepDir() {
     public void masterFlexrep() {
         appConfig.getConfigDir().setBaseDir(new File("src/test/resources/sample-app/flexrep-combined"));
 
-        initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(), new DeployFlexrepCommand("master"));
+        appConfig.setFlexrepPath("master");
+        initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(), new DeployFlexrepCommand());
 
         appDeployer.deploy(appConfig);
 
@@ -82,7 +83,8 @@ public void masterFlexrep() {
     public void replicaFlexrep() {
         appConfig.getConfigDir().setBaseDir(new File("src/test/resources/sample-app/flexrep-combined"));
 
-        initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(), new DeployFlexrepCommand("replica"));
+        appConfig.setFlexrepPath("replica");
+        initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(), new DeployFlexrepCommand());
 
         appDeployer.deploy(appConfig);