Bump Couchase SDK to 324 on 50x.

Closes #1284.

Author: mikereiche

pom.xml

@@ -19,8 +19,8 @@
     </parent>
 
     <properties>
-        <couchbase>3.2.3</couchbase>
-        <couchbase.osgi>3.2.3</couchbase.osgi>
+        <couchbase>3.2.4</couchbase>
+        <couchbase.osgi>3.2.4</couchbase.osgi>
         <springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.couchbase</java-module-name>
         <jodatime>2.10.13</jodatime>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-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.
@@ -130,15 +130,15 @@ Long countFancyExpression(@Param("projectIds") List<String> projectIds, @Param("
 	Page<Airport> getAllByIataNot(String iata, Pageable pageable);
 
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-	@Query("SELECT iata, \"\" as __id, 0 as __cas from #{#n1ql.bucket} WHERE #{#n1ql.filter} order by meta().id")
+	@Query("SELECT iata, \"\" as __id, 0 as __cas from `#{#n1ql.bucket}` WHERE #{#n1ql.filter} order by meta().id")
 	List<String> getStrings();
 
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-	@Query("SELECT length(iata), \"\" as __id, 0 as __cas from #{#n1ql.bucket} WHERE #{#n1ql.filter} order by meta().id")
+	@Query("SELECT length(iata), \"\" as __id, 0 as __cas from `#{#n1ql.bucket}` WHERE #{#n1ql.filter} order by meta().id")
 	List<Long> getLongs();
 
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-	@Query("SELECT iata, icao, \"\" as __id, 0 as __cas from #{#n1ql.bucket} WHERE #{#n1ql.filter} order by meta().id")
+	@Query("SELECT iata, icao, \"\" as __id, 0 as __cas from `#{#n1ql.bucket}` WHERE #{#n1ql.filter} order by meta().id")
 	List<String[]> getStringArrays();
 
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-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.
@@ -29,6 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.data.couchbase.config.BeanNames.COUCHBASE_TEMPLATE;
 
+import com.couchbase.client.java.kv.RemoveOptions;
 import jakarta.validation.ConstraintViolationException;
 import junit.framework.AssertionFailedError;
 
@@ -273,6 +274,7 @@ void findBySimplePropertyReturnType() {
 
 	@Test
 	public void saveNotBoundedRequestPlus() {
+		airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).deleteAll();
 		ApplicationContext ac = new AnnotationConfigApplicationContext(ConfigRequestPlus.class);
 		// the Config class has been modified, these need to be loaded again
 		CouchbaseTemplate couchbaseTemplateRP = (CouchbaseTemplate) ac.getBean(COUCHBASE_TEMPLATE);
@@ -311,7 +313,7 @@ public void saveNotBoundedRequestPlus() {
 
 	@Test
 	public void saveNotBoundedWithDefaultRepository() {
-
+		airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).deleteAll();
 		ApplicationContext ac = new AnnotationConfigApplicationContext(Config.class);
 		// the Config class has been modified, these need to be loaded again
 		CouchbaseTemplate couchbaseTemplateRP = (CouchbaseTemplate) ac.getBean(COUCHBASE_TEMPLATE);
@@ -565,6 +567,7 @@ void stringQueryReturnsSimpleType(){
 
 	@Test
 	void count() {
+		airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).deleteAll();
 		String[] iatas = { "JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX" };
 
 		airportRepository.countOne();
@@ -663,6 +666,7 @@ void threadSafeParametersTest() throws Exception {
 	void distinct() {
 		String[] iatas = { "JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX" };
 		String[] icaos = { "ic0", "ic1", "ic0", "ic1", "ic0", "ic1", "ic0" };
+		airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).deleteAll();
 
 		try {
 			for (int i = 0; i < iatas.length; i++) {

src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors
+ * Copyright 2020-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.
@@ -27,6 +27,12 @@
 import static org.springframework.data.couchbase.config.BeanNames.REACTIVE_COUCHBASE_TEMPLATE;
 import static org.springframework.data.couchbase.util.Util.waitUntilCondition;
 
+import okhttp3.Credentials;
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Collections;
@@ -39,7 +45,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.couchbase.client.core.io.CollectionIdentifier;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.springframework.context.ApplicationContext;
@@ -60,6 +65,7 @@
 import com.couchbase.client.core.error.QueryException;
 import com.couchbase.client.core.error.ScopeNotFoundException;
 import com.couchbase.client.core.error.UnambiguousTimeoutException;
+import com.couchbase.client.core.io.CollectionIdentifier;
 import com.couchbase.client.core.json.Mapper;
 import com.couchbase.client.core.service.ServiceType;
 import com.couchbase.client.java.Bucket;
@@ -200,6 +206,7 @@ protected static void waitForQueryIndexerToHaveBucket(final Cluster cluster, fin
 			}
 
 			if (!ready) {
+				createAndDeleteBucket();// need to do this because of https://issues.couchbase.com/browse/MB-50132
 				try {
 					Thread.sleep(50);
 				} catch (InterruptedException e) {}
@@ -211,6 +218,32 @@ protected static void waitForQueryIndexerToHaveBucket(final Cluster cluster, fin
 		}
 	}
 
+	private static void createAndDeleteBucket() {
+		final OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
+				.readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).build();
+		String hostPort = connectionString().replace("11210", "8091");
+		String bucketname = UUID.randomUUID().toString();
+		try {
+
+			Response postResponse = httpClient.newCall(new Request.Builder()
+					.header("Authorization", Credentials.basic(config().adminUsername(), config().adminPassword()))
+					.url("http://" + hostPort + "/pools/default/buckets/")
+					.post(new FormBody.Builder().add("name", bucketname).add("bucketType", "membase").add("ramQuotaMB", "100")
+							.add("replicaNumber", Integer.toString(0)).add("flushEnabled", "1").build())
+					.build()).execute();
+
+			if (postResponse.code() != 202) {
+				throw new IOException("Could not create bucket: " + postResponse + ", Reason: " + postResponse.body().string());
+			}
+			Response deleteResponse = httpClient.newCall(new Request.Builder()
+					.header("Authorization", Credentials.basic(config().adminUsername(), config().adminPassword()))
+					.url("http://" + hostPort + "/pools/default/buckets/" + bucketname).delete().build()).execute();
+			System.out.println("deleteResponse: " + deleteResponse);
+		} catch (IOException ioe) {
+			ioe.printStackTrace();
+		}
+	}
+
 	/**
 	 * Improve test stability by waiting for a given service to report itself ready.
 	 */