Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Couchbase Client 3.1.5

Browse Source 
Closes gh-26531
This commit is contained in:
Andy Wilkinson
2021-05-17 12:05:06 +01:00
parent 78f7044097
commit 24d252e322
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
View File

@@ -79,8 +79,8 @@ class CouchbaseAutoConfigurationTests {
context.getBean(ObjectMapper.class).getRegisteredModuleIds());
expectedModuleIds.add(new JsonValueModule().getTypeId());
JsonSerializer serializer = env.jsonSerializer();
assertThat(serializer).isInstanceOf(JacksonJsonSerializer.class).extracting("mapper")
.asInstanceOf(InstanceOfAssertFactories.type(ObjectMapper.class))
assertThat(serializer).extracting("wrapped").isInstanceOf(JacksonJsonSerializer.class)
.extracting("mapper").asInstanceOf(InstanceOfAssertFactories.type(ObjectMapper.class))
.extracting(ObjectMapper::getRegisteredModuleIds).isEqualTo(expectedModuleIds);
});
}
@@ -95,7 +95,7 @@ class CouchbaseAutoConfigurationTests {
.withPropertyValues("spring.couchbase.connection-string=localhost").run((context) -> {
ClusterEnvironment env = context.getBean(ClusterEnvironment.class);
JsonSerializer serializer = env.jsonSerializer();
assertThat(serializer).isSameAs(customJsonSerializer);
assertThat(serializer).extracting("wrapped").isSameAs(customJsonSerializer);
});
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -215,7 +215,7 @@ bom {
]
}
}
library("Couchbase Client", "3.1.4") {
library("Couchbase Client", "3.1.5") {
group("com.couchbase.client") {
modules = [
"java-client"

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java
View File

@@ -16,7 +16,7 @@
package smoketest.data.couchbase;
import com.couchbase.client.core.error.FeatureNotAvailableException;
import com.couchbase.client.core.error.AmbiguousTimeoutException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -46,10 +46,10 @@ class SampleCouchbaseApplicationTests {
private boolean serverNotRunning(RuntimeException ex) {
NestedCheckedException nested = new NestedCheckedException("failed", ex) {
};
if (nested.contains(FeatureNotAvailableException.class)) {
if (nested.contains(AmbiguousTimeoutException.class)) {
Throwable root = nested.getRootCause();
// This is not ideal, we should have a better way to know what is going on
if (root.getMessage().contains("The cluster does not support cluster-level queries")) {
if (root.getMessage().contains("QueryRequest, Reason: TIMEOUT")) {
return true;
}
}