#314 Added factory to abstract how a DeployDatabaseCommand is constructed

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/databases/DefaultDeployDatabaseCommandFactory.java

@@ -0,0 +1,12 @@
+package com.marklogic.appdeployer.command.databases;
+
+import java.io.File;
+
+public class DefaultDeployDatabaseCommandFactory implements DeployDatabaseCommandFactory {
+
+	@Override
+	public DeployDatabaseCommand newDeployDatabaseCommand(File databaseFile) {
+		return new DeployDatabaseCommand(databaseFile);
+	}
+
+}

src/main/java/com/marklogic/appdeployer/command/databases/DeployDatabaseCommand.java

@@ -84,6 +84,8 @@ public class DeployDatabaseCommand extends AbstractCommand implements UndoableCo
 	 */
 	private Set<String> databasesToNotUndeploy;
 
+	private DeployDatabaseCommandFactory deployDatabaseCommandFactory = new DefaultDeployDatabaseCommandFactory();
+
     public DeployDatabaseCommand() {
         setExecuteSortOrder(SortOrderConstants.DEPLOY_OTHER_DATABASES);
         setUndoSortOrder(SortOrderConstants.DELETE_OTHER_DATABASES);
@@ -169,7 +171,7 @@ protected void addSubDatabases(DatabaseManager dbMgr, CommandContext context, St
 			    List<String> subDbNames = new ArrayList<String>();
 			    for (File f : listFilesInDirectory(subdbDir)) {
 				    logger.info(format("Will process sub database for %s found in file: %s", superDatabaseName, f.getAbsolutePath()));
-				    DeployDatabaseCommand subDbCommand = new DeployDatabaseCommand();
+				    DeployDatabaseCommand subDbCommand = this.deployDatabaseCommandFactory.newDeployDatabaseCommand(null);
 				    subDbCommand.setDatabaseFile(f);
 				    subDbCommand.setSuperDatabaseName(superDatabaseName);
 				    subDbCommand.setSubDatabase(true);
@@ -198,7 +200,7 @@ protected void removeSubDatabases(DatabaseManager dbMgr, CommandContext context,
 			    logger.info("Removing all subdatabases from database: " + superDatabaseName);
 			    dbMgr.detachSubDatabases(superDatabaseName);
 			    for (File f : listFilesInDirectory(subdbDir)) {
-				    DeployDatabaseCommand subDbCommand = new DeployDatabaseCommand();
+				    DeployDatabaseCommand subDbCommand = this.deployDatabaseCommandFactory.newDeployDatabaseCommand(null);
 				    subDbCommand.setDatabaseFile(f);
 				    subDbCommand.setSuperDatabaseName(superDatabaseName);
 				    subDbCommand.setSubDatabase(true);
@@ -445,4 +447,8 @@ public Set<String> getDatabasesToNotUndeploy() {
 	public void setDatabasesToNotUndeploy(Set<String> databasesToNotUndeploy) {
 		this.databasesToNotUndeploy = databasesToNotUndeploy;
 	}
+
+	public void setDeployDatabaseCommandFactory(DeployDatabaseCommandFactory deployDatabaseCommandFactory) {
+		this.deployDatabaseCommandFactory = deployDatabaseCommandFactory;
+	}
 }

src/main/java/com/marklogic/appdeployer/command/databases/DeployDatabaseCommandFactory.java

@@ -0,0 +1,17 @@
+package com.marklogic.appdeployer.command.databases;
+
+import java.io.File;
+
+/**
+ * Abstracts how a DeployDatabaseCommand is instantiated so that Data Hub Framework can provide in its
+ * own implementation with DHF-specific functionality in it.
+ */
+public interface DeployDatabaseCommandFactory {
+
+	/**
+	 * @param databaseFile can be null
+	 * @return
+	 */
+	DeployDatabaseCommand newDeployDatabaseCommand(File databaseFile);
+
+}

src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java

@@ -36,6 +36,8 @@ public class DeployOtherDatabasesCommand extends AbstractUndoableCommand {
 	 */
 	private Set<String> defaultDatabasesToNotUndeploy = new HashSet<>();
 
+	private DeployDatabaseCommandFactory deployDatabaseCommandFactory = new DefaultDeployDatabaseCommandFactory();
+
     public DeployOtherDatabasesCommand() {
         this(1);
     }
@@ -113,7 +115,7 @@ protected List<DeployDatabaseCommand> buildDatabaseCommands(CommandContext conte
     }
 
     protected DeployDatabaseCommand buildDeployDatabaseCommand(File file) {
-	    DeployDatabaseCommand c = new DeployDatabaseCommand(file);
+	    DeployDatabaseCommand c = this.deployDatabaseCommandFactory.newDeployDatabaseCommand(file);
 	    c.setForestsPerHost(getForestsPerHost());
 	    c.setCheckForCustomForests(isCheckForCustomForests());
 	    c.setForestFilename(getForestFilename());
@@ -181,4 +183,8 @@ public Set<String> getDefaultDatabasesToNotUndeploy() {
 	public void setDefaultDatabasesToNotUndeploy(Set<String> defaultDatabasesToNotUndeploy) {
 		this.defaultDatabasesToNotUndeploy = defaultDatabasesToNotUndeploy;
 	}
+
+	public void setDeployDatabaseCommandFactory(DeployDatabaseCommandFactory deployDatabaseCommandFactory) {
+		this.deployDatabaseCommandFactory = deployDatabaseCommandFactory;
+	}
 }