mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
aec85787d2
@ -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) {
|
||||
|
@ -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";
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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";
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user