Unite HealthCheck Configuration Item.

sofastack · Jul 28, 2018 · 9123016 · 9123016
1 parent e29281d
commit 9123016
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.../java/com/alipay/sofa/healthcheck/configuration/SofaBootHealthCheckAutoConfiguration.java b/.../java/com/alipay/sofa/healthcheck/configuration/SofaBootHealthCheckAutoConfiguration.java
@@ -64,7 +64,7 @@ public SofaBootHealthIndicator sofaBootHealthIndicator() {
     }
 
     @Bean
-    @ConditionalOnProperty(prefix = "com.alipay.sofa.healthcheck.readiness", name = "enabled", matchIfMissing = true)
+    @ConditionalOnProperty(prefix = "com.alipay.sofa.healthcheck", name = "enabled", matchIfMissing = true)
     public SofaBootReadinessCheckEndpoint readinessCheck() {
         return new SofaBootReadinessCheckEndpoint(READINESS_CHECK_ENDPOINT_NAME, false);
     }

diff --git a/...ter/src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckEndpoint.java b/...ter/src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckEndpoint.java
@@ -36,7 +36,7 @@
  * @author qilong.zql
  * @version 2.3.0
  */
-@ConfigurationProperties(prefix = "com.alipay.sofa.healthcheck.readiness")
+@ConfigurationProperties(prefix = "com.alipay.sofa.healthcheck")
 public class SofaBootReadinessCheckEndpoint extends AbstractEndpoint<Health> {
 
     private final HealthAggregator healthAggregator = new OrderedHealthAggregator();

diff --git a/.../src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckMvcEndpoint.java b/.../src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckMvcEndpoint.java
@@ -38,7 +38,7 @@
  * @author khotyn
  * @version 2.3.0
  */
-@ConfigurationProperties(prefix = "com.alipay.sofa.healthcheck.readiness")
+@ConfigurationProperties(prefix = "com.alipay.sofa.healthcheck")
 public class SofaBootReadinessCheckMvcEndpoint
                                               extends
                                               AbstractEndpointMvcAdapter<SofaBootReadinessCheckEndpoint> {

diff --git a/...st/java/com/alipay/sofa/healthcheck/usercases/HealthEndpointDisableConfigurationTest.java b/...st/java/com/alipay/sofa/healthcheck/usercases/HealthEndpointDisableConfigurationTest.java
@@ -30,7 +30,7 @@
  * @since 2.5.0
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SofaBootTestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = { "com.alipay.sofa.healthcheck.readiness.enabled=false" })
+@SpringBootTest(classes = SofaBootTestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = { "com.alipay.sofa.healthcheck.enabled=false" })
 public class HealthEndpointDisableConfigurationTest {
 
     @Autowired