From 80b4a9424cd896ed2e847980eeac3122a744033d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 21 Oct 2019 10:35:06 +0200 Subject: [PATCH] Move off deprecated HealthIndicator API in favor of HealthContributor API. Closes gh-361. --- .../config/VaultHealthIndicatorAutoConfiguration.java | 4 ++-- .../config/VaultHealthIndicatorConfiguration.java | 10 +++++----- .../VaultReactiveHealthIndicatorConfiguration.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java index 2cb44685..c6319558 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.cloud.vault.config; import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Import; @ConditionalOnBean(VaultBootstrapConfiguration.class) @ConditionalOnClass(HealthIndicator.class) @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) -@AutoConfigureBefore(HealthIndicatorAutoConfiguration.class) +@AutoConfigureBefore(HealthContributorAutoConfiguration.class) @Import({ VaultHealthIndicatorConfiguration.class, VaultReactiveHealthIndicatorConfiguration.class }) public class VaultHealthIndicatorAutoConfiguration { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java index 41d43a8f..c5823b4d 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java @@ -18,8 +18,8 @@ package org.springframework.cloud.vault.config; import java.util.Map; -import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthIndicatorConfiguration; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration; +import org.springframework.boot.actuate.health.HealthContributor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -36,7 +36,7 @@ import org.springframework.vault.core.VaultOperations; @Configuration(proxyBeanMethods = false) @ConditionalOnBean(VaultOperations.class) class VaultHealthIndicatorConfiguration extends - CompositeHealthIndicatorConfiguration { + CompositeHealthContributorConfiguration { private final Map vaultTemplates; @@ -46,8 +46,8 @@ class VaultHealthIndicatorConfiguration extends @Bean @ConditionalOnMissingBean(name = { "vaultHealthIndicator" }) - public HealthIndicator vaultHealthIndicator() { - return this.createHealthIndicator(this.vaultTemplates); + public HealthContributor vaultHealthIndicator() { + return createContributor(this.vaultTemplates); } } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java index 4fcb9354..904aca6e 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java @@ -20,8 +20,8 @@ import java.util.Map; import reactor.core.publisher.Flux; -import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthIndicatorConfiguration; -import org.springframework.boot.actuate.health.ReactiveHealthIndicator; +import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration; +import org.springframework.boot.actuate.health.ReactiveHealthContributor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -39,7 +39,7 @@ import org.springframework.vault.core.ReactiveVaultOperations; @ConditionalOnClass(Flux.class) @ConditionalOnBean(ReactiveVaultOperations.class) class VaultReactiveHealthIndicatorConfiguration extends - CompositeReactiveHealthIndicatorConfiguration { + CompositeReactiveHealthContributorConfiguration { private final Map reactiveVaultTemplates; @@ -50,8 +50,8 @@ class VaultReactiveHealthIndicatorConfiguration extends @Bean @ConditionalOnMissingBean(name = { "vaultReactiveHealthIndicator" }) - ReactiveHealthIndicator vaultReactiveHealthIndicator() { - return this.createHealthIndicator(this.reactiveVaultTemplates); + ReactiveHealthContributor vaultReactiveHealthIndicator() { + return createContributor(this.reactiveVaultTemplates); } }