Skip to content

Commit 35e069e

Browse files
snicollsnicoll
committed
Polish "Add health indicator for Cassandra that uses the CqlSession"
See gh-20887
1 parent dad9ec8 commit 35e069e

File tree

14 files changed

+192
-368
lines changed

14 files changed

+192
-368
lines changed

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 0 additions & 58 deletions
This file was deleted.

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,19 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.cassandra;
1818

19-
import java.util.Map;
20-
2119
import com.datastax.oss.driver.api.core.CqlSession;
2220

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
21+
import org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthContributorConfigurations.CassandraDriverConfiguration;
22+
import org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthContributorConfigurations.CassandraOperationsConfiguration;
2423
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2524
import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
26-
import org.springframework.boot.actuate.health.HealthContributor;
2725
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2826
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2927
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3128
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
32-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3329
import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
34-
import org.springframework.context.annotation.Bean;
3530
import org.springframework.context.annotation.Configuration;
36-
import org.springframework.data.cassandra.core.CassandraOperations;
31+
import org.springframework.context.annotation.Import;
3732

3833
/**
3934
* {@link EnableAutoConfiguration Auto-configuration} for
@@ -44,18 +39,11 @@
4439
* @since 2.1.0
4540
*/
4641
@Configuration(proxyBeanMethods = false)
47-
@ConditionalOnClass({ CqlSession.class, CassandraOperations.class })
48-
@ConditionalOnBean(CassandraOperations.class)
42+
@ConditionalOnClass(CqlSession.class)
4943
@ConditionalOnEnabledHealthIndicator("cassandra")
5044
@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
5145
CassandraReactiveHealthContributorAutoConfiguration.class })
52-
public class CassandraHealthContributorAutoConfiguration
53-
extends CompositeHealthContributorConfiguration<CassandraHealthIndicator, CassandraOperations> {
54-
55-
@Bean
56-
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
57-
public HealthContributor cassandraHealthContributor(Map<String, CassandraOperations> cassandraOperations) {
58-
return createContributor(cassandraOperations);
59-
}
46+
@Import({ CassandraOperationsConfiguration.class, CassandraDriverConfiguration.class })
47+
public class CassandraHealthContributorAutoConfiguration {
6048

6149
}

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
/*
2+
* Copyright 2012-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.cassandra;
18+
19+
import java.util.Map;
20+
21+
import com.datastax.oss.driver.api.core.CqlSession;
22+
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
25+
import org.springframework.boot.actuate.cassandra.CassandraDriverHealthIndicator;
26+
import org.springframework.boot.actuate.cassandra.CassandraDriverReactiveHealthIndicator;
27+
import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
28+
import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
29+
import org.springframework.boot.actuate.health.HealthContributor;
30+
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
31+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
32+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
33+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
34+
import org.springframework.context.annotation.Bean;
35+
import org.springframework.context.annotation.Configuration;
36+
import org.springframework.data.cassandra.core.CassandraOperations;
37+
import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
38+
39+
/**
40+
* Health contributor options for Cassandra.
41+
*
42+
* @author Stephane Nicoll
43+
*/
44+
class CassandraHealthContributorConfigurations {
45+
46+
@Configuration(proxyBeanMethods = false)
47+
@ConditionalOnBean(CqlSession.class)
48+
static class CassandraDriverConfiguration
49+
extends CompositeHealthContributorConfiguration<CassandraDriverHealthIndicator, CqlSession> {
50+
51+
@Bean
52+
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
53+
HealthContributor cassandraHealthContributor(Map<String, CqlSession> sessions) {
54+
return createContributor(sessions);
55+
}
56+
57+
}
58+
59+
@Configuration(proxyBeanMethods = false)
60+
@ConditionalOnClass(CassandraOperations.class)
61+
@ConditionalOnBean(CassandraOperations.class)
62+
static class CassandraOperationsConfiguration
63+
extends CompositeHealthContributorConfiguration<CassandraHealthIndicator, CassandraOperations> {
64+
65+
@Bean
66+
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
67+
HealthContributor cassandraHealthContributor(Map<String, CassandraOperations> cassandraOperations) {
68+
return createContributor(cassandraOperations);
69+
}
70+
71+
}
72+
73+
@Configuration(proxyBeanMethods = false)
74+
@ConditionalOnBean(CqlSession.class)
75+
static class CassandraReactiveDriverConfiguration extends
76+
CompositeReactiveHealthContributorConfiguration<CassandraDriverReactiveHealthIndicator, CqlSession> {
77+
78+
@Bean
79+
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
80+
ReactiveHealthContributor cassandraHealthContributor(Map<String, CqlSession> sessions) {
81+
return createContributor(sessions);
82+
}
83+
84+
}
85+
86+
@Configuration(proxyBeanMethods = false)
87+
@ConditionalOnClass(ReactiveCassandraOperations.class)
88+
@ConditionalOnBean(ReactiveCassandraOperations.class)
89+
static class CassandraReactiveOperationsConfiguration extends
90+
CompositeReactiveHealthContributorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
91+
92+
@Bean
93+
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
94+
ReactiveHealthContributor cassandraHealthContributor(
95+
Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
96+
return createContributor(reactiveCassandraOperations);
97+
}
98+
99+
}
100+
101+
}

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,19 @@
1515
*/
1616
package org.springframework.boot.actuate.autoconfigure.cassandra;
1717

