Allow template.save() to find if it is in a transaction.

Closes #1757.

Author: mikereiche

src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java

@@ -80,7 +80,7 @@ public <T> Mono<T> save(T entity, String... scopeAndCollection) {
 
 		String scope = scopeAndCollection.length > 0 ? scopeAndCollection[0] : null;
 		String collection = scopeAndCollection.length > 1 ? scopeAndCollection[1] : null;
-		return Mono.defer(() -> {
+		return Mono.deferContextual( ctx1 -> {
 			final CouchbasePersistentEntity<?> mapperEntity = getConverter().getMappingContext()
 					.getPersistentEntity(entity.getClass());
 			final CouchbasePersistentProperty versionProperty = mapperEntity.getVersionProperty();

src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java

@@ -18,11 +18,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInTransaction;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertInTransaction;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertInReactiveTransaction;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInReactiveTransaction;
 
 import org.springframework.data.couchbase.domain.PersonWithoutVersion;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +32,6 @@
 import org.springframework.data.couchbase.CouchbaseClientFactory;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
 import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate;
-import org.springframework.data.couchbase.domain.Person;
 import org.springframework.data.couchbase.transactions.TransactionsConfig;
 import org.springframework.data.couchbase.util.Capabilities;
 import org.springframework.data.couchbase.util.ClusterType;
@@ -55,45 +54,53 @@ public class SDKTransactionsSaveIntegrationTests extends JavaIntegrationTests {
 	@BeforeEach
 	public void beforeEachTest() {
 		assertNotInTransaction();
+		assertNotInReactiveTransaction();
 	}
 
 	@AfterEach
 	public void afterEachTest() {
 		assertNotInTransaction();
+		assertNotInReactiveTransaction();
 	}
 
+
 	@DisplayName("ReactiveCouchbaseTemplate.save() called inside a reactive SDK transaction should work")
 	@Test
 	public void reactiveSaveInReactiveTransaction() {
 		couchbaseClientFactory.getCluster().reactive().transactions().run(ctx -> {
 			PersonWithoutVersion p = new PersonWithoutVersion("Walter", "White");
-			return reactiveOps.save(p);
+			return reactiveOps.save(p).then(assertInReactiveTransaction());
 		}).block();
 	}
 
 	@DisplayName("ReactiveCouchbaseTemplate.save().block() called inside a non-reactive SDK transaction should work")
 	@Test
 	public void reactiveSaveInBlockingTransaction() {
 		couchbaseClientFactory.getCluster().transactions().run(ctx -> {
+			assertInTransaction();
 			PersonWithoutVersion p = new PersonWithoutVersion("Walter", "White");
 			reactiveOps.save(p).block();
 		});
 	}
 
+	// This should not work because ops.save(p) calls block() so everything in that call
+	// does not have the reactive context (which has the transaction context)
+	// what happens is the ops.save(p) is not in a transaction. (it will call upsert instead of insert)
 	@DisplayName("ReactiveCouchbaseTemplate.save() called inside a reactive SDK transaction should work")
 	@Test
 	public void blockingSaveInReactiveTransaction() {
 		couchbaseClientFactory.getCluster().reactive().transactions().run(ctx -> {
 			PersonWithoutVersion p = new PersonWithoutVersion("Walter", "White");
 			ops.save(p);
-			return Mono.empty();
+			return assertInReactiveTransaction();
 		}).block();
 	}
 
 	@DisplayName("ReactiveCouchbaseTemplate.save().block() called inside a non-reactive SDK transaction should work")
 	@Test
 	public void blockingSaveInBlockingTransaction() {
 		couchbaseClientFactory.getCluster().transactions().run(ctx -> {
+			assertInTransaction();
 			PersonWithoutVersion p = new PersonWithoutVersion("Walter", "White");
 			ops.save(p);
 		});

src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java

@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.springframework.data.couchbase.core.TransactionalSupport;
+import reactor.core.publisher.Mono;
 
 /**
  * Utility methods for transaction tests.
@@ -35,4 +36,16 @@ public static void assertInTransaction() {
 	public static void assertNotInTransaction() {
 		assertFalse(TransactionalSupport.checkForTransactionInThreadLocalStorage().block().isPresent());
 	}
+
+	public static <T> Mono<T> assertInReactiveTransaction(T... obj) {
+		return Mono.deferContextual((ctx1) ->
+				TransactionalSupport.checkForTransactionInThreadLocalStorage()
+						.flatMap(ctx2 -> ctx2.isPresent() ? (obj.length>0 ? Mono.just(obj[0]) : Mono.empty()) : Mono.error(new RuntimeException("in transaction"))));
+	}
+
+	public static <T> Mono<T> assertNotInReactiveTransaction(T... obj) {
+		return Mono.deferContextual((ctx1) ->
+				TransactionalSupport.checkForTransactionInThreadLocalStorage()
+						.flatMap(ctx2 -> !ctx2.isPresent() ? (obj.length>0 ? Mono.just(obj[0]) : Mono.empty()) : Mono.error(new RuntimeException("in transaction"))));
+	}
 }