SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move off deprecated HealthIndicator API in favor of HealthContributor API.

Browse Source 
Closes gh-361.
This commit is contained in:
Mark Paluch
2019-10-21 10:35:06 +02:00
parent b89e7d25fe
commit 80b4a9424c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java
View File

@@ -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 {

10
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java
View File

@@ -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<VaultHealthIndicator, VaultOperations> {
CompositeHealthContributorConfiguration<VaultHealthIndicator, VaultOperations> {
private final Map<String, VaultOperations> 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);
}
}

10
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java
View File

@@ -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<VaultReactiveHealthIndicator, ReactiveVaultOperations> {
CompositeReactiveHealthContributorConfiguration<VaultReactiveHealthIndicator, ReactiveVaultOperations> {
private final Map<String, ReactiveVaultOperations> 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);
}
}