#129 Depending on ML Java 5.1.0

Also upgraded XCC version

Author: rjrudin

build.gradle

@@ -7,8 +7,8 @@ plugins {
 	id "com.github.jk1.dependency-license-report" version "1.3"
 }
 
-sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
+sourceCompatibility = "9"
+targetCompatibility = "9"
 
 repositories {
   jcenter()
@@ -17,8 +17,8 @@ repositories {
 }
 
 dependencies {
-  api 'com.marklogic:marklogic-client-api:4.2.0'
-  api 'com.marklogic:marklogic-xcc:9.0.9'
+  api 'com.marklogic:marklogic-client-api:5.1.0'
+  api 'com.marklogic:marklogic-xcc:10.0.3'
   api 'org.jdom:jdom2:2.0.6'
   api 'org.springframework:spring-context:4.3.7.RELEASE'
 

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

@@ -1,7 +1,11 @@
 package com.marklogic.client.ext.file;
 
 import com.marklogic.client.document.DocumentWriteOperation;
-import com.marklogic.client.io.*;
+import com.marklogic.client.impl.DocumentWriteOperationImpl;
+import com.marklogic.client.io.DocumentMetadataHandle;
+import com.marklogic.client.io.Format;
+import com.marklogic.client.io.InputStreamHandle;
+import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.io.marker.AbstractWriteHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 import org.springframework.core.io.FileSystemResource;
@@ -12,14 +16,14 @@
 import java.nio.file.Path;
 
 /**
- * Encapsulates a file that should be written to MarkLogic as a single document. Implements DocumentWriteOperation so
- * that it can be easily written via the Java Client API.
- *
- * The modifiedContent allows for the content of this DocumentWriteOperation to be set via that property instead of via
- * the File. The assumption is that something like a DocumentFileProcessor has read in the contents of the File used to
- * construct this class,
+ * Encapsulates a file that should be written to MarkLogic as a single document. A DocumentWriteOperation can be
+ * constructed via the toDocumentWriteOperation method.
+ * <p>
+ * The modifiedContent allows for the content of the constructed DocumentWriteOperation to be set via that property
+ * instead of via the File. The assumption is that something like a DocumentFileProcessor has read in the contents of
+ * the File used to construct this class.
  */
-public class DocumentFile implements DocumentWriteOperation {
+public class DocumentFile {
 
 	private String uri;
 	private Resource resource;
@@ -43,22 +47,28 @@ private void init(String uri, Resource resource) {
 		this.documentMetadata = new DocumentMetadataHandle();
 	}
 
-	@Override
+	public DocumentWriteOperation toDocumentWriteOperation() {
+		return new DocumentWriteOperationImpl(
+			getOperationType(),
+			uri,
+			getMetadata(),
+			getContent(),
+			getTemporalDocumentURI()
+		);
+	}
+
 	public String getUri() {
 		return uri;
 	}
 
-	@Override
-	public OperationType getOperationType() {
-		return OperationType.DOCUMENT_WRITE;
+	public DocumentWriteOperation.OperationType getOperationType() {
+		return DocumentWriteOperation.OperationType.DOCUMENT_WRITE;
 	}
 
-	@Override
 	public DocumentMetadataWriteHandle getMetadata() {
 		return documentMetadata;
 	}
 
-	@Override
 	public AbstractWriteHandle getContent() {
 		if (modifiedContent != null) {
 			StringHandle h = new StringHandle(modifiedContent);
@@ -73,7 +83,6 @@ public AbstractWriteHandle getContent() {
 		return format != null ? h.withFormat(format) : h;
 	}
 
-	@Override
 	public String getTemporalDocumentURI() {
 		return temporalDocumentURI;
 	}
@@ -143,6 +152,7 @@ public Path getRootPath() {
 
 	/**
 	 * Optional to set - the Path that this File was loaded relative to
+	 *
 	 * @param rootPath
 	 */
 	public void setRootPath(Path rootPath) {

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

@@ -1,6 +1,7 @@
 package com.marklogic.client.ext.file;
 
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.ext.batch.BatchWriter;
 import com.marklogic.client.ext.batch.RestBatchWriter;
 import com.marklogic.client.ext.helper.LoggingObject;
@@ -10,12 +11,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Generic implementation of FileLoader. Delegates to a DocumentFileReader for reading from a set of file paths, and
  * delegates to a BatchWriter for writing to MarkLogic (where that BatchWriter could use XCC, the REST API, or the
  * Data Movement SDK in ML9).
- *
+ * <p>
  * The batchSize property defaults to null, which means all files are written in one call via the BatchWriter. Setting
  * this means that the List of DocumentFile objects read from the DocumentFileReader will be written in batches, each
  * the size of the batchSize property, except for the final one that may be less than this size.
@@ -108,15 +110,18 @@ protected void writeBatchOfDocuments(List<DocumentFile> documentFiles, final int
 
 		List<DocumentFile> batch = documentFiles.subList(startPosition, endPosition);
 		if (!batch.isEmpty()) {
-			if (logger.isInfoEnabled()) {
+			final boolean infoEnabled = logger.isInfoEnabled();
+			if (infoEnabled) {
 				logger.info(format("Writing %d files", batch.size()));
-				if (logFileUris) {
-					for (DocumentFile df : batch) {
-						logger.info("Writing: " + df.getUri());
-					}
-				}
 			}
-			batchWriter.write(batch);
+			List<DocumentWriteOperation> documentWriteOperations = batch.stream().map(file -> {
+				if (logFileUris && infoEnabled) {
+					final String uri = file.getUri();
+					logger.info("Writing: " + uri != null ? uri : file.getTemporalDocumentURI());
+				}
+				return file.toDocumentWriteOperation();
+			}).collect(Collectors.toList());
+			batchWriter.write(documentWriteOperations);
 		}
 
 		if (endPosition < documentFilesSize) {
@@ -161,7 +166,7 @@ public void prepareAbstractDocumentFileReader(AbstractDocumentFileReader reader)
 			FormatDocumentFileProcessor processor = reader.getFormatDocumentFileProcessor();
 			FormatGetter formatGetter = processor.getFormatGetter();
 			if (formatGetter instanceof DefaultDocumentFormatGetter) {
-				DefaultDocumentFormatGetter ddfg = (DefaultDocumentFormatGetter)formatGetter;
+				DefaultDocumentFormatGetter ddfg = (DefaultDocumentFormatGetter) formatGetter;
 				for (String ext : additionalBinaryExtensions) {
 					ddfg.getBinaryExtensions().add(ext);
 				}
@@ -181,7 +186,7 @@ public void prepareAbstractDocumentFileReader(AbstractDocumentFileReader reader)
 	 */
 	protected void applyTokenReplacerOnKnownDocumentProcessors(AbstractDocumentFileReader reader) {
 		if (reader instanceof DefaultDocumentFileReader && tokenReplacer != null) {
-			DefaultDocumentFileReader defaultReader = (DefaultDocumentFileReader)reader;
+			DefaultDocumentFileReader defaultReader = (DefaultDocumentFileReader) reader;
 			CollectionsFileDocumentFileProcessor cp = defaultReader.getCollectionsFileDocumentFileProcessor();
 			if (cp != null) {
 				cp.setTokenReplacer(tokenReplacer);