Merge branch '2.4.x'

Closes gh-25880

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java

@@ -405,8 +405,8 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
 	}
 
 	/**
-	 * Nested exception used to wrap a {@link InvalidEndpointRequestException} and provide
-	 * a {@link HttpStatus#BAD_REQUEST} status.
+	 * Nested exception used to wrap an {@link InvalidEndpointRequestException} and
+	 * provide a {@link HttpStatus#BAD_REQUEST} status.
 	 */
 	private static class InvalidEndpointBadRequestException extends ResponseStatusException {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/TextOutputFormat.java

@@ -36,7 +36,7 @@ import org.springframework.util.MimeTypeUtils;
 public enum TextOutputFormat implements Producible<TextOutputFormat> {
 
 	/**
-	 * Openmetrics text version 1.0.0.
+	 * OpenMetrics text version 1.0.0.
 	 */
 	CONTENT_TYPE_OPENMETRICS_100(TextFormat.CONTENT_TYPE_OPENMETRICS_100) {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -306,7 +306,7 @@ public final class ConditionMessage {
 	}
 
 	/**
-	 * Builder used to create a {@link ItemsBuilder} for a condition.
+	 * Builder used to create an {@link ItemsBuilder} for a condition.
 	 */
 	public final class ItemsBuilder {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

@@ -206,7 +206,7 @@ public class IntegrationAutoConfiguration {
 	protected static class IntegrationRSocketConfiguration {
 
 		/**
-		 * Check if either a {@link IntegrationRSocketEndpoint} or
+		 * Check if either an {@link IntegrationRSocketEndpoint} or
 		 * {@link RSocketOutboundGateway} bean is available.
 		 */
 		static class AnyRSocketChannelAdapterAvailable extends AnyNestedCondition {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link DownloadConfig} via a {@link ImmutableDownloadConfig.Builder} whilst retaining
+ * {@link DownloadConfig} via an {@link ImmutableDownloadConfig.Builder} whilst retaining
  * default auto-configuration.
  *
  * @author Michael Gmeiner

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -409,7 +409,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
 	}
 
 	@Test
-	void vendorPropertiesWithDdlAutoPropertyIsSet() {
+	void vendorPropertiesWhenDdlAutoPropertyIsSet() {
 		contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=update")
 				.run(vendorProperties((vendorProperties) -> {
 					assertThat(vendorProperties).doesNotContainKeys(AvailableSettings.HBM2DDL_DATABASE_ACTION);
@@ -418,7 +418,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
 	}
 
 	@Test
-	void vendorPropertiesWithDdlAutoPropertyAndHibernatePropertiesAreSet() {
+	void vendorPropertiesWhenDdlAutoPropertyAndHibernatePropertiesAreSet() {
 		contextRunner()
 				.withPropertyValues("spring.jpa.hibernate.ddl-auto=update",
 						"spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop")
@@ -429,7 +429,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
 	}
 
 	@Test
-	void vendorPropertiesWithDdlAutoPropertyIsSetToNone() {
+	void vendorPropertiesWhenDdlAutoPropertyIsSetToNone() {
 		contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=none")
 				.run(vendorProperties((vendorProperties) -> assertThat(vendorProperties).doesNotContainKeys(
 						AvailableSettings.HBM2DDL_DATABASE_ACTION, AvailableSettings.HBM2DDL_AUTO)));

spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc

@@ -2359,7 +2359,7 @@ Each metric is tagged by the name of the Pool (can be controlled with `spring.da
 
 [[production-ready-metrics-hibernate]]
 ==== Hibernate Metrics
-If `org.hibernate:hibernate-micrometer` is on the classpath, all available Hibernate `EntityManagerFactory` instances that have statistics enabled with a metric named `hibernate` are instrumented.
+If `org.hibernate:hibernate-micrometer` is on the classpath, all available Hibernate `EntityManagerFactory` instances that have statistics enabled are instrumented with a metric named `hibernate`.
 
 Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from the bean name.
 

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java

@@ -42,7 +42,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
  *
  * @author Andy Wilkinson
  */
-@SpringBootTest(properties = "debug=true")
+@SpringBootTest
 @AutoConfigureMockRestServiceServer
 class AutoConfigureMockRestServiceServerWithRootUriIntegrationTests {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,7 +139,7 @@ public interface BootstrapRegistry {
 		}
 
 		/**
-		 * Factory method that can be used to create a {@link InstanceSupplier} for a
+		 * Factory method that can be used to create an {@link InstanceSupplier} for a
 		 * given instance.
 		 * @param <T> the instance type
 		 * @param instance the instance
@@ -150,7 +150,7 @@ public interface BootstrapRegistry {
 		}
 
 		/**
-		 * Factory method that can be used to create a {@link InstanceSupplier} from a
+		 * Factory method that can be used to create an {@link InstanceSupplier} from a
 		 * {@link Supplier}.
 		 * @param <T> the instance type
 		 * @param supplier the supplier that will provide the instance

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InactiveConfigDataAccessException.java

@@ -111,7 +111,7 @@ public class InactiveConfigDataAccessException extends ConfigDataException {
 	}
 
 	/**
-	 * Throw a {@link InactiveConfigDataAccessException} if the given
+	 * Throw an {@link InactiveConfigDataAccessException} if the given
 	 * {@link ConfigDataEnvironmentContributor} contains the property.
 	 * @param contributor the contributor to check
 	 * @param name the name to check

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InvalidConfigDataPropertyException.java

@@ -101,7 +101,7 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
 	}
 
 	/**
-	 * Throw a {@link InvalidConfigDataPropertyException} or log a warning if the given
+	 * Throw an {@link InvalidConfigDataPropertyException} or log a warning if the given
 	 * {@link ConfigDataEnvironmentContributor} contains any invalid property. A warning
 	 * is logged if the property is still supported, but not recommended. An error is
 	 * thrown if the property is completely unsupported.

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java

@@ -87,7 +87,7 @@ public class RootUriTemplateHandler implements UriTemplateHandler {
 
 	/**
 	 * Derives a new {@code RootUriTemplateHandler} from this one, wrapping its delegate
-	 * {link UriTemplateHandler} by applying the given {@code wrapper}.
+	 * {@link UriTemplateHandler} by applying the given {@code wrapper}.
 	 * @param wrapper the wrapper to apply to the delegate URI template handler
 	 * @return the new handler
 	 * @since 2.3.10