Merge branch 'master' into dev

# Conflicts:
#	gradle.properties
#	src/main/java/com/marklogic/client/batch/RestBatchWriter.java
#	src/main/java/com/marklogic/client/modulesloader/impl/DefaultModulesLoader.java

Author: Rob Rudin

README.md

@@ -3,18 +3,53 @@
 ml-javaclient-util is a library of Java classes that provide some useful functionality on top of 
 the [MarkLogic Java Client API](http://docs.marklogic.com/guide/java). Those features include:
 
-- Support for loading any kind of module using the REST API
-- Support for automatically loading a new/modified module using the REST API
-- Basic integration with Spring via a Spring FactoryBean
+- Support for [loading modules via the REST API](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/modulesloader)
+- Basic integration with [Spring via a Spring FactoryBean](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/spring)
+- Library for [parallelizing batched writes](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/batch)
+- Spring-style [template/callback library for XCC](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/xcc/template)
+- Support for generating MarkLogic 9 [Entity Services modules](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/es)
+- Support for [importing/exporting qconsole workspaces] (https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/qconsole)
+ 
+This is a lower-level library that is primarily used via [ml-app-deployer](https://github.com/rjrudin/ml-app-deployer) 
+and [ml-gradle](https://github.com/rjrudin/ml-gradle) and [ml-junit](https://github.com/rjrudin/ml-junit). But you can use it by itself too.
 
-This is a lower-level library that is primarily used via [ml-app-deployer](https://github.com/rjrudin/ml-app-deployer) and [ml-gradle](https://github.com/rjrudin/ml-gradle) and [ml-junit](https://github.com/rjrudin/ml-junit). But you can use it by itself too.
+### Loading Modules
 
 Here's a sample of loading modules - though it's best to look at the aforementioned projects to see all the ways this can be done:
 
     DatabaseClient client = DatabaseClientFactory.newClient(...); // Use the ML Java Client API
-    RestApiAssetLoader assetLoader = new RestApiAssetLoader(client); // Can use XCC or the REST API to load asset modules
+    XccAssetLoader assetLoader = new XccAssetLoader(client); // Can use XCC or the REST API to load asset modules
     DefaultModulesLoader modulesLoader = new DefaultModulesLoader(assetLoader);
     File modulesDir = new File("src/main/ml-modules");
     ModulesFinder modulesFinder = new DefaultModulesFinder(); // Allows for adjusting where modules are stored on a filesystem
     modulesLoader.loadModules(modulesDir, modulesFinder, client);
-    
+
+### Parallelized batch writes
+
+The [BatchWriter](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/batch) library
+was created primarily for applications using [marklogic-spring-batch](https://github.com/sastafford/marklogic-spring-batch). But 
+it can be used in any environment. It provides the following features:
+
+1. Uses Spring's [TaskExecutor library](https://docs.spring.io/spring/docs/current/spring-framework-reference/html/scheduling.html) for parallelizing writes
+1. Supports writes via the REST API or XCC
+
+Via Spring's TaskExecutor library, you can essentially throw an infinite number of documents at this interface. The library
+will default to a sensible implementation of [ThreadPoolTaskExecutor](http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.html),
+but you can override that with any TaskExecutor implementation you like.
+
+Once MarkLogic 9 is available, an implementation will be used that depends on the new Data Movement SDK, which is being
+added to the MarkLogic Java Client API. 
+
+Here's a sample using two DatabaseClient instances:
+
+		// This is all basic Java Client API stuff
+    DatabaseClient client1 = DatabaseClientFactory.newClient("host1", ...);
+    DatabaseClient client2 = DatabaseClientFactory.newClient("host2", ...);
+    DocumentWriteOperation doc1 = new DocumentWriteOperationImpl("test1.xml", ...);
+    DocumentWriteOperation doc2 = new DocumentWriteOperationImpl("test2.xml", ...);
+    
+    // Here's how BatchWriter works
+    BatchWriter writer = new RestBatchWriter(Arrays.asList(client1, client2));
+    writer.initialize();
+    writer.write(Arrays.asList(doc1, doc2));
+    writer.waitForCompletion();

gradle.properties

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

src/main/java/com/marklogic/client/batch/RestBatchWriter.java

@@ -1,9 +1,10 @@
 package com.marklogic.client.batch;
 
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.document.DocumentManager;
 import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.document.DocumentWriteSet;
-import com.marklogic.client.document.GenericDocumentManager;
+import com.marklogic.client.document.ServerTransform;
 
 import java.util.List;
 
@@ -17,6 +18,7 @@ public class RestBatchWriter extends BatchWriterSupport {
 	private List<DatabaseClient> databaseClients;
 	private int clientIndex = 0;
 	private boolean releaseDatabaseClients = true;
+	private ServerTransform serverTransform;
 
 	public RestBatchWriter(List<DatabaseClient> databaseClients) {
 		this.databaseClients = databaseClients;
@@ -33,7 +35,7 @@ public void write(final List<? extends DocumentWriteOperation> items) {
 		getTaskExecutor().execute(new Runnable() {
 			@Override
 			public void run() {
-				GenericDocumentManager mgr = client.newDocumentManager();
+				DocumentManager<?, ?> mgr = buildDocumentManager(client);
 				DocumentWriteSet set = mgr.newWriteSet();
 				for (DocumentWriteOperation item : items) {
 					set.add(item);
@@ -42,14 +44,29 @@ public void run() {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Writing " + count + " documents to MarkLogic");
 				}
-				mgr.write(set);
+				if (serverTransform != null) {
+					mgr.write(set, serverTransform);
+				} else {
+					mgr.write(set);
+				}
 				if (logger.isInfoEnabled()) {
 					logger.info("Wrote " + count + " documents to MarkLogic");
 				}
 			}
 		});
 	}
 
+	/**
+	 * Factored out so it can be overridden for e.g. those already using MarkLogic 9, who may need to set the content
+	 * format on the manager.
+	 *
+	 * @param client
+	 * @return
+	 */
+	protected DocumentManager<?, ?> buildDocumentManager(DatabaseClient client) {
+		return client.newDocumentManager();
+	}
+
 	@Override
 	public void waitForCompletion() {
 		super.waitForCompletion();
@@ -66,4 +83,24 @@ public void waitForCompletion() {
 	public void setReleaseDatabaseClients(boolean releaseDatabaseClients) {
 		this.releaseDatabaseClients = releaseDatabaseClients;
 	}
+
+	public void setServerTransform(ServerTransform serverTransform) {
+		this.serverTransform = serverTransform;
+	}
+
+	protected List<DatabaseClient> getDatabaseClients() {
+		return databaseClients;
+	}
+
+	protected int getClientIndex() {
+		return clientIndex;
+	}
+
+	protected boolean isReleaseDatabaseClients() {
+		return releaseDatabaseClients;
+	}
+
+	protected ServerTransform getServerTransform() {
+		return serverTransform;
+	}
 }

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

@@ -82,7 +82,7 @@ protected void performBulkStaticCheck(List<LoadedAsset> assets) {
 	protected String buildXqueryForStaticallyCheckingModule() {
 		String xquery =
 			"try { xdmp:invoke($uri, (), <options xmlns='xdmp:eval'><static-check>true</static-check></options>) } " +
-				"catch ($e) { xdmp:log($e), " +
+				"catch ($e) { " +
 				"if ($e/*:code = 'XDMP-NOEXECUTE') then () " +
 				"else if ($e/*:code = 'XDMP-EVALLIBMOD') then ";
 		if (checkLibraryModules) {

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

@@ -80,7 +80,7 @@ public DefaultModulesLoader(XccAssetLoader xccAssetLoader) {
         this.xccAssetLoader = xccAssetLoader;
     }
 
-    protected void initializeDefaultTaskExecutor() {
+    public void initializeDefaultTaskExecutor() {
     	if (taskThreadCount > 1) {
 		    ThreadPoolTaskExecutor tpte = new ThreadPoolTaskExecutor();
 		    tpte.setCorePoolSize(taskThreadCount);
@@ -530,6 +530,9 @@ public void run() {
 	 * @param r
 	 */
 	protected void executeTask(Runnable r) {
+		if (taskExecutor == null) {
+			initializeDefaultTaskExecutor();
+		}
 		taskExecutor.execute(r);
     }