From 7ae5cc1abdf79c789ce26827e81aab52f0d69b39 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 29 Jun 2017 16:24:39 -0600 Subject: [PATCH] Set discovery client health indicator description included to false. see gh-223 --- .../health/DiscoveryClientHealthIndicatorProperties.java | 3 +-- .../discovery/health/DiscoveryClientHealthIndicatorTests.java | 4 ++-- .../health/DiscoveryCompositeHealthIndicatorTests.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java index fed6ddf1..30efebc7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java @@ -10,8 +10,7 @@ public class DiscoveryClientHealthIndicatorProperties { private boolean enabled = true; - //TODO: change to false in 2.0.0 - private boolean includeDescription = true; + private boolean includeDescription = false; public boolean isEnabled() { return enabled; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java index 5a8113af..32dcb636 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock; */ @RunWith(SpringRunner.class) @SpringBootTest(classes = { DiscoveryClientHealthIndicatorTests.Config.class, - CommonsClientAutoConfiguration.class }, properties = "spring.cloud.discovery.client.health-indicator.include-description:false") + CommonsClientAutoConfiguration.class }, properties = "spring.cloud.discovery.client.health-indicator.include-description:true") public class DiscoveryClientHealthIndicatorTests { @Autowired @@ -95,7 +95,7 @@ public class DiscoveryClientHealthIndicatorTests { health = this.healthIndicator.health(); Status status = assertHealth(health, Status.UP); - assertEquals("status description was wrong", "", + assertEquals("status description was wrong", "TestDiscoveryClient", status.getDescription()); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java index b1eb25df..676b2886 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java @@ -93,7 +93,7 @@ public class DiscoveryCompositeHealthIndicatorTests { health = this.healthIndicator.health(); Status status = assertHealth(health, Status.UP); - assertEquals("status description was wrong", "TestDiscoveryClient", + assertEquals("status description was wrong", "", status.getDescription()); }