Merge branch '2.4.x' into 2.5.x

Closes gh-28424

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java

@@ -43,7 +43,7 @@ public class MetricsProperties {
 
 	/**
 	 * Whether meter IDs starting with the specified name should be enabled. The longest
-	 * match wins, the key `all` can also be used to configure all meters.
+	 * match wins, the key {@code "all"} can also be used to configure all meters.
 	 */
 	private final Map<String, Boolean> enable = new LinkedHashMap<>();
 
@@ -262,15 +262,15 @@ public static class Distribution {
 		 * Whether meter IDs starting with the specified name should publish percentile
 		 * histograms. For monitoring systems that support aggregable percentile
 		 * calculation based on a histogram, this can be set to true. For other systems,
-		 * this has no effect. The longest match wins, the key `all` can also be used to
-		 * configure all meters.
+		 * this has no effect. The longest match wins, the key {@code "all"} can also be
+		 * used to configure all meters.
 		 */
 		private final Map<String, Boolean> percentilesHistogram = new LinkedHashMap<>();
 
 		/**
 		 * Specific computed non-aggregable percentiles to ship to the backend for meter
-		 * IDs starting-with the specified name. The longest match wins, the key `all` can
-		 * also be used to configure all meters.
+		 * IDs starting-with the specified name. The longest match wins, the key
+		 * {@code "all"} can also be used to configure all meters.
 		 */
 		private final Map<String, double[]> percentiles = new LinkedHashMap<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

@@ -51,8 +51,8 @@ public class ManagementServerProperties {
 	private InetAddress address;
 
 	/**
-	 * Management endpoint base path (for instance, `/management`). Requires a custom
-	 * management.server.port.
+	 * Management endpoint base path (for instance, {@code '/management'}). Requires a
+	 * custom management.server.port.
 	 */
 	private String basePath = "";
 
@@ -128,8 +128,8 @@ private String cleanBasePath(String basePath) {
 	public static class Servlet {
 
 		/**
-		 * Management endpoint context-path (for instance, `/management`). Requires a
-		 * custom management.server.port.
+		 * Management endpoint context-path (for instance, {@code '/management'}).
+		 * Requires a custom management.server.port.
 		 */
 		private String contextPath = "";
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java

@@ -61,7 +61,7 @@ public abstract class AbstractEndpointDocumentationTests {
 
 	protected static String describeEnumValues(Class<? extends Enum<?>> enumType) {
 		return StringUtils.collectionToDelimitedString(Stream.of(enumType.getEnumConstants())
-				.map((constant) -> "`" + constant.name() + "`").collect(Collectors.toList()), ", ");
+				.map((constant) -> "'" + constant.name() + "'").collect(Collectors.toList()), ", ");
 	}
 
 	protected OperationPreprocessor limit(String... keys) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java

@@ -64,7 +64,7 @@ void configPropsFilterByPrefix() throws Exception {
 						preprocessResponse(limit("contexts", getApplicationContext().getId(), "beans")),
 						responseFields(fieldWithPath("contexts").description("Application contexts keyed by id."),
 								fieldWithPath("contexts.*.beans.*")
-										.description("`@ConfigurationProperties` beans keyed by bean name."),
+										.description("@ConfigurationProperties beans keyed by bean name."),
 								fieldWithPath("contexts.*.beans.*.prefix")
 										.description("Prefix applied to the names of the bean's properties."),
 								subsectionWithPath("contexts.*.beans.*.properties")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java

@@ -81,7 +81,7 @@ void health() throws Exception {
 				.description("The nested components that make up the health.").optional();
 		FieldDescriptor componentDetails = subsectionWithPath("components.*.details")
 				.description("Details of the health of a specific part of the application. "
-						+ "Presence is controlled by `management.endpoint.health.show-details`.")
+						+ "Presence is controlled by 'management.endpoint.health.show-details'.")
 				.optional();
 		this.mockMvc.perform(get("/actuator/health").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
 				.andDo(document("health",

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java

@@ -70,7 +70,7 @@ void metricWithTags() throws Exception {
 						"id:Compressed Class Space"))
 				.andExpect(status().isOk())
 				.andDo(document("metrics/metric-with-tags", requestParameters(parameterWithName("tag")
-						.description("A tag to use for drill-down in the form `name:value`."))));
+						.description("A tag to use for drill-down in the form 'name:value'."))));
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java

@@ -117,7 +117,7 @@ void jsonThreadDump() throws Exception {
 														.optional().type(JsonFieldType.NUMBER),
 												fieldWithPath("threads.[].lockOwnerId")
 														.description("ID of the thread that owns the object on which "
-																+ "the thread is blocked. `-1` if the "
+																+ "the thread is blocked. '-1' if the "
 																+ "thread is not blocked."),
 												fieldWithPath("threads.[].lockOwnerName")
 														.description("Name of the thread that owns the "

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -881,12 +881,12 @@ public static class Template {
 		private Boolean mandatory;
 
 		/**
-		 * Timeout for `receive()` operations.
+		 * Timeout for {@code receive()} operations.
 		 */
 		private Duration receiveTimeout;
 
 		/**
-		 * Timeout for `sendAndReceive()` operations.
+		 * Timeout for {@code sendAndReceive()} operations.
 		 */
 		private Duration replyTimeout;
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java

@@ -98,7 +98,7 @@ public static class Job {
 
 		/**
 		 * Comma-separated list of job names to execute on startup (for instance,
-		 * `job1,job2`). By default, all Jobs found in the context are executed.
+		 * {@code "job1,job2"}). By default, all Jobs found in the context are executed.
 		 */
 		private String names = "";
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisUrlSyntaxFailureAnalyzer.java

@@ -46,7 +46,7 @@ protected FailureAnalysis analyze(Throwable rootFailure, RedisUrlSyntaxException
 			}
 			if (!"redis".equals(uri.getScheme()) && !"rediss".equals(uri.getScheme())) {
 				return new FailureAnalysis(getUnsupportedSchemeDescription(cause.getUrl(), uri.getScheme()),
-						"Use the scheme 'redis://` for insecure or `rediss://` for secure Redis standalone configuration.",
+						"Use the scheme 'redis://' for insecure or 'rediss://' for secure Redis standalone configuration.",
 						cause);
 			}
 		}