#115 An exception is propagated by default when loading files

Author: rjrudin

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.12.0
+version=3.13.develop

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

@@ -21,7 +21,7 @@ public abstract class BatchWriterSupport extends LoggingObject implements BatchW
 
 	private TaskExecutor taskExecutor;
 	private int threadCount = 16;
-	private WriteListener writeListener;
+	private WriteListener writeListener = new DefaultWriteListener();
 
 	@Override
 	public void initialize() {
@@ -42,6 +42,10 @@ public void waitForCompletion() {
 			}
 			taskExecutor = null;
 		}
+
+		if (writeListener != null) {
+			writeListener.afterCompletion();
+		}
 	}
 
 	protected void initializeDefaultTaskExecutor() {

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

@@ -0,0 +1,25 @@
+package com.marklogic.client.ext.batch;
+
+import com.marklogic.client.document.DocumentWriteOperation;
+
+import java.util.List;
+
+public class DefaultWriteListener extends WriteListenerSupport {
+
+	private Throwable firstError;
+
+	@Override
+	public synchronized void onWriteFailure(Throwable ex, List<? extends DocumentWriteOperation> items) {
+		if (firstError == null) {
+			firstError = ex;
+		}
+	}
+
+	@Override
+	public void afterCompletion() {
+		if (firstError != null) {
+			throw new RuntimeException("Caught exception before writing was completed: " +
+				firstError.getMessage(), firstError);
+		}
+	}
+}

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

@@ -10,4 +10,6 @@
 public interface WriteListener {
 
 	void onWriteFailure(Throwable ex, List<? extends DocumentWriteOperation> items);
+
+	void afterCompletion();
 }

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

@@ -0,0 +1,20 @@
+package com.marklogic.client.ext.batch;
+
+import com.marklogic.client.document.DocumentWriteOperation;
+
+import java.util.List;
+
+/**
+ * WriteListener implementors should extend this to avoid issues when methods are added to
+ * WriteListener.
+ */
+public class WriteListenerSupport implements WriteListener {
+
+	@Override
+	public void onWriteFailure(Throwable ex, List<? extends DocumentWriteOperation> items) {
+	}
+
+	@Override
+	public void afterCompletion() {
+	}
+}

src/test/java/com/marklogic/client/ext/batch/RestBatchWriterTest.java

@@ -26,6 +26,24 @@ public class RestBatchWriterTest extends AbstractIntegrationTest {
 	@Test
 	public void failureTest() {
 		RestBatchWriter writer = new RestBatchWriter(newClient("Documents"));
+
+		DocumentWriteOperation op = new DocumentWriteOperationImpl(DocumentWriteOperation.OperationType.DOCUMENT_WRITE,
+			"/test.xml", null, new StringHandle("<hello>world</hello>asdf"));
+
+		writer.initialize();
+		writer.write(Arrays.asList(op));
+
+		try {
+			writer.waitForCompletion();
+			fail("The error caused by malformed XML should have been thrown");
+		} catch (Exception ex) {
+			// Expected
+		}
+	}
+
+	@Test
+	public void failureTestWithCustomListener() {
+		RestBatchWriter writer = new RestBatchWriter(newClient("Documents"));
 		TestWriteListener testWriteListener = new TestWriteListener();
 		writer.setWriteListener(testWriteListener);
 
@@ -70,7 +88,7 @@ public void writeDocumentWithTransform() throws IOException {
 	}
 }
 
-class TestWriteListener implements WriteListener {
+class TestWriteListener extends WriteListenerSupport {
 	public Throwable caughtError;
 
 	@Override