Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll 2016-10-24 10:08:06 +02:00
commit aec85787d2
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEnabledEndpointElementCondition.java
View File

@ -44,15 +44,6 @@ abstract class OnEnabledEndpointElementCondition extends SpringBootCondition {
this.annotationType = annotationType;
}
protected String getEndpointElementOutcomeMessage(String name, boolean match) {
return "The endpoint element " + name + " is " + (match ? "enabled" : "disabled");
}
protected String getDefaultEndpointElementOutcomeMessage(boolean match) {
return "All default endpoint elements are " + (match ? "enabled" : "disabled")
+ " by default";
}
@Override
public ConditionOutcome getMatchOutcome(ConditionContext context,
AnnotatedTypeMetadata metadata) {

11
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEnabledHealthIndicatorCondition.java
View File

@ -29,15 +29,4 @@ class OnEnabledHealthIndicatorCondition extends OnEnabledEndpointElementConditio
super("management.health.", ConditionalOnEnabledHealthIndicator.class);
}
@Override
protected String getEndpointElementOutcomeMessage(String name, boolean match) {
return "The health indicator " + name + " is " + (match ? "enabled" : "disabled");
}
@Override
protected String getDefaultEndpointElementOutcomeMessage(boolean match) {
return "All default health indicators are " + (match ? "enabled" : "disabled")
+ " by default";
}
}

11
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEnabledInfoContributorCondition.java
View File

@ -29,15 +29,4 @@ class OnEnabledInfoContributorCondition extends OnEnabledEndpointElementConditio
super("management.info.", ConditionalOnEnabledInfoContributor.class);
}
@Override
protected String getEndpointElementOutcomeMessage(String name, boolean match) {
return "The info contributor " + name + " is " + (match ? "enabled" : "disabled");
}
@Override
protected String getDefaultEndpointElementOutcomeMessage(boolean match) {
return "All default info contributors are " + (match ? "enabled" : "disabled")
+ " by default";
}
}