fix #392 - add and test DocumentWriteSet.addAs methods

Author: sammefford

src/main/java/com/marklogic/client/document/DocumentWriteSet.java

@@ -48,6 +48,19 @@ public interface DocumentWriteSet extends Set<DocumentWriteOperation> {
      */
     public DocumentWriteSet add(String docId, AbstractWriteHandle contentHandle);
 
+    /**
+     * Adds to this write set a document with the given docId (server uri)
+     * and contents.
+     * 
+     * The IO class must have been registered before creating the database client.
+     * By default, standard Java IO classes for document content are registered.
+     * 
+     * @param docId	the URI identifier for the document
+     * @param content	an IO representation of the document content
+     * @return this instance (for method chaining)
+     */
+    public DocumentWriteSet addAs(String docId, Object content);
+
     /**
      * Adds to this write set a document with the given docId (server uri),
      * metadata, and contents provided by the handle
@@ -58,6 +71,20 @@ public interface DocumentWriteSet extends Set<DocumentWriteOperation> {
      */
     public DocumentWriteSet add(String docId, DocumentMetadataWriteHandle metadataHandle, AbstractWriteHandle contentHandle);
 
+    /**
+     * Adds to this write set a document with the given docId (server uri),
+     * metadata, and contents.
+     * 
+     * The IO class must have been registered before creating the database client.
+     * By default, standard Java IO classes for document content are registered.
+     * 
+     * @param docId	the URI identifier for the document
+     * @param metadataHandle	a handle for writing the metadata of the document
+     * @param content	an IO representation of the document content
+     * @return this instance (for method chaining)
+     */
+    public DocumentWriteSet addAs(String docId, DocumentMetadataWriteHandle metadataHandle, Object content);
+
     /**
      * Adds to this write set a document with the given uri template, and
      * contents provided by the handle

src/main/java/com/marklogic/client/impl/DocumentWriteSetImpl.java

@@ -15,6 +15,8 @@
  */
 package com.marklogic.client.impl;
 
+import com.marklogic.client.DatabaseClientFactory;
+import com.marklogic.client.impl.Utilities;
 import com.marklogic.client.document.DocumentDescriptor;
 import com.marklogic.client.document.DocumentWriteSet;
 import com.marklogic.client.document.DocumentWriteOperation;
@@ -23,6 +25,7 @@
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.io.marker.AbstractWriteHandle;
+import com.marklogic.client.io.marker.ContentHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
 import java.util.LinkedHashSet;
@@ -46,12 +49,26 @@ public DocumentWriteSet add(String docId, AbstractWriteHandle contentHandle) {
 		return this;
 	}
 
+    public DocumentWriteSet addAs(String docId, Object content) {
+      return addAs(docId, null, content);
+    }
+
     public DocumentWriteSet add(String docId, DocumentMetadataWriteHandle metadataHandle, AbstractWriteHandle contentHandle) {
 		add(new DocumentWriteOperationImpl(OperationType.DOCUMENT_WRITE,
 			docId, metadataHandle, contentHandle));
 		return this;
 	}
 
+    public DocumentWriteSet addAs(String docId, DocumentMetadataWriteHandle metadataHandle, Object content) {
+        if (content == null) throw new IllegalArgumentException("content must not be null");
+
+        Class<?> as = content.getClass();
+        ContentHandle<?> handle = DatabaseClientFactory.getHandleRegistry().makeHandle(as);
+        Utilities.setHandleContent(handle, content);
+
+        return add(docId, metadataHandle, handle);
+    }
+
     public DocumentWriteSet add(DocumentDescriptor desc, AbstractWriteHandle contentHandle) {
 		add(new DocumentWriteOperationImpl(OperationType.DOCUMENT_WRITE,
 			desc.getUri(), null, contentHandle));

src/test/java/com/marklogic/client/test/BulkReadWriteTest.java

@@ -79,12 +79,13 @@ public class BulkReadWriteTest {
     private static final String COUNTRIES_FILE = "countryInfo.txt";
     private static final String CITIES_FILE = "cities_above_300K.txt";
     static final int RECORDS_EXPECTED = 1363;
-    private static JAXBContext context = null;
 
     @BeforeClass
     public static void beforeClass() throws JAXBException {
         Common.connect();
-        context = JAXBContext.newInstance(City.class);
+        DatabaseClientFactory.getHandleRegistry().register(
+            JAXBHandle.newFactory(City.class)
+        );
         //System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
     }
     @AfterClass
@@ -101,18 +102,13 @@ interface CityWriter {
 
     private class BulkCityWriter implements CityWriter {
         private XMLDocumentManager docMgr = Common.client.newXMLDocumentManager();
-        private JAXBContext context;
         private DocumentWriteSet writeSet = docMgr.newWriteSet();
 
         BulkCityWriter() throws JAXBException {
-            context = JAXBContext.newInstance(City.class);
         }
 
         public void addCity(City city) {
-            JAXBHandle<City> handle = new JAXBHandle<City>(context);
-            // set the handle to the POJO instance
-            handle.set(city);
-            writeSet.add( DIRECTORY + city.getGeoNameId() + ".xml", handle );
+            writeSet.addAs( DIRECTORY + city.getGeoNameId() + ".xml", city );
         }
 
         public void finishBatch() {
@@ -295,7 +291,6 @@ public void testD_JsonLoad() {
     }
 
     private void validateRecord(DocumentRecord record) {
-        JAXBHandle<City> handle = new JAXBHandle<City>(context);
         assertNotNull("DocumentRecord should never be null", record);
         assertNotNull("Document uri should never be null", record.getUri());
         assertTrue("Document uri should start with " + DIRECTORY, record.getUri().startsWith(DIRECTORY));
@@ -305,7 +300,7 @@ private void validateRecord(DocumentRecord record) {
           record.getMimetype());
         */
         if ( record.getUri().equals(DIRECTORY + "1205733.xml") ) {
-            City chittagong = record.getContent(handle).get();
+            City chittagong = record.getContentAs(City.class);
             validateChittagong(chittagong);
         }
     }