Update transactions documentation for native transaction support.

Closes #1454,#1512.

Author: mikereiche

README.adoc

@@ -179,6 +179,24 @@ Building the documentation builds also the project without running tests.
 
 The generated documentation is available from `target/site/reference/html/index.html`.
 
+=== Building and staging reference documentation for review
+
+[source,bash]
+----
+  mvn generate-resources
+  docs=`pwd`/target/site/reference/html
+  cd /tmp 
+  # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site
+  git clone [email protected]:mikereiche/staged.git -b gh-pages
+  cd staged
+  cp -R $docs/* .
+  git add .
+  git commit --message "stage for review"
+  git push origin gh-pages
+----
+
+The generated documentation is available from `target/site/reference/html/index.html`.
+
 == Examples
 
 * https://github.com/spring-projects/spring-data-examples/[Spring Data Examples] contains example projects that explain specific features in more detail.

pom.xml

@@ -301,8 +301,20 @@
                 <artifactId>maven-assembly-plugin</artifactId>
             </plugin>
             <plugin>
+                <!-- generate asciidoc to stage for review  -->
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/site/reference/html</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>com.mysema.maven</groupId>

src/main/asciidoc/transactions.adoc

@@ -51,6 +51,7 @@
 import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
+import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -330,6 +331,16 @@ CouchbaseCallbackTransactionManager couchbaseTransactionManager(CouchbaseClientF
 		return new CouchbaseCallbackTransactionManager(clientFactory);
 	}
 
+	/**
+	 * The default transaction template manager.
+	 *
+	 * @param couchbaseTransactionManager
+	 * @return
+	 */
+	@Bean(BeanNames.COUCHBASE_TRANSACTION_TEMPLATE)
+	TransactionTemplate couchbaseTransactionTemplate(CouchbaseCallbackTransactionManager couchbaseTransactionManager) {
+		return new TransactionTemplate(couchbaseTransactionManager);
+	}
 	/**
 	 * The default TransactionalOperator.
 	 *

src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java

@@ -64,5 +64,7 @@ public class BeanNames {
 
 	public static final String COUCHBASE_TRANSACTION_MANAGER = "couchbaseTransactionManager";
 
+	public static final String COUCHBASE_TRANSACTION_TEMPLATE = "couchbaseTransactionTemplate";
+
 	public static final String COUCHBASE_TRANSACTIONAL_OPERATOR = "couchbaseTransactionalOperator";
 }

src/main/java/org/springframework/data/couchbase/config/BeanNames.java

@@ -90,10 +90,11 @@ public static void main(String... args) {
 		}
 
 		ClusterEnvironment env = ClusterEnvironment.builder()
-				.securityConfig(SecurityConfig.enableTls(true)/*.trustManagerFactory(InsecureTrustManagerFactory.INSTANCE)*/)
+				//.securityConfig(SecurityConfig.enableTls(true)/*.trustManagerFactory(InsecureTrustManagerFactory.INSTANCE)*/)
 				.ioConfig(IoConfig.enableDnsSrv(true)).build();
 
 		// Initialize the Connection
+		endpoint = "cb.zsibzkbgllfbcj8g.cloud.couchbase.com";
 		Cluster cluster = Cluster.connect(endpoint, ClusterOptions.clusterOptions(username, password).environment(env));
 		Bucket bucket = cluster.bucket(bucketName);
 		bucket.waitUntilReady(Duration.parse("PT10S"));
