Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch com.alipay.sofa.healthcheck.readiness to com.alipay.sofa.healthcheck in order to keep the configuration style #155

Merged
merged 2 commits into from
Jul 28, 2018
Merged

Switch com.alipay.sofa.healthcheck.readiness to com.alipay.sofa.healthcheck in order to keep the configuration style #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2facd7b
SOFABoot readiness check switch com.alipay.sofa.healthcheck.readiness…
Jul 28, 2018
1cb7be9
Merge branch 'master' into master
guanchao-yang Jul 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../java/com/alipay/sofa/healthcheck/configuration/SofaBootHealthCheckAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ter/src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckMvcEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/alipay/sofa/healthcheck/usercases/HealthEndpointDisableConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down