#121 DefaultSchemasLoader defaults to one thread

Author: rjrudin

src/main/java/com/marklogic/client/ext/batch/BatchWriterSupport.java

@@ -114,4 +114,8 @@ protected WriteListener getWriteListener() {
 	public void setWriteListener(WriteListener writeListener) {
 		this.writeListener = writeListener;
 	}
+
+	public int getThreadCount() {
+		return threadCount;
+	}
 }

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

@@ -2,12 +2,14 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.ext.batch.BatchWriter;
+import com.marklogic.client.ext.batch.RestBatchWriter;
 import com.marklogic.client.ext.file.DocumentFile;
 import com.marklogic.client.ext.file.GenericFileLoader;
 import com.marklogic.client.ext.modulesloader.impl.DefaultFileFilter;
 import com.marklogic.client.ext.schemasloader.SchemasLoader;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 public class DefaultSchemasLoader extends GenericFileLoader implements SchemasLoader {
 
@@ -34,7 +36,15 @@ public DefaultSchemasLoader(DatabaseClient schemasDatabaseClient) {
 	 * @param tdeValidationDatabase
 	 */
 	public DefaultSchemasLoader(DatabaseClient schemasDatabaseClient, String tdeValidationDatabase) {
-		super(schemasDatabaseClient);
+		super(((Supplier<BatchWriter>) () -> {
+			RestBatchWriter writer = new RestBatchWriter(schemasDatabaseClient);
+			// Default this to 1, as it's not typical to have such a large number of schemas to load that multiple threads
+			// are needed. This also ensures that if an error occurs when loading a schema, it's thrown to the client.
+			writer.setThreadCount(1);
+			writer.setReleaseDatabaseClients(false);
+			return writer;
+		}).get());
+
 		this.schemasDatabaseClient = schemasDatabaseClient;
 		this.tdeValidationDatabase = tdeValidationDatabase;
 		initializeDefaultSchemasLoader();

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

@@ -28,9 +28,6 @@ public void test() {
 		assertTrue(collections.contains("ruleset-xyz"));
 
 		DocumentMetadataHandle.DocumentPermissions perms = helper.getMetadata("/ruleset1.xml").getPermissions();
-		assertEquals("Should have the two default perms plus the two custom ones", 4, perms.size());
-		assertEquals(DocumentMetadataHandle.Capability.READ, perms.get("rest-reader").iterator().next());
-		assertEquals(DocumentMetadataHandle.Capability.UPDATE, perms.get("rest-writer").iterator().next());
 		assertEquals(DocumentMetadataHandle.Capability.READ, perms.get("rest-admin").iterator().next());
 		assertEquals(DocumentMetadataHandle.Capability.UPDATE, perms.get("manage-admin").iterator().next());
 	}

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.ext.batch.RestBatchWriter;
 import com.marklogic.client.ext.file.DocumentFile;
 import com.marklogic.client.ext.helper.ClientHelper;
 import org.junit.Test;
@@ -12,6 +13,9 @@ public class LoadSchemasTest extends AbstractSchemasTest {
 	@Test
 	public void test() {
 		DefaultSchemasLoader loader = new DefaultSchemasLoader(client);
+		RestBatchWriter writer = (RestBatchWriter)loader.getBatchWriter();
+		assertEquals("Should default to 1 so that any error from loading a document " +
+			"into a schemas database is immediately thrown to the client", 1, writer.getThreadCount());
 
 		List<DocumentFile> files = loader.loadSchemas(Paths.get("src", "test", "resources", "schemas").toString());
 		assertEquals(5, files.size());