#87 Can now ignore filenames

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java

@@ -5,6 +5,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.springframework.util.FileCopyUtils;
 
@@ -32,6 +34,29 @@ public Integer getExecuteSortOrder() {
         return this.executeSortOrder;
     }
 
+    /**
+     * Convenience method for setting the names of files to ignore when reading resources from a directory. Will
+     * preserve any filenames already being ignored on the underlying FilenameFilter.
+     * 
+     * @param filenames
+     */
+    public void setFilenamesToIgnore(String... filenames) {
+        if (resourceFilenameFilter != null && resourceFilenameFilter instanceof ResourceFilenameFilter) {
+            ResourceFilenameFilter rff = (ResourceFilenameFilter) resourceFilenameFilter;
+            Set<String> set = null;
+            if (rff.getFilenamesToIgnore() != null) {
+                set = rff.getFilenamesToIgnore();
+            } else {
+                set = new HashSet<>();
+            }
+            for (String f : filenames) {
+                set.add(f);
+            }
+        } else {
+            this.resourceFilenameFilter = new ResourceFilenameFilter(filenames);
+        }
+    }
+
     /**
      * Simplifies reading the contents of a File into a String.
      * 
@@ -42,8 +67,9 @@ protected String copyFileToString(File f) {
         try {
             return new String(FileCopyUtils.copyToByteArray(f));
         } catch (IOException ie) {
-            throw new RuntimeException("Unable to copy file to string from path: " + f.getAbsolutePath() + "; cause: "
-                    + ie.getMessage(), ie);
+            throw new RuntimeException(
+                    "Unable to copy file to string from path: " + f.getAbsolutePath() + "; cause: " + ie.getMessage(),
+                    ie);
         }
     }
 

src/main/java/com/marklogic/appdeployer/command/ResourceFilenameFilter.java

@@ -2,15 +2,49 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.marklogic.client.helper.LoggingObject;
 
 /**
  * Simple filter implementation that returns true for .json and .xml files.
  */
-public class ResourceFilenameFilter implements FilenameFilter {
+public class ResourceFilenameFilter extends LoggingObject implements FilenameFilter {
+
+    private Set<String> filenamesToIgnore;
+
+    public ResourceFilenameFilter() {
+    }
+
+    public ResourceFilenameFilter(String... filenamesToIgnore) {
+        this.filenamesToIgnore = new HashSet<>();
+        for (String f : filenamesToIgnore) {
+            this.filenamesToIgnore.add(f);
+        }
+    }
+
+    public ResourceFilenameFilter(Set<String> filenamesToIgnore) {
+        this.filenamesToIgnore = filenamesToIgnore;
+    }
 
     @Override
     public boolean accept(File dir, String name) {
+        if (filenamesToIgnore != null && filenamesToIgnore.contains(name)) {
+            if (logger.isInfoEnabled()) {
+                logger.info("Ignoring filename: " + name);
+            }
+            return false;
+        }
         return name.endsWith(".json") || name.endsWith(".xml");
     }
 
+    public void setFilenamesToIgnore(Set<String> ignoreFilenames) {
+        this.filenamesToIgnore = ignoreFilenames;
+    }
+
+    public Set<String> getFilenamesToIgnore() {
+        return filenamesToIgnore;
+    }
+
 }

src/main/java/com/marklogic/appdeployer/command/appservers/DeployOtherServersCommand.java

@@ -20,12 +20,7 @@ public DeployOtherServersCommand() {
         setUndoSortOrder(SortOrderConstants.DELETE_OTHER_SERVERS);
         setRestartAfterDelete(true);
         setCatchExceptionOnDeleteFailure(true);
-        setResourceFilenameFilter(new ResourceFilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                return super.accept(dir, name) && !name.startsWith("rest-api-server");
-            }
-        });
+        setResourceFilenameFilter(new ResourceFilenameFilter("rest-api-server.xml", "rest-api-server.json"));
     }
 
     @Override

src/test/java/com/marklogic/appdeployer/command/servers/ManageOtherServerTest.java

@@ -44,10 +44,40 @@ public void odbcAndXdbcServers() {
 
         assertTrue(mgr.exists("sample-app-xdbc"));
         assertTrue(mgr.exists("sample-app-odbc"));
-        
+        assertFalse(
+                "The command should ignore the rest-api-server.json file, as that's processed by DeployRestApiServersCommand",
+                mgr.exists("sample-app"));
+
+        appDeployer.undeploy(appConfig);
+
+        assertFalse(mgr.exists("sample-app-xdbc"));
+        assertFalse(mgr.exists("sample-app-odbc"));
+        assertFalse(mgr.exists("sample-app"));
+    }
+
+    @Test
+    public void ignoreOdbcServer() {
+        appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/other-servers")));
+
+        ServerManager mgr = new ServerManager(manageClient);
+
+        DeployOtherServersCommand c = new DeployOtherServersCommand();
+        c.setFilenamesToIgnore("odbc-server.json");
+        initializeAppDeployer(c);
+
+        appConfig.getCustomTokens().put("%%ODBC_PORT%%", "8048");
+        appConfig.getCustomTokens().put("%%XDBC_PORT%%", "8049");
+        appDeployer.deploy(appConfig);
+
+        final String message = "Both the ODBC and REST API server files should have been ignored";
+        assertTrue(mgr.exists("sample-app-xdbc"));
+        assertFalse(message, mgr.exists("sample-app-odbc"));
+        assertFalse(message, mgr.exists("sample-app"));
+
         appDeployer.undeploy(appConfig);
 
         assertFalse(mgr.exists("sample-app-xdbc"));
         assertFalse(mgr.exists("sample-app-odbc"));
+        assertFalse(mgr.exists("sample-app"));
     }
 }

src/test/resources/sample-app/other-servers/servers/rest-api-server.json

@@ -0,0 +1,4 @@
+{
+  "server-name": "%%NAME%%",
+  "authentication": "basic"
+}