18-
import java.util.Map;
19-
2018
import com.datastax.oss.driver.api.core.CqlSession;
2119
import reactor.core.publisher.Flux;
2220

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
21+
import org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthContributorConfigurations.CassandraReactiveDriverConfiguration;
22+
import org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthContributorConfigurations.CassandraReactiveOperationsConfiguration;
2423
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2524
import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
26-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2725
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2826
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3027
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
31-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3228
import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
33-
import org.springframework.context.annotation.Bean;
3429
import org.springframework.context.annotation.Configuration;
35-
import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
30+
import org.springframework.context.annotation.Import;
3631

3732
/**
3833
* {@link EnableAutoConfiguration Auto-configuration} for
@@ -43,18 +38,10 @@
4338
* @since 2.1.0
4439
*/
4540
@Configuration(proxyBeanMethods = false)
46-
@ConditionalOnClass({ CqlSession.class, ReactiveCassandraOperations.class, Flux.class })
47-
@ConditionalOnBean(ReactiveCassandraOperations.class)
41+
@ConditionalOnClass({ CqlSession.class, Flux.class })
4842
@ConditionalOnEnabledHealthIndicator("cassandra")
4943
@AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
50-
public class CassandraReactiveHealthContributorAutoConfiguration extends
51-
CompositeReactiveHealthContributorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
52-
53-
@Bean
54-
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
55-
public ReactiveHealthContributor cassandraHealthContributor(
56-
Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
57-
return createContributor(reactiveCassandraOperations);
58-
}
44+
@Import({ CassandraReactiveOperationsConfiguration.class, CassandraReactiveDriverConfiguration.class })
45+
public class CassandraReactiveHealthContributorAutoConfiguration {
5946

6047
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfigurat
77
org.springframework.boot.actuate.autoconfigure.cache.CachesEndpointAutoConfiguration,\
88
org.springframework.boot.actuate.autoconfigure.cassandra.CassandraHealthContributorAutoConfiguration,\
99
org.springframework.boot.actuate.autoconfigure.cassandra.CassandraReactiveHealthContributorAutoConfiguration,\
10-
org.springframework.boot.actuate.autoconfigure.cassandra.CassandraDriverHealthContributorAutoConfiguration,\
11-
org.springframework.boot.actuate.autoconfigure.cassandra.CassandraDriverReactiveHealthContributorAutoConfiguration,\
1210
org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryActuatorAutoConfiguration,\
1311
org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive.ReactiveCloudFoundryActuatorAutoConfiguration,\
1412
org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration,\

0 commit comments

Comments
 (0)