Polish "Add reactive health indicator for Cassandra"

Closes gh-13864

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -16,55 +16,39 @@
 
 package org.springframework.boot.actuate.autoconfigure.cassandra;
 
-import java.util.Map;
-
 import com.datastax.driver.core.Cluster;
 
-import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
 import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
-import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
-import org.springframework.context.annotation.Bean;
+import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.cassandra.core.CassandraOperations;
+import org.springframework.context.annotation.Import;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for
- * {@link CassandraHealthIndicator}.
+ * {@link EnableAutoConfiguration Auto-configuration} for {@link CassandraHealthIndicator}
+ * and {@link CassandraReactiveHealthIndicator}.
  *
  * @author Julien Dubois
+ * @author Stephane Nicoll
  * @since 2.0.0
  */
 @Configuration
-@ConditionalOnClass({ CassandraOperations.class, Cluster.class })
-@ConditionalOnBean(CassandraOperations.class)
+@ConditionalOnClass(Cluster.class)
 @ConditionalOnEnabledHealthIndicator("cassandra")
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
 @AutoConfigureAfter({ CassandraAutoConfiguration.class,
-		CassandraDataAutoConfiguration.class })
-public class CassandraHealthIndicatorAutoConfiguration extends
-		CompositeHealthIndicatorConfiguration<CassandraHealthIndicator, CassandraOperations> {
-
-	private final Map<String, CassandraOperations> cassandraOperations;
-
-	public CassandraHealthIndicatorAutoConfiguration(
-			Map<String, CassandraOperations> cassandraOperations) {
-		this.cassandraOperations = cassandraOperations;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
-	public HealthIndicator cassandraHealthIndicator() {
-		return createHealthIndicator(this.cassandraOperations);
-	}
+		CassandraDataAutoConfiguration.class,
+		CassandraReactiveDataAutoConfiguration.class })
+@Import({ CassandraReactiveHealthIndicatorConfiguration.class,
+		CassandraHealthIndicatorConfiguration.class })
+public class CassandraHealthIndicatorAutoConfiguration {
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012-2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.cassandra;
+
+import java.util.Map;
+
+import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
+import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.cassandra.core.CassandraOperations;
+
+/**
+ * Configuration for {@link CassandraHealthIndicator}.
+ *
+ * @author Julien Dubois
+ */
+@Configuration
+@ConditionalOnClass(CassandraOperations.class)
+@ConditionalOnBean(CassandraOperations.class)
+class CassandraHealthIndicatorConfiguration extends
+		CompositeHealthIndicatorConfiguration<CassandraHealthIndicator, CassandraOperations> {
+
+	private final Map<String, CassandraOperations> cassandraOperations;
+
+	CassandraHealthIndicatorConfiguration(
+			Map<String, CassandraOperations> cassandraOperations) {
+		this.cassandraOperations = cassandraOperations;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
+	public HealthIndicator cassandraHealthIndicator() {
+		return createHealthIndicator(this.cassandraOperations);
+	}
+
+}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -15,45 +15,33 @@
  */
 package org.springframework.boot.actuate.autoconfigure.cassandra;
 
-import com.datastax.driver.core.Cluster;
+import java.util.Map;
+
 import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthIndicatorConfiguration;
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
 import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
 
-import java.util.Map;
-
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for
- * {@link org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator}.
+ * Configuration for {@link CassandraReactiveHealthIndicator}.
  *
  * @author Artsiom Yudovin
- * @since 2.0.0
+ * @author Stephane Nicoll
  */
 @Configuration
-@ConditionalOnClass({ReactiveCassandraOperations.class, Cluster.class })
+@ConditionalOnClass(ReactiveCassandraOperations.class)
 @ConditionalOnBean(ReactiveCassandraOperations.class)
-@ConditionalOnEnabledHealthIndicator("cassandra")
-@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
-@AutoConfigureAfter({ CassandraAutoConfiguration.class,
-		CassandraReactiveDataAutoConfiguration.class })
-public class CassandraReactiveHealthIndicatorAutoConfiguration extends
+class CassandraReactiveHealthIndicatorConfiguration extends
 		CompositeReactiveHealthIndicatorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
+
 	private final Map<String, ReactiveCassandraOperations> reactiveCassandraOperations;
 
-	public CassandraReactiveHealthIndicatorAutoConfiguration(
+	CassandraReactiveHealthIndicatorConfiguration(
 			Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
 		this.reactiveCassandraOperations = reactiveCassandraOperations;
 	}
@@ -63,4 +51,5 @@ public CassandraReactiveHealthIndicatorAutoConfiguration(
 	public ReactiveHealthIndicator cassandraHealthIndicator() {
 		return createHealthIndicator(this.reactiveCassandraOperations);
 	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -5,7 +5,6 @@ org.springframework.boot.actuate.autoconfigure.audit.AuditEventsEndpointAutoConf
 org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.cache.CachesEndpointAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthIndicatorAutoConfiguration,\
-org.springframework.boot.actuate.autoconfigure.cassandra.CassandraReactiveHealthIndicatorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryActuatorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive.ReactiveCloudFoundryActuatorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration,\

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -17,12 +17,12 @@
 package org.springframework.boot.actuate.autoconfigure.cassandra;
 
 import org.junit.Test;
+
 import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
 import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
 import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,16 +32,17 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link CassandraReactiveHealthIndicatorAutoConfiguration}.
+ * Tests for {@link CassandraReactiveHealthIndicatorConfiguration}.
  *
  * @author Artsiom Yudovin
+ * @author Stephane Nicoll
  */
-public class CassandraReactiveHealthIndicatorAutoConfigurationTests {
+public class CassandraReactiveHealthIndicatorConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(CassandraReactiveHealthIndicatorAutoConfigurationTests.CassandraConfiguration.class,
-					CassandraReactiveHealthIndicatorAutoConfiguration.class,
-					HealthIndicatorAutoConfiguration.class));
+			.withUserConfiguration(CassandraMockConfiguration.class).withConfiguration(
+					AutoConfigurations.of(CassandraHealthIndicatorAutoConfiguration.class,
+							HealthIndicatorAutoConfiguration.class));
 
 	@Test
 	public void runShouldCreateIndicator() {
@@ -60,13 +61,13 @@ public void runWhenDisabledShouldNotCreateIndicator() {
 	}
 
 	@Configuration
-	@AutoConfigureBefore(CassandraReactiveHealthIndicatorAutoConfiguration.class)
-	protected static class CassandraConfiguration {
+	protected static class CassandraMockConfiguration {
 
 		@Bean
 		public ReactiveCassandraOperations cassandraOperations() {
 			return mock(ReactiveCassandraOperations.class);
 		}
 
 	}
+
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java

@@ -17,20 +17,19 @@
 
 import com.datastax.driver.core.querybuilder.QueryBuilder;
 import com.datastax.driver.core.querybuilder.Select;
+import reactor.core.publisher.Mono;
+
 import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.data.cassandra.ReactiveResultSet;
+import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
 import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
 import org.springframework.util.Assert;
-import reactor.core.publisher.Mono;
 
 /**
- * Simple implementation of a {@link HealthIndicator} returning status information for
- * Cassandra data stores.
+ * A {@link ReactiveHealthIndicator} for Cassandra.
  *
  * @author Artsiom Yudovin
- * @since 2.0.0
+ * @since 2.1.0
  */
 public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
 
@@ -40,20 +39,20 @@ public class CassandraReactiveHealthIndicator extends AbstractReactiveHealthIndi
 	 * Create a new {@link CassandraHealthIndicator} instance.
 	 * @param reactiveCassandraOperations the Cassandra operations
 	 */
-	public CassandraReactiveHealthIndicator(ReactiveCassandraOperations reactiveCassandraOperations) {
-		Assert.notNull(reactiveCassandraOperations, "ReactiveCassandraOperations must not be null");
+	public CassandraReactiveHealthIndicator(
+			ReactiveCassandraOperations reactiveCassandraOperations) {
+		Assert.notNull(reactiveCassandraOperations,
+				"ReactiveCassandraOperations must not be null");
 		this.reactiveCassandraOperations = reactiveCassandraOperations;
 	}
 
 	@Override
 	protected Mono<Health> doHealthCheck(Health.Builder builder) {
 		Select select = QueryBuilder.select("release_version").from("system", "local");
-		Mono<String> results = this.reactiveCassandraOperations.getReactiveCqlOperations()
-				.queryForObject(select, String.class);
-
-		return results
-		        .map(version -> builder.up().withDetail("version", version).build())
+		return this.reactiveCassandraOperations.getReactiveCqlOperations()
+				.queryForObject(select, String.class)
+				.map((version) -> builder.up().withDetail("version", version).build())
 				.single();
+	}
 
-		}
 }