#149 User-provided filenames are now ignored properly by DeployOtherDatabasesCommand

Author: Rob Rudin

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

@@ -61,20 +61,10 @@ protected void sortCommandsBeforeUndo(List<DeployDatabaseCommand> list, CommandC
 
     protected List<DeployDatabaseCommand> buildDatabaseCommands(CommandContext context) {
         List<DeployDatabaseCommand> dbCommands = new ArrayList<>();
-
         ConfigDir configDir = context.getAppConfig().getConfigDir();
         File dir = configDir.getDatabasesDir();
         if (dir != null && dir.exists()) {
-            Set<String> ignore = new HashSet<>();
-            for (File f : configDir.getContentDatabaseFiles()) {
-                ignore.add(f.getName());
-            }
-            ignore.add(DeploySchemasDatabaseCommand.DATABASE_FILENAME);
-            ignore.add(DeployTriggersDatabaseCommand.DATABASE_FILENAME);
-
-            ResourceFilenameFilter filter = new ResourceFilenameFilter(ignore);
-            setResourceFilenameFilter(filter);
-
+            ignoreKnownDatabaseFilenames(context);
             for (File f : listFilesInDirectory(dir)) {
                 if (logger.isDebugEnabled()) {
                     logger.debug("Will process other database in file: " + f.getName());
@@ -86,4 +76,19 @@ protected List<DeployDatabaseCommand> buildDatabaseCommands(CommandContext conte
         }
         return dbCommands;
     }
+
+    /**
+     * Adds to the list of resource filenames to ignore. Some may already have been set via the superclass method.
+     *
+     * @param context
+     */
+    protected void ignoreKnownDatabaseFilenames(CommandContext context) {
+        Set<String> ignore = new HashSet<>();
+        for (File f : context.getAppConfig().getConfigDir().getContentDatabaseFiles()) {
+            ignore.add(f.getName());
+        }
+        ignore.add(DeploySchemasDatabaseCommand.DATABASE_FILENAME);
+        ignore.add(DeployTriggersDatabaseCommand.DATABASE_FILENAME);
+        setFilenamesToIgnore(ignore.toArray(new String[]{}));
+    }
 }

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

@@ -19,6 +19,7 @@ public void test() {
 
         appConfig.getForestCounts().put("other-sample-app-content", 2);
         appConfig.getForestCounts().put("other-sample-app-schemas", 3);
+        appConfig.setResourceFilenamesToIgnore("ignored-database.json");
 
         initializeAppDeployer(new DeployRestApiServersCommand(), new DeployContentDatabasesCommand(2),
                 new DeployTriggersDatabaseCommand(), new DeploySchemasDatabaseCommand(),
@@ -34,6 +35,7 @@ public void test() {
             for (String name : dbNames) {
                 assertTrue("Expected to find database: " + name, dbMgr.exists(name));
             }
+            assertFalse("ignored-database.json should have been ignored", dbMgr.exists("ignored-content"));
 
             assertEquals("The main content database should have 2 forests, as set in the command", 2,
                     dbMgr.getForestIds("sample-app-content").size());

src/test/resources/sample-app/lots-of-databases/databases/ignored-database.json

@@ -0,0 +1,5 @@
+{
+  "database-name": "ignored-content",
+  "triggers-database": "other-sample-app-triggers",
+  "schema-database": "other-sample-app-schemas"
+}