Rebased and tidied transaction branch.

Documentation to follow.

Closes #1145.

Author: mikereiche

Jenkinsfile

@@ -67,7 +67,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +

pom.xml

@@ -233,17 +233,6 @@
             <version>4.0.3</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.5</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java

@@ -1,6 +1,6 @@
 /*
 /*
- * Copyright 2021 the original author or authors
+ * Copyright 2021-2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  */
 package com.couchbase.client.java.transactions;
 
-import java.lang.reflect.Field;
-
 import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
 import com.couchbase.client.java.codec.JsonSerializer;

src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors
+ * Copyright 2012-2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 
 import java.io.Closeable;
 
-import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
-import com.couchbase.client.java.transactions.ReactiveTransactionAttemptContext;
-import com.couchbase.client.java.transactions.config.TransactionOptions;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 
 import com.couchbase.client.java.Bucket;
@@ -31,8 +28,10 @@
 /**
  * The {@link CouchbaseClientFactory} is the main way to get access to the managed SDK instance and resources.
  * <p>
- * Please note that a single factory is always bound to a {@link Bucket}, so if you need to access more than one
- * you need to initialize one factory for each.
+ * Please note that a single factory is always bound to a {@link Bucket}, so if you need to access more than one you
+ * need to initialize one factory for each.
+ *
+ * @author Michael Reiche
  */
 public interface CouchbaseClientFactory extends Closeable {
 

src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors
+ * Copyright 2012-2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,8 @@
  */
 package org.springframework.data.couchbase;
 
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.function.Supplier;
 
-import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
-import com.couchbase.client.java.transactions.config.TransactionOptions;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.couchbase.core.CouchbaseExceptionTranslator;
 
@@ -32,11 +28,7 @@
 import com.couchbase.client.java.ClusterOptions;
 import com.couchbase.client.java.Collection;
 import com.couchbase.client.java.Scope;
-import com.couchbase.client.java.codec.JsonSerializer;
 import com.couchbase.client.java.env.ClusterEnvironment;
-import com.couchbase.client.java.transactions.AttemptContextReactiveAccessor;
-import com.couchbase.client.java.transactions.config.TransactionsCleanupConfig;
-import com.couchbase.client.java.transactions.config.TransactionsConfig;
 
 /**
  * The default implementation of a {@link CouchbaseClientFactory}.
@@ -52,18 +44,18 @@ public class SimpleCouchbaseClientFactory implements CouchbaseClientFactory {
 	private final PersistenceExceptionTranslator exceptionTranslator;
 
 	public SimpleCouchbaseClientFactory(final String connectionString, final Authenticator authenticator,
-										final String bucketName) {
+			final String bucketName) {
 		this(connectionString, authenticator, bucketName, null);
 	}
 
 	public SimpleCouchbaseClientFactory(final String connectionString, final Authenticator authenticator,
-										final String bucketName, final String scopeName) {
+			final String bucketName, final String scopeName) {
 		this(new OwnedSupplier<>(Cluster.connect(connectionString, ClusterOptions.clusterOptions(authenticator))),
 				bucketName, scopeName);
 	}
 
 	public SimpleCouchbaseClientFactory(final String connectionString, final Authenticator authenticator,
-										final String bucketName, final String scopeName, final ClusterEnvironment environment) {
+			final String bucketName, final String scopeName, final ClusterEnvironment environment) {
 		this(
 				new OwnedSupplier<>(
 						Cluster.connect(connectionString, ClusterOptions.clusterOptions(authenticator).environment(environment))),
@@ -75,7 +67,7 @@ public SimpleCouchbaseClientFactory(final Cluster cluster, final String bucketNa
 	}
 
 	private SimpleCouchbaseClientFactory(final Supplier<Cluster> cluster, final String bucketName,
-										 final String scopeName) {
+			final String scopeName) {
 		this.cluster = cluster;
 		this.bucket = cluster.get().bucket(bucketName);
 		this.scope = scopeName == null ? bucket.defaultScope() : bucket.scope(scopeName);
@@ -131,8 +123,4 @@ public void close() {
 		}
 	}
 
-	private static Duration now() {
-		return Duration.of(System.nanoTime(), ChronoUnit.NANOS);
-	}
-
 }

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

@@ -23,7 +23,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.couchbase.client.java.query.QueryScanConsistency;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -67,6 +66,7 @@
 import com.couchbase.client.java.env.ClusterEnvironment;
 import com.couchbase.client.java.json.JacksonTransformers;
 import com.couchbase.client.java.json.JsonValueModule;
+import com.couchbase.client.java.query.QueryScanConsistency;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -136,17 +136,11 @@ protected Authenticator authenticator() {
 	public CouchbaseClientFactory couchbaseClientFactory(final Cluster couchbaseCluster) {
 		return new SimpleCouchbaseClientFactory(couchbaseCluster, getBucketName(), getScopeName());
 	}
-/*
-	@Bean
-	public ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory(final Cluster couchbaseCluster) {
-		return new SimpleReactiveCouchbaseClientFactory(couchbaseCluster, getBucketName(), getScopeName());
-	}
-*/
+
 	@Bean(destroyMethod = "disconnect")
 	public Cluster couchbaseCluster(ClusterEnvironment couchbaseClusterEnvironment) {
-		Cluster c = Cluster.connect(getConnectionString(),
+		return Cluster.connect(getConnectionString(),
 				clusterOptions(authenticator()).environment(couchbaseClusterEnvironment));
-		return c;
 	}
 
 	@Bean(destroyMethod = "shutdown")
@@ -171,29 +165,24 @@ protected void configureEnvironment(final ClusterEnvironment.Builder builder) {
 
 	@Bean(name = BeanNames.COUCHBASE_TEMPLATE)
 	public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
-																						 MappingCouchbaseConverter mappingCouchbaseConverter, TranslationService couchbaseTranslationService) {
-		return new CouchbaseTemplate(couchbaseClientFactory,
-				mappingCouchbaseConverter,
-				couchbaseTranslationService, getDefaultConsistency());
+			MappingCouchbaseConverter mappingCouchbaseConverter, TranslationService couchbaseTranslationService) {
+		return new CouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, couchbaseTranslationService,
+				getDefaultConsistency());
 	}
 
 	public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
-																						 MappingCouchbaseConverter mappingCouchbaseConverter) {
-		return couchbaseTemplate(couchbaseClientFactory,
-				mappingCouchbaseConverter,
-				new JacksonTranslationService());
+			MappingCouchbaseConverter mappingCouchbaseConverter) {
+		return couchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, new JacksonTranslationService());
 	}
 
 	@Bean(name = BeanNames.REACTIVE_COUCHBASE_TEMPLATE)
