fix #28 and add related unit tests tests

Author: sammefford

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

@@ -726,7 +726,7 @@ private DocumentPage convertToDocumentPage(JerseyResultIterator iterator, boolea
 			JerseyResult result = iterator.next();
 			DocumentRecord record;
 			if ( hasMetadata ) {
-				if ( iterator.hasNext() ) {
+				if ( ! iterator.hasNext() ) {
 					throw new MarkLogicInternalException(
 						"Metadata and content parts should always come in pairs!");
 				}
@@ -750,6 +750,8 @@ private JerseyResultIterator getBulkDocumentsImpl(RequestLogger reqlog,
 
 		String path = "documents";
 		RequestParameters params = new RequestParameters();
+		boolean withContent = true;
+		addCategoryParams(categories, params, withContent);
 		if (format != null)        params.add("format",     format.toString().toLowerCase());
 		for (String uri: uris) {
 			params.add("uri", uri);
@@ -764,6 +766,8 @@ private JerseyResultIterator getBulkDocumentsImpl(RequestLogger reqlog,
             Set<Metadata> categories, Format format, RequestParameters extraParams)
 			throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {
 		MultivaluedMap<String, String> params = new MultivaluedMapImpl();
+		boolean withContent = true;
+		addCategoryParams(categories, params, withContent);
 		if (searchHandle != null && view != null) params.add("view", view.toString().toLowerCase());
 		if (start > 1)             params.add("start",      Long.toString(start));
 		if (pageLength > 0)        params.add("pageLength", Long.toString(pageLength));
@@ -1605,6 +1609,39 @@ private void completeTransaction(String transactionId, String result)
 		response.close();
 	}
 
+	private void addCategoryParams(Set<Metadata> categories, MultivaluedMap<String, String> params,
+		boolean withContent)
+	{
+		if (withContent && categories == null || categories.size() == 0) {
+			params.add("category", "content");
+		} else {
+			if (withContent) params.add("category", "content");
+			if (categories.contains(Metadata.ALL)) {
+				params.add("category", "metadata");
+			} else {
+				for (Metadata category : categories) {
+					params.add("category", category.name().toLowerCase());
+				}
+			}
+		}
+	}
+	private void addCategoryParams(Set<Metadata> categories, RequestParameters params,
+		boolean withContent)
+	{
+		if (withContent && categories == null || categories.size() == 0) {
+			params.add("category", "content");
+		} else {
+			if (withContent) params.add("category", "content");
+			if (categories.contains(Metadata.ALL)) {
+				params.add("category", "metadata");
+			} else {
+				for (Metadata category : categories) {
+					params.add("category", category.name().toLowerCase());
+				}
+			}
+		}
+	}
+
 	private MultivaluedMap<String, String> makeDocumentParams(String uri,
 			Set<Metadata> categories, String transactionId,
 			RequestParameters extraParams) {

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

@@ -39,6 +39,7 @@
 import org.junit.Test;
 
 import com.marklogic.client.document.DocumentDescriptor;
+import com.marklogic.client.document.DocumentManager.Metadata;
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.document.DocumentRecord;
 import com.marklogic.client.document.DocumentWriteSet;
@@ -305,6 +306,8 @@ public void testF_DefaultMetadata() {
         // Execute the write operation
         jdm.write(batch);
 
+        // need the "synthetic response" format to be XML
+        jdm.setResponseFormat(Format.XML);
         // Check the results
         assertEquals("Doc1 should have the system default quality of 0", 0, 
             jdm.readMetadata("doc1.json", new DocumentMetadataHandle()).getQuality());
@@ -325,6 +328,26 @@ public void testF_DefaultMetadata() {
             jdm.readMetadata("doc4.json", new DocumentMetadataHandle()).getQuality());
         assertEquals("Doc5 should use the 2nd batch default metadata, with quality 2", defaultMetadata2.getQuality(),
             jdm.readMetadata("doc5.json", new DocumentMetadataHandle()).getQuality());
+
+        // let's check getting just quality metadata with content in bulk read
+        jdm.setMetadataCategories(Metadata.QUALITY);
+        DocumentPage documents = jdm.read("doc1.json", "doc2.json", "doc3.json");
+
+        for ( DocumentRecord doc: documents ) {
+            DocumentMetadataHandle metadata = doc.getMetadata(new DocumentMetadataHandle());
+            StringHandle content = doc.getContent(new StringHandle());
+            if ( "doc1.json".equals(doc.getUri()) ) {
+                assertEquals("Doc 1 should have the system default quality of 0", 0, metadata.getQuality());
+                assertTrue("Doc 1 contents are wrong", content.get().matches("\\{\"number\": ?1\\}"));
+            } else if ( "doc2.json".equals(doc.getUri()) ) {
+                assertEquals("Doc 2 should use the first batch default metadata, with quality 1", 1, metadata.getQuality());
+                assertTrue("Doc 2 contents are wrong", content.get().matches("\\{\"number\": ?2\\}"));
+            } else if ( "doc3.json".equals(doc.getUri()) ) {
+                assertEquals("Doc 3 should have the system default document quality (0) because quality " +
+                  "was not included in the document-specific metadata.", 0, metadata.getQuality());
+                assertTrue("Doc 3 contents are wrong", content.get().matches("\\{\"number\": ?3\\}"));
+            }
+        }
     }