Merge branch '3.1.x'

philwebb · philwebb · commit cc4ef32efed6 · 2023-11-02T14:19:12.000-07:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/NoSuchHealthContributorFailureAnalyzer.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/NoSuchHealthContributorFailureAnalyzer.java
@@ -30,8 +30,8 @@ class NoSuchHealthContributorFailureAnalyzer extends AbstractFailureAnalyzer<NoS
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure, NoSuchHealthContributorException cause) {
-		return new FailureAnalysis(cause.getMessage(),
-				"Update your application to correct the invalid configuration.\nYou can also set 'management.endpoint.health.validate-group-membership' to false to disable the validation.",
+		return new FailureAnalysis(cause.getMessage(), "Update your application to correct the invalid configuration.\n"
+				+ "You can also set 'management.endpoint.health.validate-group-membership' to false to disable the validation.",
 				cause);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ class NoSuchHealthContributorFailureAnalyzer extends AbstractFailureAnalyzer<NoS`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`protected FailureAnalysis analyze(Throwable rootFailure, NoSuchHealthContributorException cause) {`
`33`		`- return new FailureAnalysis(cause.getMessage(),`
`34`		`- "Update your application to correct the invalid configuration.\nYou can also set 'management.endpoint.health.validate-group-membership' to false to disable the validation.",`
	`33`	`+ return new FailureAnalysis(cause.getMessage(), "Update your application to correct the invalid configuration.\n"`
	`34`	`+ + "You can also set 'management.endpoint.health.validate-group-membership' to false to disable the validation.",`
`35`	`35`	`cause);`
`36`	`36`	`}`
`37`	`37`