Merge pull request #167 from marklogic-community/feature/150-load-schemas

DEVEXP-150: No error thrown when no schemas to load and invalid client

Author: rjrudin

src/main/java/com/marklogic/client/ext/file/GenericFileLoader.java

@@ -71,7 +71,6 @@ public GenericFileLoader(BatchWriter batchWriter) {
 	 * @return list of files from the given paths
 	 */
 	public List<DocumentFile> loadFiles(String... paths) {
-		batchWriter.initialize();
 		List<DocumentFile> documentFiles = getDocumentFiles(paths);
 		writeDocumentFiles(documentFiles);
 		return documentFiles;
@@ -84,6 +83,7 @@ protected final List<DocumentFile> getDocumentFiles(String... paths) {
 
 	protected final void writeDocumentFiles(List<DocumentFile> documentFiles) {
 		if (documentFiles != null && !documentFiles.isEmpty()) {
+			batchWriter.initialize();
 			writeBatchOfDocuments(documentFiles, 0);
 			if (waitForCompletion) {
 				batchWriter.waitForCompletion();

src/main/java/com/marklogic/client/ext/schemasloader/impl/DefaultSchemasLoader.java

@@ -84,8 +84,12 @@ protected void initializeDefaultSchemasLoader() {
 	 */
 	@Override
 	public List<DocumentFile> loadSchemas(String... paths) {
+		final List<DocumentFile> documentFiles = super.getDocumentFiles(paths);
+		if (documentFiles.isEmpty()) {
+			return documentFiles;
+		}
+
 		if (TdeUtil.templateBatchInsertSupported(schemasDatabaseClient) && StringUtils.hasText(tdeValidationDatabase)) {
-			final List<DocumentFile> documentFiles = super.getDocumentFiles(paths);
 			final List<DocumentFile> tdeFiles = new ArrayList<>();
 			final List<DocumentFile> nonTdeFiles = new ArrayList<>();
 
@@ -111,7 +115,8 @@ public List<DocumentFile> loadSchemas(String... paths) {
 			return documentFiles;
 		}
 
-		return super.loadFiles(paths);
+		writeDocumentFiles(documentFiles);
+		return documentFiles;
 	}
 
 	public String getTdeValidationDatabase() {

src/test/java/com/marklogic/client/ext/schemasloader/impl/LoadSchemasTest.java

@@ -1,5 +1,6 @@
 package com.marklogic.client.ext.schemasloader.impl;
 
+import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.ext.batch.RestBatchWriter;
 import com.marklogic.client.ext.file.DocumentFile;
 import com.marklogic.client.ext.helper.ClientHelper;
@@ -9,15 +10,14 @@
 import java.nio.file.Paths;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LoadSchemasTest extends AbstractSchemasTest {
 
 	@Test
 	public void test() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(client);
-		RestBatchWriter writer = (RestBatchWriter)loader.getBatchWriter();
+		RestBatchWriter writer = (RestBatchWriter) loader.getBatchWriter();
 		assertEquals(1, writer.getThreadCount(), "Should default to 1 so that any error from loading a document " +
 			"into a schemas database is immediately thrown to the client");
 
@@ -57,4 +57,25 @@ public void testTemplateBatchInsert() {
 		assertTrue(handle.getPermissions().get("rest-writer").contains(DocumentMetadataHandle.Capability.UPDATE),
 			"Permissions defined in permissions.properties should be applied on the document");
 	}
+
+	@Test
+	public void invalidClientAndNoFilesToLoad() {
+		DefaultSchemasLoader loader = new DefaultSchemasLoader(newClient("invalid-database-doesnt-exist"));
+		List<DocumentFile> files = loader.loadSchemas(Paths.get("src", "test", "resources", "no-schemas").toString());
+		assertEquals(0, files.size(),
+			"When there aren't any files to load, then no error should be thrown when the client is invalid (which in " +
+				"this scenario is due to a missing database); instead, an empty list should be returned");
+	}
+
+	@Test
+	public void invalidClientWithFilesToLoad() {
+		DefaultSchemasLoader loader = new DefaultSchemasLoader(newClient("invalid-database-doesnt-exist"));
+		FailedRequestException ex = assertThrows(FailedRequestException.class,
+			() -> loader.loadSchemas(Paths.get("src", "test", "resources", "good-schemas").toString()));
+
+		String message = ex.getServerMessage();
+		assertTrue(message.startsWith("XDMP-NOSUCHDB: No such database invalid-database-doesnt-exist"),
+			"Because there are files to load and the client points to a database that doesn't exist, an error " +
+				"should be thrown with no files loaded; actual message: " + message);
+	}
 }

src/test/resources/no-schemas/.gitignore

@@ -0,0 +1 @@
+# This file is only included to ensure this directory exists for the purpose of testing