Fix collections on transaction query. (#1571)

Closes #1569.

spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java

@@ -27,7 +27,9 @@ import org.springframework.data.couchbase.core.support.PseudoArgs;
 import org.springframework.data.couchbase.core.support.TemplateUtils;
 import org.springframework.util.Assert;
 
+import com.couchbase.client.core.io.CollectionIdentifier;
 import com.couchbase.client.java.ReactiveScope;
+import com.couchbase.client.java.codec.JsonSerializer;
 import com.couchbase.client.java.query.QueryOptions;
 import com.couchbase.client.java.query.QueryScanConsistency;
 import com.couchbase.client.java.query.ReactiveQueryResult;
@@ -190,8 +192,9 @@ public class ReactiveFindByQueryOperationSupport implements ReactiveFindByQueryO
 							: rs.query(statement, opts);
 				} else {
 					TransactionQueryOptions opts = buildTransactionOptions(pArgs.getOptions());
-					return (AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(),
-							clientFactory.getCluster().environment().jsonSerializer())).query(statement, opts);
+					JsonSerializer jSer = clientFactory.getCluster().environment().jsonSerializer();
+					return AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(), jSer)
+							.query(rs.name().equals(CollectionIdentifier.DEFAULT_SCOPE) ? null : rs, statement, opts);
 				}
 			});
 

spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java

@@ -0,0 +1,142 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *        https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.couchbase.transactions;
+
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertInTransaction;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInTransaction;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.CouchbaseClientFactory;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.domain.User;
+import org.springframework.data.couchbase.domain.UserRepository;
+import org.springframework.data.couchbase.transaction.error.TransactionSystemUnambiguousException;
+import org.springframework.data.couchbase.util.ClusterType;
+import org.springframework.data.couchbase.util.IgnoreWhen;
+import org.springframework.data.couchbase.util.JavaIntegrationTests;
+import org.springframework.stereotype.Service;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Tests @Transactional with repository methods.
+ *
+ * @author Michael Reiche
+ */
+@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
+@SpringJUnitConfig(
+		classes = { TransactionsConfig.class, CouchbaseTransactionalRepositoryIntegrationTests.UserService.class })
+public class CouchbaseTransactionalRepositoryIntegrationTests extends JavaIntegrationTests {
+	// intellij flags "Could not autowire" when config classes are specified with classes={...}. But they are populated.
+	@Autowired UserRepository userRepo;
+	@Autowired CouchbaseClientFactory couchbaseClientFactory;
+	@Autowired UserService userService;
+	@Autowired CouchbaseTemplate operations;
+
+	@BeforeAll
+	public static void beforeAll() {
+		callSuperBeforeAll(new Object() {});
+	}
+
+	@BeforeEach
+	public void beforeEachTest() {
+		assertNotInTransaction();
+	}
+
+	@AfterEach
+	public void afterEachTest() {
+		assertNotInTransaction();
+	}
+
+	@Test
+	public void findByFirstname() {
+		operations.insertById(User.class).one(new User(UUID.randomUUID().toString(), "Ada", "Lovelace"));
+
+		List<User> users = userService.findByFirstname("Ada");
+
+		assertNotEquals(0, users.size());
+	}
+
+	@Test
+	public void save() {
+		String id = UUID.randomUUID().toString();
+
+		userService.run(repo -> {
+			assertInTransaction();
+
+			User user0 = repo.save(new User(id, "Ada", "Lovelace"));
+
+			assertInTransaction();
+
+			// read your own write
+			User user1 = operations.findById(User.class).one(id);
+			assertNotNull(user1);
+
+			assertInTransaction();
+
+		});
+
+		User user = operations.findById(User.class).one(id);
+		assertNotNull(user);
+	}
+
+	@DisplayName("Test that repo.save() is actually performed transactionally, by forcing a rollback")
+	@Test
+	public void saveRolledBack() {
+		String id = UUID.randomUUID().toString();
+
+		assertThrowsWithCause(() -> {
+			userService.run(repo -> {
+				User user = repo.save(new User(id, "Ada", "Lovelace"));
+				SimulateFailureException.throwEx("fail");
+			});
+		}, TransactionSystemUnambiguousException.class, SimulateFailureException.class);
+
+		User user = operations.findById(User.class).one(id);
+		assertNull(user);
+	}
+
+	@Service // this will work in the unit tests even without @Service because of explicit loading by @SpringJUnitConfig
+	static class UserService {
+		@Autowired UserRepository userRepo;
+
+		@Transactional
+		public void run(Consumer<UserRepository> callback) {
+			callback.accept(userRepo);
+		}
+
+		@Transactional
+		public List<User> findByFirstname(String name) {
+			return userRepo.findByFirstname(name);
+		}
+
+	}
+
+}