polish #761 update pkg name & maven coordinate for Greenwich

spring-cloud-alibaba-sentinel/pom.xml

@@ -3,13 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-alibaba-sentinel</artifactId>
     <name>Spring Cloud Alibaba Sentinel</name>
 
@@ -101,7 +100,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
         </dependency>
 

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
 
 /**
  * @author fangjian

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
 
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
 import org.springframework.core.Ordered;
 import org.springframework.validation.annotation.Validated;
 
+import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration;
 import com.alibaba.csp.sentinel.config.SentinelConfig;
 import com.alibaba.csp.sentinel.log.LogBase;
 import com.alibaba.csp.sentinel.transport.config.TransportConfig;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
 
 import java.util.ArrayList;
 import java.util.List;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
 
 import java.util.Collections;
 import java.util.List;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.annotation;
+package com.alibaba.cloud.sentinel.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import java.lang.reflect.Method;
 import java.util.Map;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import javax.annotation.PostConstruct;
 
@@ -25,15 +25,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
 import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig;
 import com.alibaba.csp.sentinel.annotation.aspectj.SentinelResourceAspect;
 import com.alibaba.csp.sentinel.config.SentinelConfig;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -28,8 +28,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.cloud.alibaba.sentinel.SentinelConstants;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.type.StandardMethodMetadata;
 import org.springframework.core.type.classreading.MethodMetadataReadingVisitor;
@@ -40,6 +38,8 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.sentinel.SentinelConstants;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
 import com.alibaba.csp.sentinel.slots.block.BlockException;
 
 /**

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import org.springframework.context.annotation.Configuration;
 

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -12,14 +12,14 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
 import org.springframework.core.env.Environment;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
 import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
 import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
 

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
 
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
 import com.alibaba.csp.sentinel.Entry;
 import com.alibaba.csp.sentinel.EntryType;
 import com.alibaba.csp.sentinel.SphU;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
 
+import com.alibaba.cloud.sentinel.SentinelProperties;
 import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig;
 import com.alibaba.csp.sentinel.config.SentinelConfig;
 import com.alibaba.csp.sentinel.log.LogBase;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -23,9 +23,10 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
 import org.springframework.context.annotation.Bean;
 
+import com.alibaba.cloud.sentinel.SentinelProperties;
+
 /**
  * @author hengyunabc
  */
