Skip to content

Commit 6053bb2

Browse files
philwebbpull[bot]
philwebb
authored and
pull[bot]
committed
Migrate HealthIndicator auto-configurations
Migrate all `HealthIndicator` configuration to `HealthContributor` configurations instead. See spring-projectsgh-14022
1 parent 6118023 commit 6053bb2

File tree

44 files changed

+302
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+302
-392
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthContributorAutoConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import org.springframework.amqp.rabbit.core.RabbitTemplate;
2222
import org.springframework.boot.actuate.amqp.RabbitHealthIndicator;
23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
26-
import org.springframework.boot.actuate.health.HealthIndicator;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
26+
import org.springframework.boot.actuate.health.HealthContributor;
2727
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2828
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2929
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -44,15 +44,15 @@
4444
@ConditionalOnClass(RabbitTemplate.class)
4545
@ConditionalOnBean(RabbitTemplate.class)
4646
@ConditionalOnEnabledHealthIndicator("rabbit")
47-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
47+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
4848
@AutoConfigureAfter(RabbitAutoConfiguration.class)
49-
public class RabbitHealthIndicatorAutoConfiguration
50-
extends CompositeHealthIndicatorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
49+
public class RabbitHealthContributorAutoConfiguration
50+
extends CompositeHealthContributorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
5151

