Skip to content

Commit 4d6beef

Browse files
committed
fix #56, handle transform parameters properly--I was wrongly trustin the contract proposed by ServerTransform to extend RequestParameters; I'll later fix ServerTransform
1 parent eba111a commit 4d6beef

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,10 @@ public DocumentPage read(ServerTransform transform, Transaction transaction,
345345
// the default for bulk is no metadata, which differs from the normal default of ALL
346346
isProcessedMetadataModified ? processedMetadata : null,
347347
responseFormat,
348-
null,
348+
mergeTransformParameters(
349+
(transform != null) ? transform : getReadTransform(),
350+
extraParams
351+
),
349352
withContent,
350353
uris);
351354
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ private JerseyResultIterator getBulkDocumentsImpl(RequestLogger reqlog,
754754

755755
String path = "documents";
756756
RequestParameters params = new RequestParameters();
757+
if ( extraParams != null ) params.putAll(extraParams);
757758
if (transactionId != null) params.add("txid", transactionId);
758759
addCategoryParams(categories, params, withContent);
759760
if (format != null) params.add("format", format.toString().toLowerCase());
@@ -770,6 +771,7 @@ private JerseyResultIterator getBulkDocumentsImpl(RequestLogger reqlog,
770771
Set<Metadata> categories, Format format, RequestParameters extraParams)
771772
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {
772773
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
774+
if ( extraParams != null ) params.putAll(extraParams);
773775
boolean withContent = true;
774776
addCategoryParams(categories, params, withContent);
775777
if (searchHandle != null && view != null) params.add("view", view.toString().toLowerCase());
@@ -3477,7 +3479,10 @@ public <R extends AbstractReadHandle> R postBulkDocuments(
34773479
writeHandles.add(write.getContent());
34783480
}
34793481
}
3480-
RequestParameters params = transform != null ? transform : new RequestParameters();
3482+
RequestParameters params = new RequestParameters();
3483+
if (transform != null) {
3484+
transform.merge(params);
3485+
}
34813486
if ( transactionId != null ) params.add("txid", transactionId);
34823487
return postResource(
34833488
reqlog,

0 commit comments

Comments
 (0)