Skip to content

Commit

Permalink
JVMCBC-1540 Restore internal transaction insert/replace methods used …
Browse files Browse the repository at this point in the history
…by Spring Data Couchbase

Motivation
----------
Let folks upgrade Java SDK independently of SDC.

Modifications
-------------
Added overloads with the old method signatures.

Change-Id: Ica3f8a715b150fb3d5e85c527ef8ef073eaca559
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/212745
Reviewed-by: Michael Reiche <[email protected]>
Tested-by: Build Bot <[email protected]>
  • Loading branch information
dnault committed Jul 15, 2024
1 parent 4dfe332 commit 167da4b
Showing 1 changed file with 22 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.couchbase.client.core.Core;
import com.couchbase.client.core.annotation.Stability;
import com.couchbase.client.core.annotation.UsedBy;
import com.couchbase.client.core.api.query.CoreQueryContext;
import com.couchbase.client.core.api.query.CoreQueryOps;
import com.couchbase.client.core.api.query.CoreQueryOptions;
Expand Down Expand Up @@ -146,6 +147,7 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static com.couchbase.client.core.annotation.UsedBy.Project.SPRING_DATA_COUCHBASE;
import static com.couchbase.client.core.cnc.TracingIdentifiers.TRANSACTION_OP_ATR_COMMIT;
import static com.couchbase.client.core.config.BucketCapabilities.SUBDOC_REVIVE_DOCUMENT;
import static com.couchbase.client.core.error.transaction.TransactionOperationFailedException.Builder.createError;
Expand Down Expand Up @@ -736,6 +738,16 @@ public Mono<CoreTransactionGetResult> insert(CollectionIdentifier collection, St
(operationId, span, lockToken) -> insertInternal(operationId, collection, id, content, flagsToStage, span, lockToken));
}

/**
* @deprecated in favor of {@link #insert(CollectionIdentifier, String, byte[], int, SpanWrapper)}
* which takes an additional 'flags' argument.
*/
@UsedBy(SPRING_DATA_COUCHBASE)
@Deprecated
public Mono<CoreTransactionGetResult> insert(CollectionIdentifier collection, String id, byte[] content, SpanWrapper pspan) {
return insert(collection, id, content, JSON_COMMON_FLAGS, pspan);
}

private Mono<CoreTransactionGetResult> insertInternal(String operationId, CollectionIdentifier collection, String id, byte[] content, int flagsToStage,
SpanWrapper span, ReactiveLock.Waiter lockToken) {
return Mono.defer(() -> {
Expand Down Expand Up @@ -960,6 +972,16 @@ public Mono<CoreTransactionGetResult> replace(CoreTransactionGetResult doc, byte
(operationId, span, lockToken) -> replaceInternalLocked(operationId, doc, content, flags, span, lockToken));
}

/**
* @deprecated in favor of {@link #replace(CoreTransactionGetResult, byte[], int, SpanWrapper)}
* which takes an additional 'flags' argument.
*/
@UsedBy(SPRING_DATA_COUCHBASE)
@Deprecated
public Mono<CoreTransactionGetResult> replace(CoreTransactionGetResult doc, byte[] content, SpanWrapper pspan) {
return replace(doc, content, JSON_COMMON_FLAGS, pspan);
}

private <T> Mono<T> createMonoBridge(String debug, Mono<T> internal) {
if (threadSafetyEnabled) {
return new MonoBridge<>(internal, debug, this, monoBridgeDebugging ? LOGGER : null).external();
Expand Down

0 comments on commit 167da4b

Please sign in to comment.