[incubator-servicecomb-java-chassis] 10/13: SCB-166 fix ci failed

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit a8353865e3945593efb3021df42681e22c9952ed
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Tue Jan 9 17:32:24 2018 +0800

    SCB-166 fix ci failed
    
    Signed-off-by: zhengyangyong <ya...@huawei.com>
---
 .../core/health/DefaultMicroserviceHealthChecker.java       |  2 ++
 .../metrics/core/publish/DefaultHealthCheckerManager.java   |  3 ---
 .../servicecomb/metrics/core/TestHealthCheckerManager.java  | 13 ++-----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java
index df2d81e..ec0d1e2 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java
@@ -21,6 +21,7 @@ import javax.ws.rs.core.Response.Status;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import io.servicecomb.foundation.common.utils.JsonUtils;
 import io.servicecomb.metrics.common.DefaultHealthCheckExtraData;
@@ -31,6 +32,7 @@ import io.servicecomb.serviceregistry.api.registry.Microservice;
 import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
 import io.servicecomb.swagger.invocation.exception.InvocationException;
 
+@Component
 public class DefaultMicroserviceHealthChecker implements HealthChecker {
 
   private static Logger logger = LoggerFactory.getLogger(DefaultMicroserviceHealthChecker.class);
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
index 71e9f1a..f83d209 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
@@ -45,9 +45,6 @@ public class DefaultHealthCheckerManager implements HealthCheckerManager {
   @Autowired(required = false)
   public DefaultHealthCheckerManager(List<HealthChecker> springHealthCheckers) {
     this.healthCheckers = new ConcurrentHashMap<>();
-    HealthChecker defaultHealthChecker = new DefaultMicroserviceHealthChecker();
-    this.healthCheckers.put(defaultHealthChecker.getName(), defaultHealthChecker);
-
     if (springHealthCheckers != null && !springHealthCheckers.isEmpty()) {
       for (HealthChecker checker : springHealthCheckers) {
         this.healthCheckers.put(checker.getName(), checker);
diff --git a/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestHealthCheckerManager.java b/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestHealthCheckerManager.java
index 74f65cf..80c16f5 100644
--- a/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestHealthCheckerManager.java
+++ b/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestHealthCheckerManager.java
@@ -31,6 +31,7 @@ import io.servicecomb.foundation.common.utils.JsonUtils;
 import io.servicecomb.metrics.common.DefaultHealthCheckExtraData;
 import io.servicecomb.metrics.common.HealthCheckResult;
 import io.servicecomb.metrics.common.HealthChecker;
+import io.servicecomb.metrics.core.health.DefaultMicroserviceHealthChecker;
 import io.servicecomb.metrics.core.publish.DefaultHealthCheckerManager;
 import io.servicecomb.metrics.core.publish.HealthCheckerManager;
 import io.servicecomb.serviceregistry.RegistryUtils;
@@ -68,17 +69,7 @@ public class TestHealthCheckerManager {
     };
 
     List<HealthChecker> checkers = new ArrayList<>();
-    checkers.add(new HealthChecker() {
-      @Override
-      public String getName() {
-        return "custom";
-      }
-
-      @Override
-      public HealthCheckResult check() {
-        return new HealthCheckResult(true, "", "");
-      }
-    });
+    checkers.add(new DefaultMicroserviceHealthChecker());
 
     HealthCheckerManager manager = new DefaultHealthCheckerManager(checkers);
     Map<String, HealthCheckResult> results = manager.check();

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.