Merge branch '2.4.x' into 2.5.x

Closes gh-28439

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -35,8 +35,8 @@
 /**
  * Identifies a type as being an endpoint that is only exposed over Spring MVC or Spring
  * WebFlux. Mapped methods must be annotated with {@link GetMapping @GetMapping},
- * {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc annotations
- * rather than {@link ReadOperation @ReadOperation},
+ * {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc.
+ * annotations rather than {@link ReadOperation @ReadOperation},
  * {@link WriteOperation @WriteOperation}, {@link DeleteOperation @DeleteOperation}.
  * <p>
  * This annotation can be used when deeper Spring integration is required, but at the

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RestControllerEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -36,8 +36,8 @@
 /**
  * Identifies a type as being a REST endpoint that is only exposed over Spring MVC or
  * Spring WebFlux. Mapped methods must be annotated with {@link GetMapping @GetMapping},
- * {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc annotations
- * rather than {@link ReadOperation @ReadOperation},
+ * {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc.
+ * annotations rather than {@link ReadOperation @ReadOperation},
  * {@link WriteOperation @WriteOperation}, {@link DeleteOperation @DeleteOperation}.
  * <p>
  * This annotation can be used when deeper Spring integration is required, but at the

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/TraceableRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -30,7 +30,7 @@
 public interface TraceableRequest {
 
 	/**
-	 * Returns the method (GET, POST, etc) of the request.
+	 * Returns the method (GET, POST, etc.) of the request.
 	 * @return the method
 	 */
 	String getMethod();

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -67,7 +67,7 @@ void listNamesProducesListOfUniqueMeterNames() {
 	}
 
 	@Test
-	void listNamesRecursesOverCompositeRegistries() {
+	void listNamesResponseOverCompositeRegistries() {
 		CompositeMeterRegistry composite = new CompositeMeterRegistry();
 		SimpleMeterRegistry reg1 = new SimpleMeterRegistry();
 		SimpleMeterRegistry reg2 = new SimpleMeterRegistry();

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/quartz/QuartzEndpointWebIntegrationTests.java

@@ -106,7 +106,7 @@ void quartzTriggerNames(WebTestClient client) {
 
 	@WebEndpointTest
 	void quartzTriggersOrJobsAreAllowed(WebTestClient client) {
-		client.get().uri("/actuator/quartz/something-elese").exchange().expectStatus().isBadRequest();
+		client.get().uri("/actuator/quartz/something-else").exchange().expectStatus().isBadRequest();
 	}
 
 	@WebEndpointTest

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -131,7 +131,7 @@
 	/**
 	 * Specify if the condition should match if the property is not set. Defaults to
 	 * {@code false}.
-	 * @return if should match if the property is missing
+	 * @return if the condition should match if the property is missing
 	 */
 	boolean matchIfMissing() default false;
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -48,7 +48,8 @@ public ParentAwareNamingStrategy(JmxAttributeSource attributeSource) {
 
 	/**
 	 * Set if unique runtime object names should be ensured.
-	 * @param ensureUniqueRuntimeObjectNames {@code true} if unique names should ensured.
+	 * @param ensureUniqueRuntimeObjectNames {@code true} if unique names should be
+	 * ensured.
 	 */
 	public void setEnsureUniqueRuntimeObjectNames(boolean ensureUniqueRuntimeObjectNames) {
 		this.ensureUniqueRuntimeObjectNames = ensureUniqueRuntimeObjectNames;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * 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.

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java

@@ -23,7 +23,7 @@
 import org.springframework.context.annotation.Primary;
 
 /**
- * Configuration for multiple {@link DataSource} (one being {@code @Primary}.
+ * Configuration for multiple {@link DataSource} (one being {@code @Primary}).
  *
  * @author Phillip Webb
  * @author Kazuki Shimizu