Merge branch '1.5.x'

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

@@ -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) {

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

@@ -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";
-	}
-
 }

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

@@ -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";
-	}
-
 }