#13 Finish issue-13

Author: rjrudin

CHANGELOG.mdown

@@ -1,5 +1,9 @@
 # ml-gradle releases
 
+## 2.5.1
+
+* [#13](https://github.com/rjrudin/ml-javaclient-util/issues/13) Added support for loading from any directory in source path 
+
 ## 2.5
 
 * Added classes from ml-xcc-util
@@ -28,3 +32,23 @@
 ## 2.1
 
 * Repackaged
+
+## Old changelog
+
+## 2.0   - ML8 compatibility
+
+## 2.0.1 - BasicConfig now assumes 8000 as the XDBC port
+
+## 2.0.2 - XccAssetLoader added to DefaultModulesLoader
+
+## 2.0.3 - Targeting Java 1.7
+
+## 2.0.4 - Depending on com.marklogic:java-client-api:3.0.2
+
+## 2.0.5 - Now supports *.sjs transforms
+
+## 2.0.6 - #8 now supports loading rest-properties.json file
+
+## 2.0.7 - #8 Fix for not loading rest-properties.json when it's not been modified
+
+## 2.0.8 - Added TestServerModulesFinder

build.gradle

@@ -56,7 +56,7 @@ if (project.hasProperty("myBintrayUser")) {
       licenses = ['Apache-2.0']
       vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
       version {
-        name = "2.5"
+        name = "2.5.1"
         released = new Date()
       }
     }

gradle.properties

@@ -1,14 +1,4 @@
 group=com.marklogic
 publishUrl=file:../gh-pages-marklogic-java/releases
 javadocsDir=../gh-pages-marklogic-java/javadocs
-
-# 2.0   - ML8 compatibility
-# 2.0.1 - BasicConfig now assumes 8000 as the XDBC port
-# 2.0.2 - XccAssetLoader added to DefaultModulesLoader
-# 2.0.3 - Targeting Java 1.7
-# 2.0.4 - Depending on com.marklogic:java-client-api:3.0.2
-# 2.0.5 - Now supports *.sjs transforms
-# 2.0.6 - #8 now supports loading rest-properties.json file
-# 2.0.7 - #8 Fix for not loading rest-properties.json when it's not been modified
-# 2.0.8 - Added TestServerModulesFinder
-version=2.5
+version=2.5.1

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

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.marklogic.client.helper.FilenameUtil;
@@ -18,6 +19,14 @@ public abstract class BaseModulesFinder implements ModulesFinder {
     private FilenameFilter transformFilenameFilter = new TransformFilenameFilter();
     private FilenameFilter namespaceFilenameFilter = new NamespaceFilenameFilter();
 
+    /**
+     * Whether to treat paths that aren't recognized by this class (i.e. not services, options, namespaces, or
+     * transforms) as asset paths that will then be loaded as asset modules.
+     */
+    private boolean includeUnrecognizedPathsAsAssetPaths = true;
+
+    private String extPath = "ext";
+    private String rootPath = "root";
     private String servicesPath = "services";
     private String optionsPath = "options";
     private String namespacesPath = "namespaces";
@@ -59,9 +68,24 @@ protected void addAssetDirectories(Modules modules, File baseDir) {
         if (dir.exists()) {
             dirs.add(dir);
         }
+
+        if (includeUnrecognizedPathsAsAssetPaths) {
+            List<String> recognizedPaths = getRecognizedPaths();
+            for (File f : baseDir.listFiles()) {
+                if (f.isDirectory() && !recognizedPaths.contains(f.getName())) {
+                    dirs.add(f);
+                }
+            }
+        }
+
         modules.setAssetDirectories(dirs);
     }
 
+    protected List<String> getRecognizedPaths() {
+        return Arrays
+                .asList(new String[] { extPath, rootPath, optionsPath, servicesPath, transformsPath, namespacesPath });
+    }
+
     protected void addOptions(Modules modules, File baseDir) {
         File queryOptionsBaseDir = new File(baseDir, optionsPath);
         List<File> queryOptions = new ArrayList<>();
@@ -129,6 +153,22 @@ public void setNamespacesPath(String namespacesPath) {
     public void setTransformsPath(String transformsPath) {
         this.transformsPath = transformsPath;
     }
+
+    public boolean isIncludeUnrecognizedPathsAsAssetPaths() {
+        return includeUnrecognizedPathsAsAssetPaths;
+    }
+
+    public void setIncludeUnrecognizedPathsAsAssetPaths(boolean includeUnrecognizedPathsAsAssetPaths) {
+        this.includeUnrecognizedPathsAsAssetPaths = includeUnrecognizedPathsAsAssetPaths;
+    }
+
+    public void setExtPath(String extPath) {
+        this.extPath = extPath;
+    }
+
+    public void setRootPath(String rootPath) {
+        this.rootPath = rootPath;
+    }
 }
 
 class AssetFilenameFilter implements FilenameFilter {

src/test/java/com/marklogic/client/modulesloader/impl/DefaultModulesFinderTest.java

@@ -10,7 +10,6 @@
 
 import com.marklogic.client.modulesloader.Modules;
 import com.marklogic.client.modulesloader.ModulesFinder;
-import com.marklogic.client.modulesloader.impl.DefaultModulesFinder;
 
 public class DefaultModulesFinderTest extends Assert {
 
@@ -20,15 +19,16 @@ public class DefaultModulesFinderTest extends Assert {
     public void baseDirWithExtensionsOfEachKind() throws IOException {
         Modules modules = sut.findModules(getBaseDir("sample-base-dir"));
         assertEquals(1, modules.getOptions().size());
-        assertEquals("Only recognized XQuery files should be included; the XML file should be ignored", 2, modules
-                .getServices().size());
-        assertEquals("Only recognized XSL files should be included; the XML file should be ignored", 4, modules
-                .getTransforms().size());
+        assertEquals("Only recognized XQuery files should be included; the XML file should be ignored", 2,
+                modules.getServices().size());
+        assertEquals("Only recognized XSL files should be included; the XML file should be ignored", 4,
+                modules.getTransforms().size());
 
         List<File> dirs = modules.getAssetDirectories();
-        assertEquals(2, dirs.size());
+        assertEquals(3, dirs.size());
         assertEquals("ext", dirs.get(0).getName());
         assertEquals("root", dirs.get(1).getName());
+        assertEquals("include-this-too", dirs.get(2).getName());
 
         assertEquals(
                 "Namespace files don't have to fit any filename format; the body of the file should be the namespace URI",

src/test/resources/sample-base-dir/include-this-too/module3.xqy

@@ -0,0 +1,7 @@
+xquery version "1.0-ml";
+
+module namespace module1 = "urn:sample:module1";
+
+declare function sample() {
+  "Hello module1"
+};