@@ -43,7 +44,9 @@ public class SentinelEndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnEnabledHealthIndicator("sentinel")
-	public SentinelHealthIndicator sentinelHealthIndicator(DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties) {
+	public SentinelHealthIndicator sentinelHealthIndicator(
+			DefaultListableBeanFactory beanFactory,
+			SentinelProperties sentinelProperties) {
 		return new SentinelHealthIndicator(beanFactory, sentinelProperties);
 	}
 }

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.sentinel.endpoint;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
+import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider;
+import com.alibaba.csp.sentinel.transport.HeartbeatSender;
+import com.alibaba.csp.sentinel.transport.config.TransportConfig;
+
+/**
+ * A {@link HealthIndicator} for Sentinel, which checks the status of Sentinel Dashboard
+ * and DataSource.
+ *
+ * <p>
+ * Check the status of Sentinel Dashboard by sending a heartbeat message to it. If return
+ * true, it's OK.
+ *
+ * Check the status of Sentinel DataSource by calling loadConfig method of
+ * {@link AbstractDataSource}. If no Exception thrown, it's OK.
+ *
+ * If Dashboard and DataSource are both OK, the health status is UP.
+ * </p>
+ *
+ * <p>
+ * Note: If Sentinel isn't enabled, the health status is up. If Sentinel Dashboard isn't
+ * configured, it's OK and mark the status of Dashboard with UNKNOWN. More informations
+ * are provided in details.
+ * </p>
+ *
+ * @author cdfive
+ */
+public class SentinelHealthIndicator extends AbstractHealthIndicator {
+
+	private DefaultListableBeanFactory beanFactory;
+
+	private SentinelProperties sentinelProperties;
+
+	public SentinelHealthIndicator(DefaultListableBeanFactory beanFactory,
+			SentinelProperties sentinelProperties) {
+		this.beanFactory = beanFactory;
+		this.sentinelProperties = sentinelProperties;
+	}
+
+	@Override
+	protected void doHealthCheck(Health.Builder builder) throws Exception {
+		Map<String, Object> detailMap = new HashMap<>();
+
+		// If sentinel isn't enabled, set the status up and set the enabled to false in
+		// detail
+		if (!sentinelProperties.isEnabled()) {
+			detailMap.put("enabled", false);
+			builder.up().withDetails(detailMap);
+			return;
+		}
+
+		detailMap.put("enabled", true);
+
+		// Check health of Dashboard
+		boolean dashboardUp = true;
+		String consoleServer = TransportConfig.getConsoleServer();
+		if (StringUtils.isEmpty(consoleServer)) {
+			// If Dashboard isn't configured, it's OK and mark the status of Dashboard
+			// with UNKNOWN.
+			detailMap.put("dashboard",
+					new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured"));
+		}
+		else {
+			// If Dashboard is configured, send a heartbeat message to it and check the
+			// result
+			HeartbeatSender heartbeatSender = HeartbeatSenderProvider
+					.getHeartbeatSender();
+			boolean result = heartbeatSender.sendHeartbeat();
+			if (result) {
+				detailMap.put("dashboard", Status.UP);
+			}
+			else {
+				// If failed to send heartbeat message, means that the Dashboard is DOWN
+				dashboardUp = false;
+				detailMap.put("dashboard", new Status(Status.DOWN.getCode(),
+						consoleServer + " can't be connected"));
+			}
+		}
+
+		// Check health of DataSource
+		boolean dataSourceUp = true;
+		Map<String, Object> dataSourceDetailMap = new HashMap<>();
+		detailMap.put("dataSource", dataSourceDetailMap);
+
+		// Get all DataSources and each call loadConfig to check if it's OK
+		// If no Exception thrown, it's OK
+		// Note:
+		// Even if the dynamic config center is down, the loadConfig() might return
+		// successfully
+		// e.g. for Nacos client, it might retrieve from the local cache)
+		// But in most circumstances it's okay
+		Map<String, AbstractDataSource> dataSourceMap = beanFactory
+				.getBeansOfType(AbstractDataSource.class);
+		for (Map.Entry<String, AbstractDataSource> dataSourceMapEntry : dataSourceMap
+				.entrySet()) {
+			String dataSourceBeanName = dataSourceMapEntry.getKey();
+			AbstractDataSource dataSource = dataSourceMapEntry.getValue();
+			try {
+				dataSource.loadConfig();
+				dataSourceDetailMap.put(dataSourceBeanName, Status.UP);
+			}
+			catch (Exception e) {
+				// If one DataSource failed to loadConfig, means that the DataSource is
+				// DOWN
+				dataSourceUp = false;
+				dataSourceDetailMap.put(dataSourceBeanName,
+						new Status(Status.DOWN.getCode(), e.getMessage()));
+			}
+		}
+
+		// If Dashboard and DataSource are both OK, the health status is UP
+		if (dashboardUp && dataSourceUp) {
+			builder.up().withDetails(detailMap);
+		}
+		else {
+			builder.down().withDetails(detailMap);
+		}
+	}
+}

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
 
 import java.util.HashMap;
 import java.util.List;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
 
 import static feign.Util.checkNotNull;
 

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java

@@ -14,14 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.rest;
-
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.AbstractClientHttpResponse;
+package com.alibaba.cloud.sentinel.rest;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -31,6 +24,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.AbstractClientHttpResponse;
+
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelProtectInterceptor;
+
 /**
  * Using by {@link SentinelRestTemplate} and {@link SentinelProtectInterceptor}
  *

spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java

@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.alibaba.sentinel.endpoint;
-
-import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
-import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider;
-import com.alibaba.csp.sentinel.transport.HeartbeatSender;
-import com.alibaba.csp.sentinel.transport.config.TransportConfig;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A {@link HealthIndicator} for Sentinel, which checks the status of
- * Sentinel Dashboard and DataSource.
- *
- * <p>
- * Check the status of Sentinel Dashboard by sending a heartbeat message to it.
- * If return true, it's OK.
- *
- * Check the status of Sentinel DataSource by calling loadConfig method of {@link AbstractDataSource}.
- * If no Exception thrown, it's OK.
- *
- * If Dashboard and DataSource are both OK, the health status is UP.
- *</p>
- *
- * <p>
- * Note:
- * If Sentinel isn't enabled, the health status is up.
- * If Sentinel Dashboard isn't configured, it's OK and mark the status of Dashboard with UNKNOWN.
- * More informations are provided in details.
- * </p>
- *
- * @author cdfive
- */
-public class SentinelHealthIndicator extends AbstractHealthIndicator {
-
-    private DefaultListableBeanFactory beanFactory;
-
-    private SentinelProperties sentinelProperties;
-
-    public SentinelHealthIndicator(DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties) {
-        this.beanFactory = beanFactory;
-        this.sentinelProperties = sentinelProperties;
-    }
-
-    @Override
-    protected void doHealthCheck(Health.Builder builder) throws Exception {
-        Map<String, Object> detailMap = new HashMap<>();
-
-        // If sentinel isn't enabled, set the status up and set the enabled to false in detail
-        if (!sentinelProperties.isEnabled()) {
-            detailMap.put("enabled", false);
-            builder.up().withDetails(detailMap);
-            return;
-        }
-
-        detailMap.put("enabled", true);
-
-        // Check health of Dashboard
-        boolean dashboardUp = true;
-        String consoleServer = TransportConfig.getConsoleServer();
-        if (StringUtils.isEmpty(consoleServer)) {
-            // If Dashboard isn't configured, it's OK and mark the status of Dashboard with UNKNOWN.
-            detailMap.put("dashboard", new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured"));
-        } else {
-            // If Dashboard is configured, send a heartbeat message to it and check the result
-            HeartbeatSender heartbeatSender = HeartbeatSenderProvider.getHeartbeatSender();
-            boolean result = heartbeatSender.sendHeartbeat();
-            if (result) {
-                detailMap.put("dashboard", Status.UP);
-            } else {
-                // If failed to send heartbeat message, means that the Dashboard is DOWN
-                dashboardUp = false;
-                detailMap.put("dashboard", new Status(Status.DOWN.getCode(), consoleServer + " can't be connected"));
-            }
-        }
-
-        // Check health of DataSource
-        boolean dataSourceUp = true;
-        Map<String, Object> dataSourceDetailMap = new HashMap<>();
-        detailMap.put("dataSource", dataSourceDetailMap);
-
-        // Get all DataSources and each call loadConfig to check if it's OK
-        // If no Exception thrown, it's OK
-        // Note:
-        // Even if the dynamic config center is down, the loadConfig() might return successfully
-        // e.g. for Nacos client, it might retrieve from the local cache)
-        // But in most circumstances it's okay
-        Map<String, AbstractDataSource> dataSourceMap = beanFactory.getBeansOfType(AbstractDataSource.class);
-        for (Map.Entry<String, AbstractDataSource> dataSourceMapEntry : dataSourceMap.entrySet()) {
-            String dataSourceBeanName = dataSourceMapEntry.getKey();
-            AbstractDataSource dataSource = dataSourceMapEntry.getValue();
-            try {
-                dataSource.loadConfig();
-                dataSourceDetailMap.put(dataSourceBeanName, Status.UP);
-            } catch (Exception e) {
-                // If one DataSource failed to loadConfig, means that the DataSource is DOWN
-                dataSourceUp = false;
-                dataSourceDetailMap.put(dataSourceBeanName, new Status(Status.DOWN.getCode(), e.getMessage()));
-            }
-        }
-
-        // If Dashboard and DataSource are both OK, the health status is UP
-        if (dashboardUp && dataSourceUp) {
-            builder.up().withDetails(detailMap);
-        } else {
-            builder.down().withDetails(detailMap);
-        }
-    }
-}

spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories

@@ -1,9 +1,9 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.sentinel.SentinelWebAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.SentinelWebFluxAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.endpoint.SentinelEndpointAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.feign.SentinelFeignAutoConfiguration
+com.alibaba.cloud.sentinel.SentinelWebAutoConfiguration,\
+com.alibaba.cloud.sentinel.SentinelWebFluxAutoConfiguration,\
+com.alibaba.cloud.sentinel.endpoint.SentinelEndpointAutoConfiguration,\
+com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration,\
+com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration
 
 org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
-org.springframework.cloud.alibaba.sentinel.custom.SentinelCircuitBreakerConfiguration
+com.alibaba.cloud.sentinel.custom.SentinelCircuitBreakerConfiguration

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.Assert.assertEquals;
@@ -34,11 +34,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelBeanPostProcessor;
-import org.springframework.cloud.alibaba.sentinel.endpoint.SentinelEndpoint;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpRequest;
@@ -50,6 +45,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor;
+import com.alibaba.cloud.sentinel.endpoint.SentinelEndpoint;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
 import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig;
 import com.alibaba.csp.sentinel.config.SentinelConfig;
 import com.alibaba.csp.sentinel.log.LogBase;

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java

@@ -14,31 +14,33 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser;
-import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler;
-import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner;
-import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager;
-import com.alibaba.csp.sentinel.adapter.servlet.util.FilterUtil;
-import com.alibaba.csp.sentinel.slots.block.BlockException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager;
+import com.alibaba.csp.sentinel.adapter.servlet.util.FilterUtil;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,14 +26,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.cloud.sentinel.datasource.RuleType;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -52,7 +53,7 @@ import static org.junit.Assert.assertNull;
 
 		"spring.cloud.sentinel.datasource.ds5.file.file=classpath: param-flow.json",
 		"spring.cloud.sentinel.datasource.ds5.file.data-type=custom",
-		"spring.cloud.sentinel.datasource.ds5.file.converter-class=org.springframework.cloud.alibaba.sentinel.TestConverter",
+		"spring.cloud.sentinel.datasource.ds5.file.converter-class=TestConverter",
 		"spring.cloud.sentinel.datasource.ds5.file.rule-type=param-flow" })
 public class SentinelDataSourceTests {
 

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java

@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
 
-import com.alibaba.csp.sentinel.slots.block.RuleConstant;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.feign.SentinelFeignAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.context.annotation.Bean;
@@ -35,13 +39,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration;
+import com.alibaba.csp.sentinel.slots.block.RuleConstant;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -93,7 +94,7 @@ public class SentinelFeignTests {
 		rule4.setLimitApp("default");
 		rule4.setControlBehavior(RuleConstant.CONTROL_BEHAVIOR_DEFAULT);
 		rule4.setStrategy(RuleConstant.STRATEGY_DIRECT);
-		FlowRuleManager.loadRules(Arrays.asList(rule1, rule2, rule3,rule4));
+		FlowRuleManager.loadRules(Arrays.asList(rule1, rule2, rule3, rule4));
 	}
 
 	@Test

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java

@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
+
+import static org.junit.Assert.assertEquals;
 
-import com.alibaba.csp.sentinel.slots.block.BlockException;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelBeanPostProcessor;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -30,7 +28,10 @@ import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.web.client.RestTemplate;
 
-import static org.junit.Assert.assertEquals;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -85,10 +86,10 @@ public class SentinelRestTemplateTests {
 		new AnnotationConfigApplicationContext(TestConfig9.class);
 	}
 
-    @Test
-    public void testNormalWithoutParam() {
-        new AnnotationConfigApplicationContext(TestConfig10.class);
-    }
+	@Test
+	public void testNormalWithoutParam() {
+		new AnnotationConfigApplicationContext(TestConfig10.class);
+	}
 
 	@Configuration
 	public static class TestConfig1 {
@@ -225,26 +226,26 @@ public class SentinelRestTemplateTests {
 		}
 	}
 
-    @Configuration
-    public static class TestConfig10 {
-        @Bean
-        SentinelBeanPostProcessor sentinelBeanPostProcessor(
-            ApplicationContext applicationContext) {
-            return new SentinelBeanPostProcessor(applicationContext);
-        }
+	@Configuration
+	public static class TestConfig10 {
+		@Bean
+		SentinelBeanPostProcessor sentinelBeanPostProcessor(
+				ApplicationContext applicationContext) {
+			return new SentinelBeanPostProcessor(applicationContext);
+		}
 
-        @Bean
-        @SentinelRestTemplate
-        RestTemplate restTemplate() {
-            return new RestTemplate();
-        }
+		@Bean
+		@SentinelRestTemplate
+		RestTemplate restTemplate() {
+			return new RestTemplate();
+		}
 
-        @Bean
-        @SentinelRestTemplate
-        RestTemplate restTemplate2() {
-            return new RestTemplate();
-        }
-    }
+		@Bean
+		@SentinelRestTemplate
+		RestTemplate restTemplate2() {
+			return new RestTemplate();
+		}
+	}
 
 	public static class ExceptionUtil {
 		public static SentinelClientHttpResponse handleException(HttpRequest request,

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel;
-
-import com.alibaba.csp.sentinel.datasource.Converter;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+package com.alibaba.cloud.sentinel;
 
 import java.io.IOException;
 import java.util.List;
 
+import com.alibaba.csp.sentinel.datasource.Converter;
+import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java

@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.sentinel.endpoint;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.util.ReflectionUtils;
+
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.csp.sentinel.config.SentinelConfig;
+import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
+import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
+import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider;
+import com.alibaba.csp.sentinel.transport.HeartbeatSender;
+import com.alibaba.csp.sentinel.transport.config.TransportConfig;
+
+/**
+ * Test cases for {@link SentinelHealthIndicator}.
+ *
+ * @author cdfive
+ */
+public class SentinelHealthIndicatorTests {
+
+	private SentinelHealthIndicator sentinelHealthIndicator;
+
+	private DefaultListableBeanFactory beanFactory;
+
+	private SentinelProperties sentinelProperties;
+
+	private HeartbeatSender heartbeatSender;
+
+	@Before
+	public void setUp() {
+		beanFactory = mock(DefaultListableBeanFactory.class);
+		sentinelProperties = mock(SentinelProperties.class);
+		sentinelHealthIndicator = new SentinelHealthIndicator(beanFactory,
+				sentinelProperties);
+
+		SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "");
+
+		heartbeatSender = mock(HeartbeatSender.class);
+		Field heartbeatSenderField = ReflectionUtils
+				.findField(HeartbeatSenderProvider.class, "heartbeatSender");
+		heartbeatSenderField.setAccessible(true);
+		ReflectionUtils.setField(heartbeatSenderField, null, heartbeatSender);
+	}
+
+	@Test
+	public void testSentinelNotEnabled() {
+		when(sentinelProperties.isEnabled()).thenReturn(false);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.UP);
+		assertThat(health.getDetails().get("enabled")).isEqualTo(false);
+	}
+
+	@Test
+	public void testSentinelDashboardNotConfigured() {
+		when(sentinelProperties.isEnabled()).thenReturn(true);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.UP);
+		assertThat(health.getDetails().get("dashboard")).isEqualTo(Status.UNKNOWN);
+	}
+
+	@Test
+	public void testSentinelDashboardConfiguredSuccess() throws Exception {
+		when(sentinelProperties.isEnabled()).thenReturn(true);
+		SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
+		when(heartbeatSender.sendHeartbeat()).thenReturn(true);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.UP);
+	}
+
+	@Test
+	public void testSentinelDashboardConfiguredFailed() throws Exception {
+		when(sentinelProperties.isEnabled()).thenReturn(true);
+		SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
+		when(heartbeatSender.sendHeartbeat()).thenReturn(false);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
+		assertThat(health.getDetails().get("dashboard")).isEqualTo(
+				new Status(Status.DOWN.getCode(), "localhost:8080 can't be connected"));
+	}
+
+	@Test
+	public void testSentinelDataSourceSuccess() throws Exception {
+		when(sentinelProperties.isEnabled()).thenReturn(true);
+		SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
+		when(heartbeatSender.sendHeartbeat()).thenReturn(true);
+
+		Map<String, AbstractDataSource> dataSourceMap = new HashMap<>();
+
+		FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class);
+		dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1);
+
+		FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class);
+		dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2);
+
+		when(beanFactory.getBeansOfType(AbstractDataSource.class))
+				.thenReturn(dataSourceMap);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.UP);
+		Map<String, Status> dataSourceDetailMap = (Map<String, Status>) health
+				.getDetails().get("dataSource");
+		assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource"))
+				.isEqualTo(Status.UP);
+		assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource"))
+				.isEqualTo(Status.UP);
+	}
+
+	@Test
+	public void testSentinelDataSourceFailed() throws Exception {
+		when(sentinelProperties.isEnabled()).thenReturn(true);
+		SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
+		when(heartbeatSender.sendHeartbeat()).thenReturn(true);
+
+		Map<String, AbstractDataSource> dataSourceMap = new HashMap<>();
+
+		FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class);
+		dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1);
+
+		FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class);
+		when(fileDataSource2.loadConfig())
+				.thenThrow(new RuntimeException("fileDataSource2 error"));
+		dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2);
+
+		when(beanFactory.getBeansOfType(AbstractDataSource.class))
+				.thenReturn(dataSourceMap);
+
+		Health health = sentinelHealthIndicator.health();
+
+		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
+		Map<String, Status> dataSourceDetailMap = (Map<String, Status>) health
+				.getDetails().get("dataSource");
+		assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource"))
+				.isEqualTo(Status.UP);
+		assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource"))
+				.isEqualTo(new Status(Status.DOWN.getCode(), "fileDataSource2 error"));
+	}
+}

spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java

@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.alibaba.sentinel.endpoint;
-
-import com.alibaba.csp.sentinel.config.SentinelConfig;
-import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
-import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
-import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider;
-import com.alibaba.csp.sentinel.transport.HeartbeatSender;
-import com.alibaba.csp.sentinel.transport.config.TransportConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.util.ReflectionUtils;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Test cases for {@link SentinelHealthIndicator}.
- *
- * @author cdfive
- */
-public class SentinelHealthIndicatorTests {
-
-    private SentinelHealthIndicator sentinelHealthIndicator;
-
-    private DefaultListableBeanFactory beanFactory;
-
-    private SentinelProperties sentinelProperties;
-
-    private HeartbeatSender heartbeatSender;
-
-    @Before
-    public void setUp() {
-        beanFactory = mock(DefaultListableBeanFactory.class);
-        sentinelProperties = mock(SentinelProperties.class);
-        sentinelHealthIndicator = new SentinelHealthIndicator(beanFactory, sentinelProperties);
-
-        SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "");
-
-        heartbeatSender = mock(HeartbeatSender.class);
-        Field heartbeatSenderField = ReflectionUtils.findField(HeartbeatSenderProvider.class, "heartbeatSender");
-        heartbeatSenderField.setAccessible(true);
-        ReflectionUtils.setField(heartbeatSenderField, null, heartbeatSender);
-    }
-
-    @Test
-    public void testSentinelNotEnabled() {
-        when(sentinelProperties.isEnabled()).thenReturn(false);
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.UP);
-        assertThat(health.getDetails().get("enabled")).isEqualTo(false);
-    }
-
-    @Test
-    public void testSentinelDashboardNotConfigured() {
-        when(sentinelProperties.isEnabled()).thenReturn(true);
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.UP);
-        assertThat(health.getDetails().get("dashboard")).isEqualTo(Status.UNKNOWN);
-    }
-
-    @Test
-    public void testSentinelDashboardConfiguredSuccess() throws Exception {
-        when(sentinelProperties.isEnabled()).thenReturn(true);
-        SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
-        when(heartbeatSender.sendHeartbeat()).thenReturn(true);
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.UP);
-    }
-
-    @Test
-    public void testSentinelDashboardConfiguredFailed() throws Exception {
-        when(sentinelProperties.isEnabled()).thenReturn(true);
-        SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
-        when(heartbeatSender.sendHeartbeat()).thenReturn(false);
-
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.DOWN);
-        assertThat(health.getDetails().get("dashboard")).isEqualTo(new Status(Status.DOWN.getCode(), "localhost:8080 can't be connected"));
-    }
-
-    @Test
-    public void testSentinelDataSourceSuccess() throws Exception {
-        when(sentinelProperties.isEnabled()).thenReturn(true);
-        SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
-        when(heartbeatSender.sendHeartbeat()).thenReturn(true);
-
-        Map<String, AbstractDataSource> dataSourceMap = new HashMap<>();
-
-        FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class);
-        dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1);
-
-        FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class);
-        dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2);
-
-        when(beanFactory.getBeansOfType(AbstractDataSource.class)).thenReturn(dataSourceMap);
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.UP);
-        Map<String, Status> dataSourceDetailMap = (Map<String, Status>) health.getDetails().get("dataSource");
-        assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")).isEqualTo(Status.UP);
-        assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")).isEqualTo(Status.UP);
-    }
-
-    @Test
-    public void testSentinelDataSourceFailed() throws Exception {
-        when(sentinelProperties.isEnabled()).thenReturn(true);
-        SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080");
-        when(heartbeatSender.sendHeartbeat()).thenReturn(true);
-
-        Map<String, AbstractDataSource> dataSourceMap = new HashMap<>();
-
-        FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class);
-        dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1);
-
-        FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class);
-        when(fileDataSource2.loadConfig()).thenThrow(new RuntimeException("fileDataSource2 error"));
-        dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2);
-
-        when(beanFactory.getBeansOfType(AbstractDataSource.class)).thenReturn(dataSourceMap);
-
-        Health health = sentinelHealthIndicator.health();
-
-        assertThat(health.getStatus()).isEqualTo(Status.DOWN);
-        Map<String, Status> dataSourceDetailMap = (Map<String, Status>) health.getDetails().get("dataSource");
-        assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")).isEqualTo(Status.UP);
-        assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")).isEqualTo(new Status(Status.DOWN.getCode(), "fileDataSource2 error"));
-    }
-}