#87 Pattern for asset modules to load works properly now

Author: rjrudin

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.3.0
+version=3.3.1

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

@@ -263,7 +263,16 @@ protected void loadAssets(Modules modules, Set<Resource> loadedModules) {
 			DocumentFileReader dfr = assetFileLoader.getDocumentFileReader();
 			if (dfr instanceof DefaultDocumentFileReader) {
 				DefaultDocumentFileReader reader = (DefaultDocumentFileReader)dfr;
-				reader.addFileFilter(pathname -> includeFilenamePattern.matcher(pathname.getAbsolutePath()).matches());
+				reader.addDocumentFileProcessor(documentFile -> {
+					File f = documentFile.getFile();
+					if (f == null) {
+						return null;
+					}
+					if (!includeFilenamePattern.matcher(f.getAbsolutePath()).matches()) {
+						return null;
+					}
+					return documentFile;
+				});
 			}
 		}
 

src/test/java/com/marklogic/client/ext/datamovement/job/ExportDocumentsToSingleFileTest.java

@@ -43,7 +43,7 @@ public void configureWithProperties() throws Exception {
 
 		String exportedXml = new String(FileCopyUtils.copyToByteArray(job.getExportFile()));
 		logger.info("Exported XML: " + exportedXml);
-		assertTrue(exportedXml.startsWith("<results><record><test>"));
+		assertTrue(exportedXml.startsWith("<results>\n<record><test>"));
 		assertTrue(exportedXml.endsWith("</test></record></results>"));
 	}
 }

src/test/java/com/marklogic/client/ext/modulesloader/impl/LoadModulesTest.java

@@ -74,7 +74,8 @@ public void withFilenamePattern() {
 		verifyModuleCountWithPattern(".*transforms.*", "Should only load the 5 transforms", 5);
 		verifyModuleCountWithPattern(".*services.*", "Should only load the 3 services", 3);
 		verifyModuleCountWithPattern(".*", "Should load every file", 26);
-		verifyModuleCountWithPattern(".*/ext.*", "Should only load the 7 assets under /ext", 7);
+		verifyModuleCountWithPattern(".*/ext.*(lib|dots)/.*xqy", "Should only load the xqy asset modules " +
+			"under ext/lib and ext/path/with/dots", 2);
 	}
 
 	private void verifyModuleCountWithPattern(String pattern, String message, int count) {