#73 Added support for a FileFilter on AppConfig

Author: rjrudin

CHANGELOG.mdown

@@ -1,6 +1,11 @@
 # ml-app-deployer releases
 
-## 2.0rc1
+
+## 2.0rc2 - TBD
+
+* [#73](https://github.com/rjrudin/ml-app-deployer/issues/73) Added support for setting a FileFilter on AppConfig for controlling what assets are loaded
+
+## 2.0rc1 - 2015-12-23
 
 * Repackaging to com.marklogic
 

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -1,5 +1,6 @@
 package com.marklogic.appdeployer;
 
+import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -70,6 +71,8 @@ public class AppConfig {
     // As defined by the REST API
     private String modulePermissions = "rest-admin,read,rest-admin,update,rest-extension-user,execute";
 
+    private FileFilter assetFileFilter;
+
     // Additional module extensions that should be loaded as binaries into the modules database
     private String[] additionalBinaryExtensions;
 
@@ -101,8 +104,8 @@ public void setSimpleSslConfig() {
      * @return
      */
     public DatabaseClient newDatabaseClient() {
-        return DatabaseClientFactory.newClient(getHost(), getRestPort(), getRestAdminUsername(),
-                getRestAdminPassword(), getRestAuthentication(), getRestSslContext(), getRestSslHostnameVerifier());
+        return DatabaseClientFactory.newClient(getHost(), getRestPort(), getRestAdminUsername(), getRestAdminPassword(),
+                getRestAuthentication(), getRestSslContext(), getRestSslHostnameVerifier());
     }
 
     /**
@@ -138,6 +141,11 @@ public XccAssetLoader newXccAssetLoader() {
             }
             l.setDocumentFormatGetter(getter);
         }
+
+        if (assetFileFilter != null) {
+            l.setFileFilter(assetFileFilter);
+        }
+
         return l;
 
     }
@@ -425,4 +433,12 @@ public void setModulePermissions(String assetPermissions) {
         this.modulePermissions = assetPermissions;
     }
 
+    public FileFilter getAssetFileFilter() {
+        return assetFileFilter;
+    }
+
+    public void setAssetFileFilter(FileFilter assetFileFilter) {
+        this.assetFileFilter = assetFileFilter;
+    }
+
 }

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -1,13 +1,16 @@
 package com.marklogic.appdeployer.command.modules;
 
+import java.io.File;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.marklogic.junit.PermissionsFragment;
-import com.marklogic.xcc.template.XccTemplate;
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
+import com.marklogic.client.modulesloader.impl.AssetFileFilter;
+import com.marklogic.junit.PermissionsFragment;
+import com.marklogic.xcc.template.XccTemplate;
 
 public class LoadModulesTest extends AbstractAppDeployerTest {
 
@@ -55,20 +58,28 @@ public void loadModulesWithCustomPermissions() {
         perms.assertPermissionExists("app-user", "execute");
     }
 
+    @Test
+    public void loadModulesWithAssetFileFilter() {
+        LoadModulesCommand c = new LoadModulesCommand();
+        appConfig.setAssetFileFilter(new TestFileFilter());
+
+        initializeAppDeployer(new DeployRestApiServersCommand(), c);
+        appDeployer.deploy(appConfig);
+        
+        assertEquals("true", xccTemplate.executeAdhocQuery("doc-available('/ext/lib/test.xqy')"));
+        assertEquals("false", xccTemplate.executeAdhocQuery("doc-available('/ext/lib/test2.xqy')"));
+    }
+
     @Test
     public void testServerExists() {
         appConfig.setTestRestPort(8541);
         initializeAppDeployer(new DeployRestApiServersCommand(), new LoadModulesCommand());
         appDeployer.deploy(appConfig);
 
-        assertEquals(
-                "true",
-                xccTemplate
-                        .executeAdhocQuery("fn:doc-available('/Default/sample-app/rest-api/options/sample-app-options.xml')"));
-        assertEquals(
-                "true",
-                xccTemplate
-                        .executeAdhocQuery("fn:doc-available('/Default/sample-app-test/rest-api/options/sample-app-options.xml')"));
+        assertEquals("true", xccTemplate
+                .executeAdhocQuery("fn:doc-available('/Default/sample-app/rest-api/options/sample-app-options.xml')"));
+        assertEquals("true", xccTemplate.executeAdhocQuery(
+                "fn:doc-available('/Default/sample-app-test/rest-api/options/sample-app-options.xml')"));
     }
 
     private void assertModuleExistsWithDefaultPermissions(String message, String uri) {
@@ -88,3 +99,12 @@ private void assertDefaultPermissionsExists(String uri) {
     }
 
 }
+
+class TestFileFilter extends AssetFileFilter {
+
+    @Override
+    public boolean accept(File f) {
+        return !f.getName().equals("test2.xqy") && super.accept(f);
+    }
+
+}

src/test/resources/sample-app/src/main/ml-modules/ext/lib/test.xqy

@@ -0,0 +1 @@
+<test/>

src/test/resources/sample-app/src/main/ml-modules/ext/lib/test2.xqy

@@ -0,0 +1 @@
+<test/>