fix #24 by adding DocumentWriteSet.disableDefault() which seems cleaner than addDefault(null) . . .

Author: sammefford

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

@@ -19,7 +19,7 @@
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
 public interface DocumentWriteOperation {
-    public enum OperationType { METADATA_DEFAULT, DOCUMENT_WRITE };
+    public enum OperationType { METADATA_DEFAULT, DISABLE_METADATA_DEFAULT, DOCUMENT_WRITE };
 
     public OperationType getOperationType();
 

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

@@ -23,6 +23,8 @@
 public interface DocumentWriteSet extends Set<DocumentWriteOperation> {
     public DocumentWriteSet addDefault(DocumentMetadataWriteHandle metadataHandle);
 
+    public DocumentWriteSet disableDefault();
+
     public DocumentWriteSet add(String docId, AbstractWriteHandle contentHandle);
 
     public DocumentWriteSet add(String docId, DocumentMetadataWriteHandle metadataHandle, AbstractWriteHandle contentHandle);

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

@@ -20,6 +20,8 @@
 import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.document.DocumentWriteOperation.OperationType;
 import com.marklogic.client.impl.DocumentWriteOperationImpl;
+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.DocumentMetadataWriteHandle;
 
@@ -32,6 +34,12 @@ public DocumentWriteSet addDefault(DocumentMetadataWriteHandle metadataHandle) {
 		return this;
 	}
 
+    public DocumentWriteSet disableDefault() {
+		add(new DocumentWriteOperationImpl(OperationType.DISABLE_METADATA_DEFAULT,
+			null, new StringHandle("{ }").withFormat(Format.JSON), null));
+		return this;
+	}
+
     public DocumentWriteSet add(String docId, AbstractWriteHandle contentHandle) {
 		add(new DocumentWriteOperationImpl(OperationType.DOCUMENT_WRITE,
 			docId, null, contentHandle));

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

@@ -3434,7 +3434,15 @@ public <R extends AbstractReadHandle> R postBulkDocuments(
 				HandleAccessor.checkHandle(write.getMetadata(), "write");
 			HandleImplementation content =
 				HandleAccessor.checkHandle(write.getContent(), "write");
-			if ( metadata != null ) {
+			if ( write.getOperationType() == 
+					DocumentWriteOperation.OperationType.DISABLE_METADATA_DEFAULT )
+			{
+				MultivaluedMap headers = new MultivaluedMapImpl();
+				headers.add(HttpHeaders.CONTENT_TYPE, metadata.getMimetype());
+				headers.add("Content-Disposition", "inline; category=metadata");
+				headerList.add(headers);
+				writeHandles.add(write.getMetadata());
+			} else if ( metadata != null ) {
 				MultivaluedMap headers = new MultivaluedMapImpl();
 				headers.add(HttpHeaders.CONTENT_TYPE, metadata.getMimetype());
 				if ( write.getOperationType() == DocumentWriteOperation.OperationType.METADATA_DEFAULT ) {

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

@@ -279,6 +279,10 @@ public void testF_DefaultMetadata() {
                 "{\"number\": 5}").withFormat(Format.JSON);
         StringHandle doc6 = new StringHandle(
                 "{\"number\": 6}").withFormat(Format.JSON);
+        StringHandle doc7 = new StringHandle(
+                "{\"number\": 7}").withFormat(Format.JSON);
+        StringHandle doc8 = new StringHandle(
+                "{\"number\": 8}").withFormat(Format.JSON);
 
         // Synthesize input metadata
         DocumentMetadataHandle defaultMetadata1 = 
@@ -287,7 +291,6 @@ public void testF_DefaultMetadata() {
                 new DocumentMetadataHandle().withQuality(2);
         DocumentMetadataHandle docSpecificMetadata = 
                 new DocumentMetadataHandle().withCollections("myCollection");
-        DocumentMetadataHandle blankDefaultMetadata = new DocumentMetadataHandle();
 
         // Create and build up the batch
         JSONDocumentManager jdm = Common.client.newJSONDocumentManager();
@@ -307,8 +310,12 @@ public void testF_DefaultMetadata() {
         batch.add("doc5.json", doc5);       // batch default 
 
         // replace default metadata with blank metadata (back to system defaults)
-        batch.addDefault(blankDefaultMetadata); 
+        batch.disableDefault(); 
         batch.add("doc6.json", doc6);       // system default metadata
+        batch.addDefault(defaultMetadata1); 
+        batch.add("doc7.json", doc7);       // batch default metadata
+        batch.disableDefault(); 
+        batch.add("doc8.json", doc8);       // system default metadata
 
         // Execute the write operation
         jdm.write(batch);
@@ -332,7 +339,7 @@ public void testF_DefaultMetadata() {
 
         // let's check getting content with just quality in the metadata 
         jdm.setMetadataCategories(Metadata.QUALITY);
-        DocumentPage documents = jdm.read("doc4.json", "doc5.json", "doc6.json");
+        DocumentPage documents = jdm.read("doc4.json", "doc5.json");
 
         for ( DocumentRecord doc: documents ) {
             DocumentMetadataHandle metadata = doc.getMetadata(new DocumentMetadataHandle());
@@ -345,25 +352,21 @@ public void testF_DefaultMetadata() {
                 assertEquals("Doc5 should use the 2nd batch default metadata, with quality 2", 2,
                     metadata.getQuality());
                 assertTrue("Doc 5 contents are wrong", content.get().matches("\\{\"number\": ?5\\}"));
-            } else if ( "doc6.json".equals(doc.getUri()) ) {
-                assertEquals("Doc 6 should have the system default quality of 0", 0,
-                    metadata.getQuality());
-                assertTrue("Doc 6 contents are wrong", content.get().matches("\\{\"number\": ?6\\}"));
             }
         }
 
         // now try with just metadata
-        documents = jdm.readMetadata("doc4.json", "doc5.json", "doc6.json");
+        documents = jdm.readMetadata("doc6.json", "doc7.json", "doc8.json");
         for ( DocumentRecord doc: documents ) {
             DocumentMetadataHandle metadata = doc.getMetadata(new DocumentMetadataHandle());
-            if ( "doc4.json".equals(doc.getUri()) ) {
-                assertEquals("Doc4 should also use the 1st batch default metadata, with quality 1", 1,
+            if ( "doc6.json".equals(doc.getUri()) ) {
+                assertEquals("Doc 6 should have the system default quality of 0", 0,
                     metadata.getQuality());
-            } else if ( "doc5.json".equals(doc.getUri()) ) {
-                assertEquals("Doc5 should use the 2nd batch default metadata, with quality 2", 2,
+            } else if ( "doc7.json".equals(doc.getUri()) ) {
+                assertEquals("Doc7 should also use the 1st batch default metadata, with quality 1", 1,
                     metadata.getQuality());
-            } else if ( "doc6.json".equals(doc.getUri()) ) {
-                assertEquals("Doc 6 should have the system default quality of 0", 0,
+            } else if ( "doc8.json".equals(doc.getUri()) ) {
+                assertEquals("Doc 8 should have the system default quality of 0", 0,
                     metadata.getQuality());
             }
         }