Commit 5ad4de18 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.2.x'

Closes gh-20718
parents 876371e0 05f10819
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package org.springframework.boot.actuate.cassandra; package org.springframework.boot.actuate.cassandra;
import com.datastax.oss.driver.api.core.ConsistencyLevel;
import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.SimpleStatement;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
...@@ -32,6 +33,9 @@ import org.springframework.util.Assert; ...@@ -32,6 +33,9 @@ import org.springframework.util.Assert;
*/ */
public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndicator { public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
private static final SimpleStatement SELECT = SimpleStatement
.newInstance("SELECT release_version FROM system.local").setConsistencyLevel(ConsistencyLevel.LOCAL_ONE);
private final ReactiveCassandraOperations reactiveCassandraOperations; private final ReactiveCassandraOperations reactiveCassandraOperations;
/** /**
...@@ -46,8 +50,7 @@ public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndi ...@@ -46,8 +50,7 @@ public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndi
@Override @Override
protected Mono<Health> doHealthCheck(Health.Builder builder) { protected Mono<Health> doHealthCheck(Health.Builder builder) {
SimpleStatement select = SimpleStatement.newInstance("SELECT release_version FROM system.local"); return this.reactiveCassandraOperations.getReactiveCqlOperations().queryForObject(SELECT, String.class)
return this.reactiveCassandraOperations.getReactiveCqlOperations().queryForObject(select, String.class)
.map((version) -> builder.up().withDetail("version", version).build()).single(); .map((version) -> builder.up().withDetail("version", version).build()).single();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment