fix #758 - properly get the format for each part from multipart responses

(cherry picked from commit 4797f7c)

Author: sammefford

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

@@ -1725,23 +1725,19 @@ private Format getHeaderFormat(Headers headers) {
   }
 
   private Format getHeaderFormat(BodyPart part) {
-    try {
-      String contentDisposition = part.getDisposition();
-      String formatRegex = " format=(text|binary|xml|json)";
-      String format = getHeader(part, HEADER_VND_MARKLOGIC_DOCUMENT_FORMAT);
-      String contentType = getHeader(part, HEADER_CONTENT_TYPE);
-      if ( format != null && format.length() > 0 ) {
-        return Format.valueOf(format.toUpperCase());
-      } else if ( contentDisposition != null && contentDisposition.matches(formatRegex) ) {
-        format = contentDisposition.replaceFirst("^.*" + formatRegex + ".*$", "$1");
-        return Format.valueOf(format.toUpperCase());
-      } else if ( contentType != null && contentType.length() > 0 ) {
-        return Format.getFromMimetype(contentType);
-      }
-      return null;
-    } catch (MessagingException e) {
-      throw new MarkLogicIOException(e);
+    String contentDisposition = getHeader(part, HEADER_CONTENT_DISPOSITION);
+    String formatRegex = ".* format=(text|binary|xml|json).*";
+    String format = getHeader(part, HEADER_VND_MARKLOGIC_DOCUMENT_FORMAT);
+    String contentType = getHeader(part, HEADER_CONTENT_TYPE);
+    if ( format != null && format.length() > 0 ) {
+      return Format.valueOf(format.toUpperCase());
+    } else if ( contentDisposition != null && contentDisposition.matches(formatRegex) ) {
+      format = contentDisposition.replaceFirst("^.*" + formatRegex + ".*$", "$1");
+      return Format.valueOf(format.toUpperCase());
+    } else if ( contentType != null && contentType.length() > 0 ) {
+      return Format.getFromMimetype(contentType);
     }
+    return null;
   }
 
   private void updateMimetype(ContentDescriptor descriptor,

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

@@ -17,9 +17,12 @@
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Random;
 
 import javax.xml.bind.DatatypeConverter;
 
@@ -30,11 +33,16 @@
 import org.w3c.dom.Document;
 
 import com.marklogic.client.document.DocumentDescriptor;
+import com.marklogic.client.document.DocumentPage;
+import com.marklogic.client.document.DocumentRecord;
+import com.marklogic.client.document.DocumentWriteSet;
 import com.marklogic.client.document.DocumentManager.Metadata;
 import com.marklogic.client.document.BinaryDocumentManager;
 import com.marklogic.client.document.BinaryDocumentManager.MetadataExtraction;
 import com.marklogic.client.io.BytesHandle;
 import com.marklogic.client.io.DOMHandle;
+import com.marklogic.client.io.FileHandle;
+import com.marklogic.client.io.Format;
 import com.marklogic.client.io.InputStreamHandle;
 
 public class BinaryDocumentTest {
@@ -84,4 +92,19 @@ public void testReadWrite() throws IOException, XpathException {
 		assertXpathEvaluatesTo("text HD-HTML","string(/*[local-name()='metadata']/*[local-name()='properties']/*[local-name()='filter-capabilities'])", metadataDocument);
 		assertXpathEvaluatesTo("815","string(/*[local-name()='metadata']/*[local-name()='properties']/*[local-name()='size'])", metadataDocument);
 	}
+
+	@Test
+	public void test_issue_758() throws Exception {
+		BinaryDocumentManager docMgr = Common.client.newBinaryDocumentManager();
+		DocumentWriteSet writeset =docMgr.newWriteSet();
+		FileHandle h1 = new FileHandle(new File(
+			"test-complete/src/test/java/com/marklogic/client/functionaltest/data/Sega-4MB.jpg"));
+		String uri = "BinaryDocumentTest_" + new Random().nextInt(10000) + "/" + "Sega-4MB.jpg";
+		writeset.add(uri, h1);
+		docMgr.write(writeset);
+		DocumentPage page = docMgr.read(uri);
+		DocumentRecord rec = page.next();
+		assertNotNull("DocumentRecord should never be null", rec);
+		assertEquals(rec.getFormat(),Format.BINARY);
+	}
 }