Skip to content

Commit fead976

Browse files
scottfrederickscottfrederick
committed
Adapt to changes in Couchbase client
See gh-33588
1 parent 5f30a70 commit fead976

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicatorTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import com.couchbase.client.core.diagnostics.DiagnosticsResult;
2626
import com.couchbase.client.core.diagnostics.EndpointDiagnostics;
27+
import com.couchbase.client.core.endpoint.CircuitBreaker;
2728
import com.couchbase.client.core.endpoint.EndpointState;
2829
import com.couchbase.client.core.service.ServiceType;
2930
import com.couchbase.client.java.Cluster;
@@ -51,9 +52,9 @@ void couchbaseClusterIsUp() {
5152
Cluster cluster = mock(Cluster.class);
5253
CouchbaseHealthIndicator healthIndicator = new CouchbaseHealthIndicator(cluster);
5354
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
54-
Collections.singletonList(
55-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
56-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty())));
55+
Collections.singletonList(new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED,
56+
CircuitBreaker.State.DISABLED, "127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
57+
Optional.of("endpoint-1"), Optional.empty())));
5758

5859
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
5960
given(cluster.diagnostics()).willReturn(diagnostics);
@@ -72,10 +73,12 @@ void couchbaseClusterIsDown() {
7273
CouchbaseHealthIndicator healthIndicator = new CouchbaseHealthIndicator(cluster);
7374
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
7475
Arrays.asList(
75-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
76-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty()),
77-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, "127.0.0.1", "127.0.0.1",
78-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-2"), Optional.empty())));
76+
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, CircuitBreaker.State.DISABLED,
77+
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
78+
Optional.of("endpoint-1"), Optional.empty()),
79+
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, CircuitBreaker.State.DISABLED,
80+
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
81+
Optional.of("endpoint-2"), Optional.empty())));
7982
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
8083
given(cluster.diagnostics()).willReturn(diagnostics);
8184
Health health = healthIndicator.health();

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/couchbase/CouchbaseReactiveHealthIndicatorTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import com.couchbase.client.core.diagnostics.DiagnosticsResult;
2727
import com.couchbase.client.core.diagnostics.EndpointDiagnostics;
28+
import com.couchbase.client.core.endpoint.CircuitBreaker;
2829
import com.couchbase.client.core.endpoint.EndpointState;
2930
import com.couchbase.client.core.service.ServiceType;
3031
import com.couchbase.client.java.Cluster;
@@ -51,9 +52,9 @@ void couchbaseClusterIsUp() {
5152
Cluster cluster = mock(Cluster.class);
5253
CouchbaseReactiveHealthIndicator healthIndicator = new CouchbaseReactiveHealthIndicator(cluster);
5354
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
54-
Collections.singletonList(
55-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
56-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty())));
55+
Collections.singletonList(new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED,
56+
CircuitBreaker.State.DISABLED, "127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
57+
Optional.of("endpoint-1"), Optional.empty())));
5758
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
5859
ReactiveCluster reactiveCluster = mock(ReactiveCluster.class);
5960
given(reactiveCluster.diagnostics()).willReturn(Mono.just(diagnostics));
@@ -73,10 +74,12 @@ void couchbaseClusterIsDown() {
7374
CouchbaseReactiveHealthIndicator healthIndicator = new CouchbaseReactiveHealthIndicator(cluster);
7475
Map<ServiceType, List<EndpointDiagnostics>> endpoints = Collections.singletonMap(ServiceType.KV,
7576
Arrays.asList(
76-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, "127.0.0.1", "127.0.0.1",
77-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-1"), Optional.empty()),
78-
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, "127.0.0.1", "127.0.0.1",
79-
Optional.empty(), Optional.of(1234L), Optional.of("endpoint-2"), Optional.empty())));
77+
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTED, CircuitBreaker.State.DISABLED,
78+
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
79+
Optional.of("endpoint-1"), Optional.empty()),
80+
new EndpointDiagnostics(ServiceType.KV, EndpointState.CONNECTING, CircuitBreaker.State.DISABLED,
81+
"127.0.0.1", "127.0.0.1", Optional.empty(), Optional.of(1234L),
82+
Optional.of("endpoint-2"), Optional.empty())));
8083
DiagnosticsResult diagnostics = new DiagnosticsResult(endpoints, "test-sdk", "test-id");
8184
ReactiveCluster reactiveCluster = mock(ReactiveCluster.class);
8285
given(reactiveCluster.diagnostics()).willReturn(Mono.just(diagnostics));

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import javax.net.ssl.KeyManagerFactory;
2424
import javax.net.ssl.TrustManagerFactory;
2525

26-
import com.couchbase.client.core.env.IoConfig;
27-
import com.couchbase.client.core.env.SecurityConfig;
28-
import com.couchbase.client.core.env.TimeoutConfig;
2926
import com.couchbase.client.java.Cluster;
3027
import com.couchbase.client.java.ClusterOptions;
3128
import com.couchbase.client.java.codec.JacksonJsonSerializer;
@@ -83,16 +80,16 @@ public Cluster couchbaseCluster(CouchbaseProperties properties, ClusterEnvironme
8380
private ClusterEnvironment.Builder initializeEnvironmentBuilder(CouchbaseProperties properties) {
8481
ClusterEnvironment.Builder builder = ClusterEnvironment.builder();
8582
Timeouts timeouts = properties.getEnv().getTimeouts();
86-
builder.timeoutConfig(TimeoutConfig.kvTimeout(timeouts.getKeyValue()).analyticsTimeout(timeouts.getAnalytics())
87-
.kvDurableTimeout(timeouts.getKeyValueDurable()).queryTimeout(timeouts.getQuery())
88-
.viewTimeout(timeouts.getView()).searchTimeout(timeouts.getSearch())
83+
builder.timeoutConfig((config) -> config.kvTimeout(timeouts.getKeyValue())
84+
.analyticsTimeout(timeouts.getAnalytics()).kvDurableTimeout(timeouts.getKeyValueDurable())
85+
.queryTimeout(timeouts.getQuery()).viewTimeout(timeouts.getView()).searchTimeout(timeouts.getSearch())
8986
.managementTimeout(timeouts.getManagement()).connectTimeout(timeouts.getConnect())
9087
.disconnectTimeout(timeouts.getDisconnect()));
9188
CouchbaseProperties.Io io = properties.getEnv().getIo();
92-
builder.ioConfig(IoConfig.maxHttpConnections(io.getMaxEndpoints()).numKvConnections(io.getMinEndpoints())
93-
.idleHttpConnectionTimeout(io.getIdleHttpConnectionTimeout()));
89+
builder.ioConfig((config) -> config.maxHttpConnections(io.getMaxEndpoints())
90+
.numKvConnections(io.getMinEndpoints()).idleHttpConnectionTimeout(io.getIdleHttpConnectionTimeout()));
9491
if (properties.getEnv().getSsl().getEnabled()) {
95-
builder.securityConfig(SecurityConfig.enableTls(true)
92+
builder.securityConfig((config) -> config.enableTls(true)
9693
.trustManagerFactory(getTrustManagerFactory(properties.getEnv().getSsl())));
9794
}
9895
return builder;

0 commit comments

Comments
 (0)