#122 Now catching exceptions from loading non-REST modules

Author: rjrudin

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.13.3
+version=3.13.4-SNAPSHOT

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

@@ -358,26 +358,21 @@ protected void loadAssets(Modules modules, Set<Resource> loadedModules) {
 		}
 
 		if (includeFilenamePattern != null) {
-			// Make sure the DocumentFileReader is not null
-			assetFileLoader.initializeDocumentFileReader();
-			DocumentFileReader dfr = assetFileLoader.getDocumentFileReader();
-			if (dfr instanceof DefaultDocumentFileReader) {
-				DefaultDocumentFileReader reader = (DefaultDocumentFileReader) dfr;
-				reader.addDocumentFileProcessor(documentFile -> {
-					File f = documentFile.getFile();
-					if (f == null) {
-						return null;
-					}
-					if (!includeFilenamePattern.matcher(f.getAbsolutePath()).matches()) {
-						return null;
-					}
-					return documentFile;
-				});
+			applyIncludeFilenamePattern();
+		}
+
+		List<DocumentFile> list = null;
+		try {
+			list = assetFileLoader.loadFiles(paths);
+		} catch (RuntimeException ex) {
+			if (catchExceptions) {
+				logger.error("Error loading modules: " + ex.getMessage());
+			} else {
+				throw ex;
 			}
 		}
 
-		List<DocumentFile> list = assetFileLoader.loadFiles(paths);
-		if (staticChecker != null && !list.isEmpty()) {
+		if (staticChecker != null && list != null && !list.isEmpty()) {
 			try {
 				staticChecker.checkLoadedAssets(list);
 			} catch (RuntimeException ex) {
@@ -389,8 +384,29 @@ protected void loadAssets(Modules modules, Set<Resource> loadedModules) {
 			}
 		}
 
-		for (DocumentFile asset : list) {
-			loadedModules.add(asset.getResource());
+		if (list != null) {
+			for (DocumentFile asset : list) {
+				loadedModules.add(asset.getResource());
+			}
+		}
+	}
+
+	protected void applyIncludeFilenamePattern() {
+		// Make sure the DocumentFileReader is not null
+		assetFileLoader.initializeDocumentFileReader();
+		DocumentFileReader dfr = assetFileLoader.getDocumentFileReader();
+		if (dfr instanceof DefaultDocumentFileReader) {
+			DefaultDocumentFileReader reader = (DefaultDocumentFileReader) dfr;
+			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/modulesloader/impl/LoadModulesTest.java

@@ -139,6 +139,23 @@ public void invalidRestModule() {
 		modulesLoader.loadModules(dir, new DefaultModulesFinder(), client);
 	}
 
+	@Test
+	public void catchExceptionsForInvalidModules() {
+		String dir = Paths.get("src", "test", "resources", "bad-modules").toString();
+
+		try {
+			modulesLoader.loadModules(dir, new DefaultModulesFinder(), client);
+			fail("Loading modules should have failed because of an invalid JSON file");
+		} catch (RuntimeException re) {
+			assertTrue(re.getMessage().contains("Unexpected end of file in JSON"));
+		}
+
+		modulesLoader.setCatchExceptions(true);
+		// This should now succeed since we're catching exceptions
+		Set<Resource> loadedModules = modulesLoader.loadModules(dir, new DefaultModulesFinder(), client);
+		assertTrue("There's only the one invalid module, so nothing should have been loaded", loadedModules.isEmpty());
+	}
+
 	/**
 	 * This test is a little brittle because it assumes the URI of options/services/transforms that are loaded
 	 * into the Modules database.

src/test/resources/bad-modules/root/invalid.json

@@ -0,0 +1,2 @@
+{
+	"this is invalid":