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

Adapt to changes in Couchbase client

Browse Source 
See gh-33588
This commit is contained in:
Scott Frederick
2022-12-21 11:48:39 -06:00
parent 5f30a70581
commit fead976952
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicatorTests.java
View File

@@ -24,6 +24,7 @@ import java.util.Optional;
import com.couchbase.client.core.diagnostics.DiagnosticsResult;
import com.couchbase.client.core.diagnostics.EndpointDiagnostics;
import com.couchbase.client.core.endpoint.CircuitBreaker;
import com.couchbase.client.core.endpoint.EndpointState;
import com.couchbase.client.core.service.ServiceType;
import com.couchbase.client.java.Cluster;
@@ -51,9 +52,9 @@ class CouchbaseHealthIndicatorTests {
Cluster cluster = mock(Cluster.class);
CouchbaseHealthIndicator healthIndicator = new CouchbaseHealthIndicator(cluster);
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
Collections.singletonList(
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty())));
Collections.singletonList(new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED,
CircuitBreaker.State.DISABLED, "127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-1"), Optional.empty())));
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
given(cluster.diagnostics()).willReturn(diagnostics);
@@ -72,10 +73,12 @@ class CouchbaseHealthIndicatorTests {
CouchbaseHealthIndicator healthIndicator = new CouchbaseHealthIndicator(cluster);
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
Arrays.asList(
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty()),
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-2"), Optional.empty())));
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, CircuitBreaker.State.DISABLED,
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-1"), Optional.empty()),
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, CircuitBreaker.State.DISABLED,
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-2"), Optional.empty())));
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
given(cluster.diagnostics()).willReturn(diagnostics);
Health health = healthIndicator.health();

17
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/couchbase/CouchbaseReactiveHealthIndicatorTests.java
View File

@@ -25,6 +25,7 @@ import java.util.Optional;
import com.couchbase.client.core.diagnostics.DiagnosticsResult;
import com.couchbase.client.core.diagnostics.EndpointDiagnostics;
import com.couchbase.client.core.endpoint.CircuitBreaker;
import com.couchbase.client.core.endpoint.EndpointState;
import com.couchbase.client.core.service.ServiceType;
import com.couchbase.client.java.Cluster;
@@ -51,9 +52,9 @@ class CouchbaseReactiveHealthIndicatorTests {
Cluster cluster = mock(Cluster.class);
CouchbaseReactiveHealthIndicator healthIndicator = new CouchbaseReactiveHealthIndicator(cluster);
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
Collections.singletonList(
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty())));
Collections.singletonList(new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED,
CircuitBreaker.State.DISABLED, "127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-1"), Optional.empty())));
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
ReactiveCluster reactiveCluster = mock(ReactiveCluster.class);
given(reactiveCluster.diagnostics()).willReturn(Mono.just(diagnostics));
@@ -73,10 +74,12 @@ class CouchbaseReactiveHealthIndicatorTests {
CouchbaseReactiveHealthIndicator healthIndicator = new CouchbaseReactiveHealthIndicator(cluster);
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
Arrays.asList(
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty()),
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, "127.0.0.1", "127.0.0.1",
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-2"), Optional.empty())));
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, CircuitBreaker.State.DISABLED,
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-1"), Optional.empty()),
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, CircuitBreaker.State.DISABLED,
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
Optional.of("endpoint-2"), Optional.empty())));
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
ReactiveCluster reactiveCluster = mock(ReactiveCluster.class);
given(reactiveCluster.diagnostics()).willReturn(Mono.just(diagnostics));

15
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
View File

@@ -23,9 +23,6 @@ import java.security.KeyStore;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;
import com.couchbase.client.core.env.IoConfig;
import com.couchbase.client.core.env.SecurityConfig;
import com.couchbase.client.core.env.TimeoutConfig;
import com.couchbase.client.java.Cluster;
import com.couchbase.client.java.ClusterOptions;
import com.couchbase.client.java.codec.JacksonJsonSerializer;
@@ -83,16 +80,16 @@ public class CouchbaseAutoConfiguration {
private ClusterEnvironment.Builder initializeEnvironmentBuilder(CouchbaseProperties properties) {
ClusterEnvironment.Builder builder = ClusterEnvironment.builder();
Timeouts timeouts = properties.getEnv().getTimeouts();
builder.timeoutConfig(TimeoutConfig.kvTimeout(timeouts.getKeyValue()).analyticsTimeout(timeouts.getAnalytics())
.kvDurableTimeout(timeouts.getKeyValueDurable()).queryTimeout(timeouts.getQuery())
.viewTimeout(timeouts.getView()).searchTimeout(timeouts.getSearch())
builder.timeoutConfig((config) -> config.kvTimeout(timeouts.getKeyValue())
.analyticsTimeout(timeouts.getAnalytics()).kvDurableTimeout(timeouts.getKeyValueDurable())
.queryTimeout(timeouts.getQuery()).viewTimeout(timeouts.getView()).searchTimeout(timeouts.getSearch())
.managementTimeout(timeouts.getManagement()).connectTimeout(timeouts.getConnect())
.disconnectTimeout(timeouts.getDisconnect()));
CouchbaseProperties.Io io = properties.getEnv().getIo();
builder.ioConfig(IoConfig.maxHttpConnections(io.getMaxEndpoints()).numKvConnections(io.getMinEndpoints())
.idleHttpConnectionTimeout(io.getIdleHttpConnectionTimeout()));
builder.ioConfig((config) -> config.maxHttpConnections(io.getMaxEndpoints())
.numKvConnections(io.getMinEndpoints()).idleHttpConnectionTimeout(io.getIdleHttpConnectionTimeout()));
if (properties.getEnv().getSsl().getEnabled()) {
builder.securityConfig(SecurityConfig.enableTls(true)
builder.securityConfig((config) -> config.enableTls(true)
.trustManagerFactory(getTrustManagerFactory(properties.getEnv().getSsl())));
}
return builder;