5252
@Bean
53-
@ConditionalOnMissingBean(name = "rabbitHealthIndicator")
54-
public HealthIndicator rabbitHealthIndicator(Map<String, RabbitTemplate> rabbitTemplates) {
55-
return createHealthIndicator(rabbitTemplates);
53+
@ConditionalOnMissingBean(name = { "rabbitHealthIndicator", "rabbitHealthContributor" })
54+
public HealthContributor rabbitHealthContributor(Map<String, RabbitTemplate> rabbitTemplates) {
55+
return createContributor(rabbitTemplates);
5656
}
5757

5858
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import com.datastax.driver.core.Cluster;
2222

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2626
import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
27-
import org.springframework.boot.actuate.health.HealthIndicator;
27+
import org.springframework.boot.actuate.health.HealthContributor;
2828
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2929
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3030
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -49,16 +49,15 @@
4949
@ConditionalOnClass({ Cluster.class, CassandraOperations.class })
5050
@ConditionalOnBean(CassandraOperations.class)
5151
@ConditionalOnEnabledHealthIndicator("cassandra")
52-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
53-
@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
54-
CassandraReactiveHealthIndicatorAutoConfiguration.class })
55-
public class CassandraHealthIndicatorAutoConfiguration
56-
extends CompositeHealthIndicatorConfiguration<CassandraHealthIndicator, CassandraOperations> {
52+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
53+
@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class })
54+
public class CassandraHealthContributorAutoConfiguration
55+
extends CompositeHealthContributorConfiguration<CassandraHealthIndicator, CassandraOperations> {
5756

5857
@Bean
59-
@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
60-
public HealthIndicator cassandraHealthIndicator(Map<String, CassandraOperations> cassandraOperations) {
61-
return createHealthIndicator(cassandraOperations);
58+
@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
59+
public HealthContributor cassandraHealthContributor(Map<String, CassandraOperations> cassandraOperations) {
60+
return createContributor(cassandraOperations);
6261
}
6362

6463
}

‎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/CassandraReactiveHealthContributorAutoConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import com.datastax.driver.core.Cluster;
2121
import reactor.core.publisher.Flux;
2222

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2626
import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
27-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
27+
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2828
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2929
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3030
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -48,16 +48,16 @@
4848
@ConditionalOnClass({ Cluster.class, ReactiveCassandraOperations.class, Flux.class })
4949
@ConditionalOnBean(ReactiveCassandraOperations.class)
5050
@ConditionalOnEnabledHealthIndicator("cassandra")
51-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
51+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5252
@AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
53-
public class CassandraReactiveHealthIndicatorAutoConfiguration extends
54-
CompositeReactiveHealthIndicatorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
53+
public class CassandraReactiveHealthContributorAutoConfiguration extends
54+
CompositeReactiveHealthContributorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
5555

5656
@Bean
57-
@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
58-
public ReactiveHealthIndicator cassandraHealthIndicator(
57+
@ConditionalOnMissingBean(name = { "cassandraReactiveHealthIndicator", "cassandraReactiveHealthContributor" })
58+
public ReactiveHealthContributor cassandraReactiveHealthContributor(
5959
Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
60-
return createHealthIndicator(reactiveCassandraOperations);
60+
return createContributor(reactiveCassandraOperations);
6161
}
6262

6363
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import com.couchbase.client.java.Cluster;
2121

22-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
22+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2323
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
24-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2525
import org.springframework.boot.actuate.couchbase.CouchbaseHealthIndicator;
26-
import org.springframework.boot.actuate.health.HealthIndicator;
26+
import org.springframework.boot.actuate.health.HealthContributor;
2727
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2828
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2929
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -47,20 +47,15 @@
4747
@ConditionalOnClass(Cluster.class)
4848
@ConditionalOnBean(Cluster.class)
4949
@ConditionalOnEnabledHealthIndicator("couchbase")
50-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
51-
@AutoConfigureAfter(CouchbaseAutoConfiguration.class)
52-
public class CouchbaseHealthIndicatorAutoConfiguration
53-
extends CompositeHealthIndicatorConfiguration<CouchbaseHealthIndicator, Cluster> {
50+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
51+
@AutoConfigureAfter({ CouchbaseAutoConfiguration.class })
52+
public class CouchbaseHealthContributorAutoConfiguration
53+
extends CompositeHealthContributorConfiguration<CouchbaseHealthIndicator, Cluster> {
5454

5555
@Bean
56-
@ConditionalOnMissingBean(name = "couchbaseHealthIndicator")
57-
public HealthIndicator couchbaseHealthIndicator(Map<String, Cluster> clusters) {
58-
return createHealthIndicator(clusters);
59-
}
60-
61-
@Override
62-
protected CouchbaseHealthIndicator createHealthIndicator(Cluster cluster) {
63-
return new CouchbaseHealthIndicator(cluster);
56+
@ConditionalOnMissingBean(name = { "couchbaseHealthContributor", "couchbaseHealthContributor" })
57+
public HealthContributor couchbaseHealthContributor(Map<String, Cluster> clusters) {
58+
return createContributor(clusters);
6459
}
6560

6661
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthContributorAutoConfiguration.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import com.couchbase.client.java.Cluster;
2121
import reactor.core.publisher.Flux;
2222

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2626
import org.springframework.boot.actuate.couchbase.CouchbaseReactiveHealthIndicator;
27-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
27+
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2828
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2929
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3030
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -47,20 +47,15 @@
4747
@ConditionalOnClass({ Cluster.class, Flux.class })
4848
@ConditionalOnBean(Cluster.class)
4949
@ConditionalOnEnabledHealthIndicator("couchbase")
50-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
50+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5151
@AutoConfigureAfter(CouchbaseAutoConfiguration.class)
52-
public class CouchbaseReactiveHealthIndicatorAutoConfiguration
53-
extends CompositeReactiveHealthIndicatorConfiguration<CouchbaseReactiveHealthIndicator, Cluster> {
52+
public class CouchbaseReactiveHealthContributorAutoConfiguration
53+
extends CompositeReactiveHealthContributorConfiguration<CouchbaseReactiveHealthIndicator, Cluster> {
5454

5555
@Bean
56-
@ConditionalOnMissingBean(name = "couchbaseReactiveHealthIndicator")
57-
public ReactiveHealthIndicator couchbaseReactiveHealthIndicator(Map<String, Cluster> clusters) {
58-
return createHealthIndicator(clusters);
59-
}
60-
61-
@Override
62-
protected CouchbaseReactiveHealthIndicator createHealthIndicator(Cluster cluster) {
63-
return new CouchbaseReactiveHealthIndicator(cluster);
56+
@ConditionalOnMissingBean(name = { "couchbaseReactiveHealthIndicator", "couchbaseReactiveHealthContributor" })
57+
public ReactiveHealthContributor couchbaseReactiveHealthContributor(Map<String, Cluster> clusters) {
58+
return createContributor(clusters);
6459
}
6560

6661
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthContributorAutoConfiguration.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
import org.elasticsearch.client.Client;
2323

24-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
26-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
26+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2727
import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicator;
28-
import org.springframework.boot.actuate.health.HealthIndicator;
28+
import org.springframework.boot.actuate.health.HealthContributor;
2929
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3030
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3131
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -50,27 +50,27 @@
5050
@ConditionalOnClass(Client.class)
5151
@ConditionalOnBean(Client.class)
5252
@ConditionalOnEnabledHealthIndicator("elasticsearch")
53-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
53+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5454
@AutoConfigureAfter(ElasticsearchAutoConfiguration.class)
5555
@EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class)
5656
@Deprecated
57-
public class ElasticSearchClientHealthIndicatorAutoConfiguration
58-
extends CompositeHealthIndicatorConfiguration<ElasticsearchHealthIndicator, Client> {
57+
public class ElasticSearchClientHealthContributorAutoConfiguration
58+
extends CompositeHealthContributorConfiguration<ElasticsearchHealthIndicator, Client> {
5959

6060
private final ElasticsearchHealthIndicatorProperties properties;
6161

62-
public ElasticSearchClientHealthIndicatorAutoConfiguration(ElasticsearchHealthIndicatorProperties properties) {
62+
public ElasticSearchClientHealthContributorAutoConfiguration(ElasticsearchHealthIndicatorProperties properties) {
6363
this.properties = properties;
6464
}
6565

6666
@Bean
67-
@ConditionalOnMissingBean(name = "elasticsearchHealthIndicator")
68-
public HealthIndicator elasticsearchHealthIndicator(Map<String, Client> clients) {
69-
return createHealthIndicator(clients);
67+
@ConditionalOnMissingBean(name = { "elasticsearchHealthIndicator", "elasticsearchHealthContributor" })
68+
public HealthContributor elasticsearchHealthContributor(Map<String, Client> clients) {
69+
return createContributor(clients);
7070
}
7171

7272
@Override
73-
protected ElasticsearchHealthIndicator createHealthIndicator(Client client) {
73+
protected ElasticsearchHealthIndicator createIndicator(Client client) {
7474
Duration responseTimeout = this.properties.getResponseTimeout();
7575
return new ElasticsearchHealthIndicator(client, (responseTimeout != null) ? responseTimeout.toMillis() : 100,
7676
this.properties.getIndices());

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthContributorAutoConfiguration.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
import io.searchbox.client.JestClient;
2222

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2626
import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicator;
2727
import org.springframework.boot.actuate.elasticsearch.ElasticsearchJestHealthIndicator;
28-
import org.springframework.boot.actuate.health.HealthIndicator;
28+
import org.springframework.boot.actuate.health.HealthContributor;
2929
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3030
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3131
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -47,21 +47,16 @@
4747
@ConditionalOnClass(JestClient.class)
4848
@ConditionalOnBean(JestClient.class)
4949
@ConditionalOnEnabledHealthIndicator("elasticsearch")
50-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
51-
@AutoConfigureAfter({ JestAutoConfiguration.class, ElasticSearchClientHealthIndicatorAutoConfiguration.class })
50+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
51+
@AutoConfigureAfter({ JestAutoConfiguration.class, ElasticSearchClientHealthContributorAutoConfiguration.class })
5252
@Deprecated
53-
public class ElasticSearchJestHealthIndicatorAutoConfiguration
54-
extends CompositeHealthIndicatorConfiguration<ElasticsearchJestHealthIndicator, JestClient> {
53+
public class ElasticSearchJestHealthContributorAutoConfiguration
54+
extends CompositeHealthContributorConfiguration<ElasticsearchJestHealthIndicator, JestClient> {
5555

5656
@Bean
57-
@ConditionalOnMissingBean(name = "elasticsearchHealthIndicator")
58-
public HealthIndicator elasticsearchHealthIndicator(Map<String, JestClient> clients) {
59-
return createHealthIndicator(clients);
60-
}
61-
62-
@Override
63-
protected ElasticsearchJestHealthIndicator createHealthIndicator(JestClient client) {
64-
return new ElasticsearchJestHealthIndicator(client);
57+
@ConditionalOnMissingBean(name = { "elasticsearchHealthIndicator", "elasticsearchHealthContributor" })
58+
public HealthContributor elasticsearchHealthContributor(Map<String, JestClient> clients) {
59+
return createContributor(clients);
6560
}
6661

6762
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthContributorAutoConfiguration.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import org.elasticsearch.client.RestClient;
2222

23-
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
25+
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2626
import org.springframework.boot.actuate.elasticsearch.ElasticsearchRestHealthIndicator;
27-
import org.springframework.boot.actuate.health.HealthIndicator;
27+
import org.springframework.boot.actuate.health.HealthContributor;
2828
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2929
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3030
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -46,21 +46,16 @@
4646
@ConditionalOnClass(RestClient.class)
4747
@ConditionalOnBean(RestClient.class)
4848
@ConditionalOnEnabledHealthIndicator("elasticsearch")
49-
@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
50-
@AutoConfigureAfter({ RestClientAutoConfiguration.class, ElasticSearchClientHealthIndicatorAutoConfiguration.class })
49+
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
50+
@AutoConfigureAfter({ RestClientAutoConfiguration.class, ElasticSearchClientHealthContributorAutoConfiguration.class })
5151
@SuppressWarnings("deprecation")
52-
public class ElasticSearchRestHealthIndicatorAutoConfiguration
53-
extends CompositeHealthIndicatorConfiguration<ElasticsearchRestHealthIndicator, RestClient> {
52+
public class ElasticSearchRestHealthContributorAutoConfiguration
53+
extends CompositeHealthContributorConfiguration<ElasticsearchRestHealthIndicator, RestClient> {
5454

5555
@Bean
56-
@ConditionalOnMissingBean(name = "elasticsearchRestHealthIndicator")
57-
public HealthIndicator elasticsearchRestHealthIndicator(Map<String, RestClient> clients) {
58-
return createHealthIndicator(clients);
59-
}
60-
61-
@Override
62-
protected ElasticsearchRestHealthIndicator createHealthIndicator(RestClient client) {
63-
return new ElasticsearchRestHealthIndicator(client);
56+
@ConditionalOnMissingBean(name = { "elasticsearchRestHealthIndicator", "elasticsearchRestHealthContributor" })
57+
public HealthContributor elasticsearchRestHealthContributor(Map<String, RestClient> clients) {
58+
return createContributor(clients);
6459
}
6560

6661
}

0 commit comments

Comments
 (0)