#120 Some renaming and cleanup

Author: rjrudin

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

@@ -11,8 +11,6 @@
 
 import java.io.File;
 
-import java.io.File;
-
 /**
  * Defaults to the content database name in the AppConfig instance. Can be overridden via the databaseNameOrId property.
  */
@@ -46,7 +44,7 @@ protected void deployConfigs(CommandContext context, ConfigDir configDir, String
 
 	@Override
 	protected void storeTokenForResourceId(SaveReceipt receipt, CommandContext context) {
-		String targetId = currentConfigManager.getDomainID(receipt.getResourceId());
+		String targetId = currentConfigManager.getDomainId(receipt.getResourceId());
 		String key = "%%flexrep-domains-id-" + receipt.getResourceId() + "%%";
 		if (logger.isInfoEnabled()) {
 			logger.info(format("Storing token with key '%s' and value '%s'", key, targetId));

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

@@ -6,13 +6,13 @@
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.resource.ResourceManager;
-import com.marklogic.mgmt.resource.flexrep.PullsManager;
+import com.marklogic.mgmt.resource.flexrep.PullManager;
 
 import java.io.File;
 
 public class DeployPullsCommand extends AbstractResourceCommand {
 
-	ResourceManager pullsManager;
+	private ResourceManager pullManager;
 
 	public DeployPullsCommand() {
 		setExecuteSortOrder(SortOrderConstants.DEPLOY_FLEXREP_PULLS);
@@ -25,7 +25,7 @@ protected File[] getResourceDirs(CommandContext context) {
 
 	@Override
 	protected ResourceManager getResourceManager(CommandContext context) {
-		return pullsManager;
+		return pullManager;
 	}
 
 	@Override
@@ -40,7 +40,7 @@ public void execute(CommandContext context) {
 	}
 
 	protected void deployFlexRepPulls(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
-		pullsManager = new PullsManager(context.getManageClient(), databaseIdOrName);
+		pullManager = new PullManager(context.getManageClient(), databaseIdOrName);
 		processExecuteOnResourceDir(context, configDir.getFlexrepPullsDir());
 	}
 

src/main/java/com/marklogic/mgmt/resource/flexrep/ConfigManager.java

@@ -48,7 +48,7 @@ public void enableAllFlexrepTargets() {
         }
     }
 
-    public String getDomainID(String configName) {
+    public String getDomainId(String configName) {
 	    Fragment f =  getManageClient().getXml(getResourcesPath() +"/" + configName);
 	    return f.getElementValue("/node()/db:id");
     }

src/main/java/com/marklogic/mgmt/resource/flexrep/PullsManager.java renamed to src/main/java/com/marklogic/mgmt/resource/flexrep/PullManager.java

@@ -3,10 +3,11 @@
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 
-public class PullsManager  extends AbstractResourceManager {
+public class PullManager extends AbstractResourceManager {
+
 	private String databaseIdOrName;
 
-	public PullsManager(ManageClient client, String databaseIdOrName) {
+	public PullManager(ManageClient client, String databaseIdOrName) {
 		super(client);
 		this.databaseIdOrName = databaseIdOrName;
 	}

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

@@ -7,7 +7,7 @@
 import com.marklogic.mgmt.resource.cpf.CpfConfigManager;
 import com.marklogic.mgmt.resource.cpf.DomainManager;
 import com.marklogic.mgmt.resource.cpf.PipelineManager;
-import com.marklogic.mgmt.resource.flexrep.PullsManager;
+import com.marklogic.mgmt.resource.flexrep.PullManager;
 import org.junit.After;
 import org.junit.Test;
 
@@ -107,31 +107,34 @@ public void replicaFlexrep() {
     }
 
 	@Test
-	public void flexPull() {
-
+	public void deployPullConfiguration() {
 		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/flexrep-config"));
 
 		initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(),
 			new DeployCpfConfigsCommand(), new DeployDomainsCommand(), new DeployPipelinesCommand(),
 			new DeployConfigsCommand(), new DeployTargetsCommand(), new DeployOtherDatabasesCommand(), new DeployPullsCommand());
 
-		appDeployer.deploy(appConfig);
-		assertConfigAndTargetAreDeployed();
+		try {
+			appDeployer.deploy(appConfig);
+
+			assertConfigAndTargetAreDeployed();
 
-		final String pullName = "docs2go";
-		PullsManager pullsMangager = new PullsManager(manageClient, "other-sample-app-content");
-		assertTrue(pullsMangager.exists(pullName));
+			final String pullName = "docs2go";
+			PullManager pullManager = new PullManager(manageClient, "other-sample-app-content");
+			assertTrue(pullManager.exists(pullName));
 
-		// Run deploy again to make sure nothing blows up
-		appDeployer.deploy(appConfig);
+			// Run deploy again to make sure nothing blows up
+			appDeployer.deploy(appConfig);
 
-		ConfigManager mgr = new ConfigManager(manageClient, appConfig.getContentDatabaseName());
-		mgr.deleteAllConfigs();
-		assertTrue("All of the configs should have been deleted, including their targets", mgr.getAsXml()
-			.getListItemIdRefs().isEmpty());
+			ConfigManager mgr = new ConfigManager(manageClient, appConfig.getContentDatabaseName());
+			mgr.deleteAllConfigs();
+			assertTrue("All of the configs should have been deleted, including their targets", mgr.getAsXml()
+				.getListItemIdRefs().isEmpty());
 
-		undeploySampleApp();
-		assertFalse(new ServerManager(manageClient).exists("master-flexrep-server"));
+		} finally {
+			undeploySampleApp();
+			assertFalse(new ServerManager(manageClient).exists("master-flexrep-server"));
+		}
 	}
 
     private void assertConfigAndTargetAreDeployed() {