#404 Content database not deleted on undeploy if filename is ignored

This is specific to the narrow scope of this ticket, which is that the "default content database filename" is ignored

Author: rjrudin

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

@@ -2,9 +2,11 @@
 
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.AbstractUndoableCommand;
 import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.ResourceFilenameFilter;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.appdeployer.command.forests.DeployForestsCommand;
 import com.marklogic.mgmt.PayloadParser;
@@ -21,6 +23,7 @@
 import com.marklogic.rest.util.JsonNodeUtil;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.*;
 
@@ -134,8 +137,39 @@ public void undo(CommandContext context) {
 		// If no databases were found, may still need to delete the content database in case no file exists for it.
 		// That's because the command for creating a REST API server will not delete the content database by default,
 		// though it will delete the test database by default
-		DatabaseManager dbMgr = new DeployDatabaseCommand().newDatabaseManageForDeleting(context);
-		dbMgr.deleteByName(context.getAppConfig().getContentDatabaseName());
+		if (deleteContentDatabaseOnUndo(databasePlans, context.getAppConfig())) {
+			DatabaseManager dbMgr = new DeployDatabaseCommand().newDatabaseManageForDeleting(context);
+			dbMgr.deleteByName(context.getAppConfig().getContentDatabaseName());
+		}
+	}
+
+	/**
+	 * If no database files are found, may still need to delete the content database in case no file exists for it.
+	 * That's because the command for creating a REST API server will not delete the content database by default.
+	 *
+	 * Per ticket #404, this will now do a check to see if the default content database filename is ignored. If so,
+	 * and there are no database files found, then the content database will not be deleted.
+	 *
+	 * @param databasePlans
+	 * @param appConfig
+	 * @return
+	 */
+	protected boolean deleteContentDatabaseOnUndo(List<DatabasePlan> databasePlans, AppConfig appConfig) {
+		if (databasePlans == null || databasePlans.isEmpty()) {
+			FilenameFilter filter = getResourceFilenameFilter();
+			if (filter != null && filter instanceof ResourceFilenameFilter) {
+				Set<String> filenamesToIgnore = ((ResourceFilenameFilter) filter).getFilenamesToIgnore();
+				if (filenamesToIgnore != null && !filenamesToIgnore.isEmpty() && appConfig.getConfigDirs() != null) {
+					for (ConfigDir configDir : appConfig.getConfigDirs()) {
+						if (filenamesToIgnore.contains(configDir.getDefaultContentDatabaseFilename())) {
+							return false;
+						}
+					}
+				}
+			}
+			return true;
+		}
+		return false;
 	}
 
 	/**

src/test/java/com/marklogic/appdeployer/command/databases/UndeployDatabasesWithIgnoredContentDatabaseTest.java

@@ -0,0 +1,36 @@
+package com.marklogic.appdeployer.command.databases;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.mgmt.resource.databases.DatabaseManager;
+import org.junit.Test;
+
+import java.io.File;
+
+public class UndeployDatabasesWithIgnoredContentDatabaseTest extends AbstractAppDeployerTest {
+
+	@Test
+	public void test() {
+		initializeAppDeployer(new DeployOtherDatabasesCommand(1));
+
+		// Deploy the database
+		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/db-only-config"));
+		deploySampleApp();
+
+		// Ignore the file
+		appConfig.setResourceFilenamesToIgnore("content-database.json");
+		undeploySampleApp();
+
+		DatabaseManager mgr = new DatabaseManager(manageClient);
+		String dbName = appConfig.getContentDatabaseName();
+		try {
+			// Verify db is still there
+			assertTrue(
+				"The database should still exist since the database file was ignored",
+				mgr.exists(dbName)
+			);
+		} finally {
+			mgr.deleteByName(appConfig.getContentDatabaseName());
+			assertFalse("Verifying the database was deleted", mgr.exists(dbName));
+		}
+	}
+}