MLE-29883 (GH #1938) Include document version in bulk reads

Author: Ryan Dew

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

@@ -1713,6 +1713,17 @@ static private Format getHeaderFormat(BodyPart part) {
 		return null;
 	}
 
+	// Bulk multi-document reads carry the version as a "versionId" param on Content-Disposition, not as an ETag header.
+	static private long getHeaderVersion(BodyPart part) {
+		String contentDisposition = getHeader(part, HEADER_CONTENT_DISPOSITION);
+		String versionRegex = ".* versionId=([0-9]+).*";
+		if (contentDisposition != null && contentDisposition.matches(versionRegex)) {
+			String version = contentDisposition.replaceFirst("^.*" + versionRegex + ".*$", "$1");
+			return Utilities.parseLong(version, DocumentDescriptor.UNKNOWN_VERSION);
+		}
+		return DocumentDescriptor.UNKNOWN_VERSION;
+	}
+
 	static private void updateMimetype(ContentDescriptor descriptor,
 									   Headers headers) {
 		updateMimetype(descriptor, getHeaderMimetype(headers.get(HEADER_CONTENT_TYPE)));
@@ -1837,10 +1848,6 @@ static private void updateVersion(DocumentDescriptor descriptor, Headers headers
 		updateVersion(descriptor, extractVersion(headers.get(HEADER_ETAG)));
 	}
 
-	static private void updateVersion(DocumentDescriptor descriptor, String header) {
-		updateVersion(descriptor, extractVersion(header));
-	}
-
 	static private void updateVersion(DocumentDescriptor descriptor, long version) {
 		descriptor.setVersion(version);
 	}
@@ -4436,6 +4443,7 @@ static class OkHttpResult {
 		private Format format;
 		private String mimetype;
 		private long length;
+		private long version = DocumentDescriptor.UNKNOWN_VERSION;
 
 		OkHttpResult(RequestLogger reqlog, BodyPart part) {
 			this.reqlog = reqlog;
@@ -4490,6 +4498,11 @@ public long getLength() {
 			return length;
 		}
 
+		public long getVersion() {
+			extractHeaders();
+			return version;
+		}
+
 		public String getHeader(String name) {
 			extractHeaders();
 			List<String> values = headers.get(name);
@@ -4515,6 +4528,7 @@ private void extractHeaders() {
 				mimetype = getHeaderMimetype(OkHttpServices.getHeader(part, HEADER_CONTENT_TYPE));
 				length = getHeaderLength(OkHttpServices.getHeader(part, HEADER_CONTENT_LENGTH));
 				uri = getHeaderUri(part);
+				version = getHeaderVersion(part);
 				extractedHeaders = true;
 			} catch (MessagingException e) {
 				throw new MarkLogicIOException(e);
@@ -4688,7 +4702,7 @@ public DocumentDescriptor getDescriptor() {
 			updateFormat(descriptor, getFormat());
 			updateMimetype(descriptor, getMimetype());
 			updateLength(descriptor, getLength());
-			updateVersion(descriptor, content.getHeader(HEADER_ETAG));
+			updateVersion(descriptor, content.getVersion());
 			return descriptor;
 		}
 

marklogic-client-api/src/test/java/com/marklogic/client/test/ConditionalDocumentTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+ * Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
 package com.marklogic.client.test;
 
@@ -192,21 +192,26 @@ public void testConditionalMultiple() {
 
     XMLDocumentManager docMgr = Common.client.newXMLDocumentManager();
 
-    verifyDescriptors(docList, docMgr.read(docIds));
+    verifyDescriptors(docList, docMgr.read(docIds), docMgr);
 
     verifyDescriptors(
             docList,
-            docMgr.search(new StructuredQueryBuilder().document(docIds), 1)
+            docMgr.search(new StructuredQueryBuilder().document(docIds), 1),
+            docMgr
     );
   }
-  void verifyDescriptors(List<String> docList, DocumentPage page) {
+
+  void verifyDescriptors(List<String> docList, DocumentPage page, XMLDocumentManager docMgr) {
     for (DocumentRecord record: page) {
       DocumentDescriptor desc = record.getDescriptor();
       assertTrue( docList.contains(desc.getUri()));
       assertEquals( Format.XML, desc.getFormat());
       assertTrue( desc.getMimetype().startsWith("application/xml"));
       assertTrue( desc.getByteLength() >= 0);
-      assertTrue( desc.getVersion() >= -1);
+      // bulk read() should report the same version as exists() for each document
+      assertNotEquals( DocumentDescriptor.UNKNOWN_VERSION, desc.getVersion());
+      long existsVersion = docMgr.exists(record.getUri()).getVersion();
+      assertEquals( existsVersion, desc.getVersion());
     }
   }
 }