@@ -130,8 +131,10 @@ public static List<String> getClustersControlPlane() {
 		Map<String, Object> decoded = doRequest(hostname, "GET", "/v3/clusters");
 		HashMap data = (HashMap) decoded.get("data");
 		List<Map> items = (List<Map>) data.get("items");
-		for (Map m : items) {
-			clusterIds.add((String) m.get("id"));
+		if (items != null) {
+			for (Map m : items) {
+				clusterIds.add((String) m.get("id"));
+			}
 		}
 		return clusterIds;
 	}

src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java

@@ -114,7 +114,6 @@ public void saveRolledBack() {
 		String id = UUID.randomUUID().toString();
 
 		assertThrowsWithCause(() -> {
-			;
 			userService.run(repo -> {
 				User user = repo.save(new User(id, "Ada", "Lovelace"));
 				SimulateFailureException.throwEx("fail");

src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java

@@ -43,7 +43,6 @@
  */
 @Service
 @Component
-@EnableTransactionManagement
 class PersonService {
 
 	final CouchbaseOperations personOperations;

src/test/java/org/springframework/data/couchbase/transactions/PersonService.java

@@ -64,7 +64,7 @@
 @IgnoreWhen(missesCapabilities = Capabilities.QUERY, clusterTypes = ClusterType.MOCKED)
 @SpringJUnitConfig(TransactionsConfig.class)
 public class TransactionTemplateIntegrationTests extends JavaIntegrationTests {
-	TransactionTemplate template;
+	@Autowired TransactionTemplate transactionTemplate;
 	@Autowired CouchbaseCallbackTransactionManager transactionManager;
 	@Autowired CouchbaseClientFactory couchbaseClientFactory;
 	@Autowired CouchbaseTemplate ops;
@@ -86,8 +86,6 @@ public void beforeEachTest() {
 		assertNotInTransaction();
 		List<RemoveResult> rp0 = ops.removeByQuery(Person.class).withConsistency(REQUEST_PLUS).all();
 		List<RemoveResult> rp1 = ops.removeByQuery(PersonWithoutVersion.class).withConsistency(REQUEST_PLUS).all();
-
-		template = new TransactionTemplate(transactionManager);
 	}
 
 	@AfterEach
@@ -106,7 +104,7 @@ public RunResult(int attempts) {
 	private RunResult doInTransaction(Consumer<TransactionStatus> lambda) {
 		AtomicInteger tryCount = new AtomicInteger();
 
-		template.executeWithoutResult(status -> {
+		transactionTemplate.executeWithoutResult(status -> {
 			TransactionTestUtil.assertInTransaction();
 			assertFalse(status.hasSavepoint());
 			assertFalse(status.isRollbackOnly());
@@ -346,25 +344,26 @@ public void setRollbackOnly() {
 	@DisplayName("Setting an unsupported isolation level should fail")
 	@Test
 	public void unsupportedIsolationLevel() {
-		template.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
+		transactionTemplate.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
 
 		assertThrowsWithCause(() -> doInTransaction(status -> {}), IllegalArgumentException.class);
 	}
 
 	@DisplayName("Setting PROPAGATION_MANDATORY should fail, as not in a transaction")
 	@Test
 	public void propagationMandatoryOutsideTransaction() {
-		template.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
-
+		int propagation = transactionTemplate.getPropagationBehavior();
+		transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
 		assertThrowsWithCause(() -> doInTransaction(status -> {}), IllegalTransactionStateException.class);
+		transactionTemplate.setPropagationBehavior(propagation);
 	}
 
 	@Test
 	public void nestedTransactionTemplates() {
 		TransactionTemplate template2 = new TransactionTemplate(transactionManager);
 		template2.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
 
-		template.executeWithoutResult(status -> {
+		transactionTemplate.executeWithoutResult(status -> {
 			template2.executeWithoutResult(status2 -> {
 				Person person = ops.insertById(Person.class).one(WalterWhite);
 			});

src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java

@@ -126,6 +126,21 @@ public void committedInsert() {
 		assertEquals(1, rr.attempts);
 	}
 
+	private RunResult doInTransaction2(Function<ReactiveTransactionAttemptContext, Mono<?>> lambda,
+			@Nullable TransactionOptions options) {
+		AtomicInteger attempts = new AtomicInteger();
+
+		TransactionResult result = couchbaseClientFactory.getCluster().reactive().transactions().run(ctx -> {
+			return TransactionalSupport.checkForTransactionInThreadLocalStorage().then(Mono.defer(() -> {
+				return lambda.apply(ctx);
+			}));
+		}, options).block();
+
+		assertNotInTransaction();
+
+		return new RunResult(result, attempts.get());
+	}
+
 	@DisplayName("A basic golden path replace should succeed")
 	@Test
 	public void committedReplace() {