You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/01/10 07:38:29 UTC
[incubator-servicecomb-java-chassis] 05/13: SCB-166 fix pr comment
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 52dc7e67d6933601059b703f636901b0d9b77a27
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Jan 8 12:55:13 2018 +0800
SCB-166 fix pr comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../java/io/servicecomb/metrics/common/HealthCheckResult.java | 10 +++++-----
metrics/metrics-core/pom.xml | 4 ----
.../io/servicecomb/metrics/core/TestHealthCheckerManager.java | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/HealthCheckResult.java b/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/HealthCheckResult.java
index b44d8df..022250e 100644
--- a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/HealthCheckResult.java
+++ b/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/HealthCheckResult.java
@@ -18,7 +18,7 @@
package io.servicecomb.metrics.common;
public class HealthCheckResult {
- private boolean isHealth;
+ private boolean isHealthy;
private String information;
@@ -27,8 +27,8 @@ public class HealthCheckResult {
private long timestamp;
- public boolean isHealth() {
- return isHealth;
+ public boolean isHealthy() {
+ return isHealthy;
}
public String getInformation() {
@@ -46,9 +46,9 @@ public class HealthCheckResult {
public HealthCheckResult() {
}
- public HealthCheckResult(boolean isHealth, String information, String extraData) {
+ public HealthCheckResult(boolean isHealthy, String information, String extraData) {
this();
- this.isHealth = isHealth;
+ this.isHealthy = isHealthy;
this.information = information;
this.extraData = extraData;
this.timestamp = System.currentTimeMillis();
diff --git a/metrics/metrics-core/pom.xml b/metrics/metrics-core/pom.xml
index 17115e4..2566bbe 100644
--- a/metrics/metrics-core/pom.xml
+++ b/metrics/metrics-core/pom.xml
@@ -47,10 +47,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
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 4beaf66..db0fa35 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
@@ -67,7 +67,7 @@ public class TestHealthCheckerManager {
HealthCheckerManager manager = new DefaultHealthCheckerManager();
Map<String, HealthCheckResult> results = manager.check();
- Assert.assertTrue(results.get("default").isHealth());
+ Assert.assertTrue(results.get("default").isHealthy());
DefaultHealthCheckExtraData data = JsonUtils.OBJ_MAPPER
.readValue(results.get("default").getExtraData(), DefaultHealthCheckExtraData.class);
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.