#118 Can easily remove a command now

Author: rjrudin

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=2.3.2
+version=2.4.0

src/main/java/com/marklogic/appdeployer/impl/SimpleAppDeployer.java

@@ -1,87 +1,104 @@
 package com.marklogic.appdeployer.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.marklogic.appdeployer.command.Command;
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.admin.AdminManager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Simple implementation that allows for a list of commands to be set.
  */
 public class SimpleAppDeployer extends AbstractAppDeployer {
 
-    private List<Command> commands;
+	private List<Command> commands;
+
+	public SimpleAppDeployer(Command... commandArray) {
+		super();
+		buildModifiableCommandList(commandArray);
+	}
 
-    public SimpleAppDeployer(Command... commandArray) {
-        super();
-        buildModifiableCommandList(commandArray);
-    }
+	public SimpleAppDeployer(ManageClient manageClient, AdminManager adminManager, Command... commandArray) {
+		super(manageClient, adminManager);
+		buildModifiableCommandList(commandArray);
+	}
 
-    public SimpleAppDeployer(ManageClient manageClient, AdminManager adminManager, Command... commandArray) {
-        super(manageClient, adminManager);
-        buildModifiableCommandList(commandArray);
-    }
+	/**
+	 * Arrays.asList produces an unmodifiable list, but we want a client to be able to modify the list.
+	 *
+	 * @param commandArray
+	 */
+	protected void buildModifiableCommandList(Command... commandArray) {
+		if (commandArray != null) {
+			commands = new ArrayList<Command>(commandArray.length);
+			for (Command c : commandArray) {
+				commands.add(c);
+			}
+		} else {
+			commands = new ArrayList<Command>();
+		}
+	}
 
-    /**
-     * Arrays.asList produces an unmodifiable list, but we want a client to be able to modify the list.
-     * 
-     * @param commandArray
-     */
-    protected void buildModifiableCommandList(Command... commandArray) {
-        if (commandArray != null) {
-            commands = new ArrayList<Command>(commandArray.length);
-            for (Command c : commandArray) {
-                commands.add(c);
-            }
-        } else {
-            commands = new ArrayList<Command>();
-        }
-    }
+	/**
+	 * Convenience method for finding a command of a certain type, presumably so it can be modified/reconfigured.
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	public Command getCommandOfType(Class<?> clazz) {
+		for (Command c : commands) {
+			if (c.getClass().equals(clazz)) {
+				return c;
+			}
+		}
+		return null;
+	}
 
-    /**
-     * Convenience method for finding a command of a certain type, presumably so it can be modified/reconfigured.
-     * 
-     * @param clazz
-     * @return
-     */
-    public Command getCommandOfType(Class<?> clazz) {
-        for (Command c : commands) {
-            if (c.getClass().equals(clazz)) {
-                return c;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Convenience method for finding a command with the given short class name (i.e. no package info in it), presumably so it can be
+	 * modified/reconfigured.
+	 *
+	 * @param shortClassName
+	 * @return
+	 */
+	public Command getCommand(String shortClassName) {
+		for (Command c : commands) {
+			if (c.getClass().getSimpleName().equals(shortClassName)) {
+				return c;
+			}
+		}
+		return null;
+	}
 
-    /**
-     * Convenience method for finding a command with the given class name, presumably so it can be
-     * modified/reconfigured.
-     * 
-     * @param className
-     * @return
-     */
-    public Command getCommand(String className) {
-        for (Command c : commands) {
-            if (c.getClass().getSimpleName().equals(className)) {
-                return c;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Remove the first command that has the same short class name as the given argument, and return it
+	 * if it's removed.
+	 *
+	 * @param shortClassName
+	 * @return
+	 */
+	public Command removeCommand(String shortClassName) {
+		for (Command c : commands) {
+			if (c.getClass().getSimpleName().equals(shortClassName)) {
+				commands.remove(c);
+				return c;
+			}
+		}
+		return null;
+	}
 
-    /**
-     * Keep this public so that a client can easily manipulate the list in case a default set of commands has been
-     * provided.
-     */
-    @Override
-    public List<Command> getCommands() {
-        return commands;
-    }
+	/**
+	 * Keep this public so that a client can easily manipulate the list in case a default set of commands has been
+	 * provided.
+	 */
+	@Override
+	public List<Command> getCommands() {
+		return commands;
+	}
 
-    public void setCommands(List<Command> commands) {
-        this.commands = commands;
-    }
+	public void setCommands(List<Command> commands) {
+		this.commands = commands;
+	}
 
 }

src/test/java/com/marklogic/appdeployer/impl/SimpleAppDeployerTest.java

@@ -34,4 +34,12 @@ public void getCommand() {
         assertEquals(dbCommand, deployer.getCommand("DeployContentDatabasesCommand"));
         assertNull(deployer.getCommand("SomeOtherCommand"));
     }
+
+	@Test
+	public void removeCommand() {
+		assertEquals(restApiCommand, deployer.removeCommand("DeployRestApiServersCommand"));
+		assertEquals(1, deployer.getCommands().size());
+		assertEquals(dbCommand, deployer.removeCommand("DeployContentDatabasesCommand"));
+		assertTrue(deployer.getCommands().isEmpty());
+	}
 }