JCBC-2152: Replace in transaction does not return updated content

ctx.replace() should return the updated content
in its TransactionGetResult.

Fixes a regression introduced in cf37f2f.

Change-Id: If8eaf00c6f87b4a548d3ed7e4d9ba6d9080fbdca
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/220825
Tested-by: Build Bot <[email protected]>
Reviewed-by: David Nault <[email protected]>

Author: programmatix

core-io/src/main/java/com/couchbase/client/core/transaction/CoreTransactionAttemptContext.java

@@ -1655,7 +1655,7 @@ false, false, false, true, false, cas, userFlagsOfExistingDocument, durabilityLe
                     // Save the new CAS
                     .flatMap(updatedDoc -> {
                         CoreTransactionGetResult out = createTransactionGetResult(operationId, collection, id,
-                                contentOfExistingDocument, userFlagsOfExistingDocument, contentToStage, userFlagsOfContentToStage, updatedDoc.cas(), documentMetadata, OperationTypes.REPLACE, crc32OfGet);
+                                contentToStage, userFlagsOfExistingDocument, contentToStage, userFlagsOfContentToStage, updatedDoc.cas(), documentMetadata, OperationTypes.REPLACE, crc32OfGet);
                         return supportsReplaceBodyWithXattr(collection.bucket())
                                 .flatMap(supports -> addStagedMutation(new StagedMutation(operationId, id, collection, updatedDoc.cas(), documentMetadata, crc32OfGet,
                                         userFlagsOfExistingDocument, supports ? null : contentToStage, userFlagsOfContentToStage, StagedMutationType.REPLACE))

java-client/src/integrationTest/java/com/couchbase/client/java/transactions/TransactionsIntegrationTest.java

@@ -204,7 +204,7 @@ void replace() {
 
         TransactionResult tr = cluster.transactions().run((ctx) -> {
             TransactionGetResult doc = ctx.get(collection, docId);
-            ctx.replace(doc, updated);
+            TransactionGetResult postReplace = ctx.replace(doc, updated);
         });
 
         assertEquals(updated, collection.get(docId).contentAsObject());
@@ -225,6 +225,31 @@ void replaceReactive() {
         assertEquals(updated, collection.get(docId).contentAsObject());
     }
 
+    // Test for JCBC-2152
+    @Test
+    void replaceReturnsUpdatedBody() {
+        String docId = UUID.randomUUID().toString();
+        JsonObject initial = JsonObject.create().put("foo", "bar");
+        JsonObject updated = JsonObject.create().put("foo", "baz");
+        collection.insert(docId, initial);
+
+        TransactionResult tr = cluster.transactions().run((ctx) -> {
+            TransactionGetResult oldDoc = ctx.get(collection, docId);
+            TransactionGetResult replacedDoc = ctx.replace(oldDoc, updated);
+            TransactionGetResult ryowDoc = ctx.get(collection, docId);
+
+            JsonObject oldContent = oldDoc.contentAsObject();
+            JsonObject replacedContent = replacedDoc.contentAsObject();
+            JsonObject ryowContent = ryowDoc.contentAsObject();
+
+            assertEquals(initial, oldContent);
+            assertEquals(updated, ryowContent);
+            assertEquals(updated, replacedContent);
+        });
+
+        assertEquals(updated, collection.get(docId).contentAsObject());
+    }
+
     @Test
     void remove() {
         String docId = UUID.randomUUID().toString();