Was not using QueryContext in tx when scope=_default, but collection!=_default. (#1746)

Closes #1745.

Author: mikereiche

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import com.couchbase.client.core.api.query.CoreQueryContext;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -194,7 +195,7 @@ public Flux<T> all() {
 					TransactionQueryOptions opts = buildTransactionOptions(pArgs.getOptions());
 					JsonSerializer jSer = clientFactory.getCluster().environment().jsonSerializer();
 					return AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(), jSer)
-							.query(rs.name().equals(CollectionIdentifier.DEFAULT_SCOPE) ? null : rs, statement, opts);
+							.query(OptionsBuilder.queryContext(pArgs.getScope(), pArgs.getCollection(), rs.bucketName()) == null ? null : rs, statement, opts);
 				}
 			});
 

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

@@ -101,7 +101,7 @@ public Flux<RemoveResult> all() {
 				} else {
 					TransactionQueryOptions opts = OptionsBuilder
 							.buildTransactionQueryOptions(buildQueryOptions(pArgs.getOptions()));
-					CoreQueryContext queryContext = CollectionIdentifier.DEFAULT_SCOPE.equals(rs.name()) ? null : CoreQueryContext.of(rs.bucketName(), rs.name());
+					CoreQueryContext queryContext = OptionsBuilder.queryContext(pArgs.getScope(), pArgs.getCollection(), rs.bucketName());
 					return transactionContext.get().getCore()
 							.queryBlocking(statement, queryContext, opts.builder().build(), false)
 							.flatMapIterable(result -> result.collectRows()).map(row -> {

src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java

@@ -565,4 +565,11 @@ public static ScanOptions buildScanOptions(ScanOptions options, Object sort, Boo
 		}
 		return options;
 	}
+
+        public static CoreQueryContext queryContext(String scope, String collection, String bucketName) {
+          return (scope == null || CollectionIdentifier.DEFAULT_SCOPE.equals(scope))
+              && (collection == null || CollectionIdentifier.DEFAULT_COLLECTION.equals(collection)) ? null
+                  : CoreQueryContext.of(bucketName, scope);
+        }
+ }
 }