-	public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(
-			CouchbaseClientFactory couchbaseClientFactory,
+	public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
 			MappingCouchbaseConverter mappingCouchbaseConverter, TranslationService couchbaseTranslationService) {
-		return new ReactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter,
-				couchbaseTranslationService, getDefaultConsistency());
+		return new ReactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, couchbaseTranslationService,
+				getDefaultConsistency());
 	}
 
-	public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(
-			CouchbaseClientFactory couchbaseClientFactory,
+	public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
 			MappingCouchbaseConverter mappingCouchbaseConverter) {
 		return reactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter,
 				new JacksonTranslationService());
@@ -358,7 +347,8 @@ public CouchbaseTransactionalOperator transactionalOperator(
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public TransactionInterceptor transactionInterceptor(TransactionManager couchbaseTransactionManager) {
 		TransactionAttributeSource transactionAttributeSource = new AnnotationTransactionAttributeSource();
-		TransactionInterceptor interceptor = new CouchbaseTransactionInterceptor(couchbaseTransactionManager, transactionAttributeSource);
+		TransactionInterceptor interceptor = new CouchbaseTransactionInterceptor(couchbaseTransactionManager,
+				transactionAttributeSource);
 		interceptor.setTransactionAttributeSource(transactionAttributeSource);
 		if (couchbaseTransactionManager != null) {
 			interceptor.setTransactionManager(couchbaseTransactionManager);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors
+ * Copyright 2012-2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,5 +64,5 @@ public class BeanNames {
 
 	public static final String COUCHBASE_TRANSACTION_MANAGER = "couchbaseTransactionManager";
 
-	public static final String COUCHBASE_TRANSACTIONAL_OPERATOR = "couchbaseTransactionalOperator" ;
+	public static final String COUCHBASE_TRANSACTIONAL_OPERATOR = "couchbaseTransactionalOperator";
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors
+ * Copyright 2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,12 @@
 
 import com.couchbase.client.core.error.CouchbaseException;
 
+
+/**
+ * Base shared by Reactive and non-Reactive TemplateSupport
+ *
+ * @author Michael Reiche
+ */
 public abstract class AbstractTemplateSupport {
 
 	final ReactiveCouchbaseTemplate template;

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

@@ -19,21 +19,39 @@
 import java.util.ConcurrentModificationException;
 import java.util.concurrent.TimeoutException;
 
-import com.couchbase.client.core.error.transaction.TransactionOperationFailedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.dao.OptimisticLockingFailureException;;
+import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.dao.QueryTimeoutException;
 import org.springframework.dao.TransientDataAccessResourceException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-
-import com.couchbase.client.core.error.*;
 import org.springframework.data.couchbase.transaction.error.UncategorizedTransactionDataAccessException;
 
+import com.couchbase.client.core.error.BucketNotFoundException;
+import com.couchbase.client.core.error.CasMismatchException;
+import com.couchbase.client.core.error.CollectionNotFoundException;
+import com.couchbase.client.core.error.ConfigException;
+import com.couchbase.client.core.error.DecodingFailureException;
+import com.couchbase.client.core.error.DesignDocumentNotFoundException;
+import com.couchbase.client.core.error.DocumentExistsException;
+import com.couchbase.client.core.error.DocumentLockedException;
+import com.couchbase.client.core.error.DocumentNotFoundException;
+import com.couchbase.client.core.error.DurabilityAmbiguousException;
+import com.couchbase.client.core.error.DurabilityImpossibleException;
+import com.couchbase.client.core.error.DurabilityLevelNotAvailableException;
+import com.couchbase.client.core.error.EncodingFailureException;
+import com.couchbase.client.core.error.ReplicaNotConfiguredException;
+import com.couchbase.client.core.error.RequestCanceledException;
+import com.couchbase.client.core.error.ScopeNotFoundException;
+import com.couchbase.client.core.error.ServiceNotAvailableException;
+import com.couchbase.client.core.error.TemporaryFailureException;
+import com.couchbase.client.core.error.ValueTooLargeException;
+import com.couchbase.client.core.error.transaction.TransactionOperationFailedException;
+
 /**
  * Simple {@link PersistenceExceptionTranslator} for Couchbase.
  * <p>
@@ -43,6 +61,8 @@
  *
  * @author Michael Nitschinger
  * @author Simon Baslé
+ * @author Michael Reiche
+ * @author Graham Pople
  */
 public class CouchbaseExceptionTranslator implements PersistenceExceptionTranslator {
 
@@ -73,7 +93,7 @@ public final DataAccessException translateExceptionIfPossible(final RuntimeExcep
 			return new OptimisticLockingFailureException(ex.getMessage(), ex);
 		}
 
-		if ( ex instanceof ReplicaNotConfiguredException || ex instanceof DurabilityLevelNotAvailableException
+		if (ex instanceof ReplicaNotConfiguredException || ex instanceof DurabilityLevelNotAvailableException
 				|| ex instanceof DurabilityImpossibleException || ex instanceof DurabilityAmbiguousException) {
 			return new DataIntegrityViolationException(ex.getMessage(), ex);
 		}
@@ -102,7 +122,7 @@ public final DataAccessException translateExceptionIfPossible(final RuntimeExcep
 
 		if (ex instanceof TransactionOperationFailedException) {
 			// Replace the TransactionOperationFailedException, since we want the Spring operation to fail with a
-			// Spring error.  Internal state has already been set in the AttemptContext so the retry, rollback etc.
+			// Spring error. Internal state has already been set in the AttemptContext so the retry, rollback etc.
 			// will get respected regardless of what gets propagated (or not) from the lambda.
 			return new UncategorizedTransactionDataAccessException((TransactionOperationFailedException) ex);
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors
+ * Copyright 2012-2022 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
 import org.springframework.data.couchbase.core.query.Query;
 
-import static org.springframework.data.couchbase.repository.support.Util.hasNonZeroVersionProperty;
-
 import com.couchbase.client.java.query.QueryScanConsistency;
 
 /**
  * Defines common operations on the Couchbase data source, most commonly implemented by {@link CouchbaseTemplate}.
+ *
+ * @author Michael Reiche
  */
 public interface CouchbaseOperations extends FluentCouchbaseOperations {
 
@@ -41,6 +41,7 @@ public interface CouchbaseOperations extends FluentCouchbaseOperations {
 
 	/**
 	 * The name of the scope used, null if the default scope is used.
+	 * todo mr - not used?
 	 */
 	String getScopeName();
 
@@ -53,7 +54,8 @@ public interface CouchbaseOperations extends FluentCouchbaseOperations {
 	 * Returns the default consistency to use for queries
 	 */
 	QueryScanConsistency getConsistency();
-	<T> T save(T entity);
+
+	<T> T save(T entity, String... scopeAndCollection);
 
 	<T> Long count(Query query, Class<T> domainType);