feat: use ConditionalOnEnabledHealthIndicator condition with NacosCon…

…figHealthIndicator & AcmHealthIndicator & RocketMQBinderHealthIndicator & SidecarHealthIndicator [fix alibaba#1276] alibaba#1276
sea8128 · Mar 25, 2020 · a218e6f · a218e6f
1 parent fd77b6f
commit a218e6f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.../src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java b/.../src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
@@ -21,6 +21,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -52,8 +53,7 @@ public NacosConfigEndpoint nacosConfigEndpoint() {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(name = "spring.cloud.nacos.config.health.enabled",
-			matchIfMissing = true)
+	@ConditionalOnEnabledHealthIndicator("nacos-config")
 	public NacosConfigHealthIndicator nacosConfigHealthIndicator() {
 		return new NacosConfigHealthIndicator(nacosConfigManager.getConfigService());
 	}

diff --git a/...ba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -55,12 +55,6 @@
       "type": "java.util.List",
       "description": "a set of extensional configurations .e.g: spring.cloud.nacos.config.extension-configs[0]=xxx ."
     },
-    {
-      "name": "spring.cloud.nacos.config.health.enabled",
-      "type": "java.lang.Boolean",
-      "defaultValue": true,
-      "description": "the switch for health check, it default enabled(true)."
-    },
     {
       "name": "spring.cloud.nacos.config.refresh-enabled",
       "type": "java.lang.Boolean",

diff --git a/...ter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarAutoConfiguration.java b/...ter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarAutoConfiguration.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.sidecar;
 
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -37,6 +38,7 @@ public RestTemplate restTemplate() {
 	}
 
 	@Bean
+	@ConditionalOnEnabledHealthIndicator("sidecar")
 	public SidecarHealthIndicator sidecarHealthIndicator(
 			SidecarProperties sidecarProperties, RestTemplate restTemplate) {
 		return new SidecarHealthIndicator(sidecarProperties, restTemplate);

diff --git a/...a/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java b/...a/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java
@@ -18,6 +18,7 @@
 
 import com.alibaba.cloud.stream.binder.rocketmq.actuator.RocketMQBinderHealthIndicator;
 
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
@@ -31,6 +32,7 @@
 public class RocketMQBinderHealthIndicatorAutoConfiguration {
 
 	@Bean
+	@ConditionalOnEnabledHealthIndicator("rocketmq")
 	public RocketMQBinderHealthIndicator rocketBinderHealthIndicator() {
 		return new RocketMQBinderHealthIndicator();
 	}