#108 Options files are loaded only when ending in *.xml or *.json

Removed some unused FilenameFilters from BaseModulesFinder as well

Author: rjrudin

src/main/java/com/marklogic/client/ext/modulesloader/impl/BaseModulesFinder.java

@@ -23,8 +23,6 @@
  */
 public abstract class BaseModulesFinder extends LoggingObject implements ModulesFinder {
 
-    private FilenameFilter transformFilenameFilter = new TransformFilenameFilter();
-    private FilenameFilter namespaceFilenameFilter = new NamespaceFilenameFilter();
 	private ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
 
     /**
@@ -122,20 +120,25 @@ protected void addNamespaces(Modules modules, String baseDir) {
 	}
 
 	protected void addOptions(Modules modules, String baseDir) {
-        modules.setOptions(findResources("options modules", baseDir, optionsPath + "/*.*"));
+        modules.setOptions(findResources("options modules", baseDir,
+	        optionsPath + "/*.xml",
+	        optionsPath + "/*.json"
+        ));
     }
 
 	protected void addServices(Modules modules, String baseDir) {
 		modules.setServices(findResources("service modules", baseDir,
 			servicesPath + "/*.xq*",
-			servicesPath + "/*.sjs"));
+			servicesPath + "/*.sjs"
+		));
 	}
 
 	protected void addTransforms(Modules modules, String baseDir) {
         modules.setTransforms(findResources("transform modules", baseDir,
 			transformsPath + "/*.xq*",
 	        transformsPath + "/*.xsl*",
-	        transformsPath + "/*.sjs"));
+	        transformsPath + "/*.sjs"
+        ));
     }
 
 	/**
@@ -165,23 +168,6 @@ protected List<Resource> findResources(String moduleType, String basePath, Strin
 		return list;
 	}
 
-
-	public FilenameFilter getTransformFilenameFilter() {
-        return transformFilenameFilter;
-    }
-
-    public void setTransformFilenameFilter(FilenameFilter transformFilenameFilter) {
-        this.transformFilenameFilter = transformFilenameFilter;
-    }
-
-    public FilenameFilter getNamespaceFilenameFilter() {
-        return namespaceFilenameFilter;
-    }
-
-    public void setNamespaceFilenameFilter(FilenameFilter namespaceFilenameFilter) {
-        this.namespaceFilenameFilter = namespaceFilenameFilter;
-    }
-
     public void setServicesPath(String servicesPath) {
         this.servicesPath = servicesPath;
     }
@@ -227,19 +213,3 @@ public final Modules findModules(String baseDir) {
 
 	protected abstract Modules findModulesWithResolvedBaseDir(String resolvedBaseDir);
 }
-
-class TransformFilenameFilter implements FilenameFilter {
-
-    @Override
-    public boolean accept(File dir, String name) {
-        return FilenameUtil.isXslFile(name) || FilenameUtil.isXqueryFile(name) || FilenameUtil.isJavascriptFile(name);
-    }
-}
-
-class NamespaceFilenameFilter implements FilenameFilter {
-
-    @Override
-    public boolean accept(File dir, String name) {
-        return true;
-    }
-}

src/test/resources/sample-base-dir/options/.shouldbeignored.txt

@@ -0,0 +1 @@
+This file should be ignored because it starts with a "."