Merge branch '2.6.x' into 2.7.x

Closes gh-31865

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/Upgrade.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -20,7 +20,7 @@
 import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
 
 /**
- * An upgrade to change a {@link Library} to use a new version}.
+ * An upgrade to change a {@link Library} to use a new version.
  *
  * @author Andy Wilkinson
  */

buildSrc/src/main/java/org/springframework/boot/build/testing/TestResultsOverview.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -29,8 +29,7 @@
 import org.gradle.tooling.events.OperationCompletionListener;
 
 /**
- * {@link BuildService} that provides an overview of all of the test failures in the
- * build.
+ * {@link BuildService} that provides an overview of all the test failures in the build.
  *
  * @author Andy Wilkinson
  */

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -53,12 +53,12 @@ void parseWhenVersionWithCombinedPatchAndQualifierShouldReturnCombinedPatchAndQu
 	}
 
 	@Test
-	void parseWhenCalendarVersionShouldReturnArticatVersionDependencyVersion() {
+	void parseWhenCalendarVersionShouldReturnArtifactVersionDependencyVersion() {
 		assertThat(DependencyVersion.parse("2020.0.0")).isInstanceOf(CalendarVersionDependencyVersion.class);
 	}
 
 	@Test
-	void parseWhenCalendarVersionWithModifierShouldReturnArticatVersionDependencyVersion() {
+	void parseWhenCalendarVersionWithModifierShouldReturnArtifactVersionDependencyVersion() {
 		assertThat(DependencyVersion.parse("2020.0.0-M1")).isInstanceOf(CalendarVersionDependencyVersion.class);
 	}
 

buildSrc/src/test/resources/plugin.xml

@@ -805,7 +805,7 @@ required to use this feature.</description>
           <type>long</type>
           <required>false</required>
           <editable>true</editable>
-          <description>The number of milli-seconds to wait between each attempt to check if the spring
+          <description>The number of milliseconds to wait between each attempt to check if the spring
 application is ready.</description>
         </parameter>
         <parameter>
@@ -880,7 +880,7 @@ application.</description>
           <type>int</type>
           <required>false</required>
           <editable>true</editable>
-          <description>The port to use to lookup the platform MBeanServer if the application has been
+          <description>The port to use to look up the platform MBeanServer if the application has been
 forked.</description>
         </parameter>
         <parameter>

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/ConditionalOnEnabledHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,9 +25,9 @@
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional @Conditional} that checks whether or not a default health indicator
- * is enabled. Matches if the value of the {@code management.health.<name>.enabled}
- * property is {@code true}. Otherwise, matches if the value of the
+ * {@link Conditional @Conditional} that checks whether a default health indicator is
+ * enabled. Matches if the value of the {@code management.health.<name>.enabled} property
+ * is {@code true}. Otherwise, matches if the value of the
  * {@code management.health.defaults.enabled} property is {@code true} or if it is not
  * configured.
  *

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -44,8 +44,8 @@ public abstract class HealthProperties {
 	private Show showComponents;
 
 	/**
-	 * Roles used to determine whether or not a user is authorized to be shown details.
-	 * When empty, all authenticated users are authorized.
+	 * Roles used to determine whether a user is authorized to be shown details. When
+	 * empty, all authenticated users are authorized.
 	 */
 	private Set<String> roles = new HashSet<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/ConditionalOnEnabledInfoContributor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,8 +25,8 @@
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional @Conditional} that checks whether or not an info contributor is
- * enabled. Matches if the value of the {@code management.info.<name>.enabled} property is
+ * {@link Conditional @Conditional} that checks whether an info contributor is enabled.
+ * Matches if the value of the {@code management.info.<name>.enabled} property is
  * {@code true}. Otherwise, use the specific {@link #fallback() fallback} method.
  *
  * @author Stephane Nicoll

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,11 +25,11 @@
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional @Conditional} that checks whether or not a metrics exporter is
- * enabled. If the {@code management.metrics.export.<name>.enabled} property is configured
- * then its value is used to determine if it matches. Otherwise, matches if the value of
- * the {@code management.metrics.export.defaults.enabled} property is {@code true} or if
- * it is not configured.
+ * {@link Conditional @Conditional} that checks whether a metrics exporter is enabled. If
+ * the {@code management.metrics.export.<name>.enabled} property is configured then its
+ * value is used to determine if it matches. Otherwise, matches if the value of the
+ * {@code management.metrics.export.defaults.enabled} property is {@code true} or if it is
+ * not configured.
  *
  * @author Chris Bono
  * @since 2.4.0

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -66,7 +66,7 @@ public class GangliaProperties {
 	private GMetric.UDPAddressingMode addressingMode = GMetric.UDPAddressingMode.MULTICAST;
 
 	/**
-	 * Time to live for metrics on Ganglia. Set the multi-cast Time-To-Live to be one
+	 * Time to live for metrics on Ganglia. Set the multicast Time-To-Live to be one
 	 * greater than the number of hops (routers) between the hosts.
 	 */
 	private Integer timeToLive = 1;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InvocationContext.java

@@ -89,7 +89,7 @@ public <T> T resolveArgument(Class<T> argumentType) {
 	}
 
 	/**
-	 * Returns whether or not the context is capable of resolving an argument of the given
+	 * Returns whether the context is capable of resolving an argument of the given
 	 * {@code type}. Note that, even when {@code true} is returned,
 	 * {@link #resolveArgument argument resolution} will return {@code null} if no
 	 * argument of the required type is available.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Producible.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -49,9 +49,9 @@ public interface Producible<E extends Enum<E> & Producible<E>> {
 
 	/**
 	 * Return if this enum value should be used as the default value when an accept header
-	 * of &#42;&#47;&#42; is provided, or if the accept header is missing. Only one value
-	 * can be marked as default. If no value is marked, then the value with the highest
-	 * {@link Enum#ordinal() ordinal} is used as the default.
+	 * of &#42;&#47;&#42; is provided, or if the {@code Accept} header is missing. Only
+	 * one value can be marked as default. If no value is marked, then the value with the
+	 * highest {@link Enum#ordinal() ordinal} is used as the default.
 	 * @return if this value should be used as the default value
 	 * @since 2.5.6
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -52,7 +52,7 @@ public String getHref() {
 	}
 
 	/**
-	 * Returns whether or not the {@link #getHref() href} is templated.
+	 * Returns whether the {@link #getHref() href} is templated.
 	 * @return {@code true} if the href is templated, otherwise {@code false}
 	 */
 	public boolean isTemplated() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -22,7 +22,7 @@
  * Strategy interface used to contribute {@link Health} to the results returned from the
  * reactive variant of the {@link HealthEndpoint}.
  * <p>
- * This is non blocking contract that is meant to be used in a reactive application. See
+ * This is non-blocking contract that is meant to be used in a reactive application. See
  * {@link HealthIndicator} for the traditional contract.
  *
  * @author Stephane Nicoll

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

@@ -84,9 +84,9 @@ void metricRecordedWithoutMainAppClassTagAndAdditionalTags() {
 		Tags tags = Tags.of("foo", "bar");
 		this.listener = new StartupTimeMetricsListener(this.registry, "started", "ready", tags);
 		this.listener.onApplicationEvent(new ApplicationReadyEvent(application, null, null, Duration.ofSeconds(2)));
-		TimeGauge applicationReadyGague = this.registry.find("ready").timeGauge();
-		assertThat(applicationReadyGague).isNotNull();
-		assertThat(applicationReadyGague.getId().getTags()).containsExactlyElementsOf(tags);
+		TimeGauge applicationReadyGauge = this.registry.find("ready").timeGauge();
+		assertThat(applicationReadyGauge).isNotNull();
+		assertThat(applicationReadyGauge.getId().getTags()).containsExactlyElementsOf(tags);
 	}
 
 	@Test

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -80,14 +80,13 @@
 
 	/**
 	 * The annotation type decorating a bean that should be checked. The condition matches
-	 * when all of the annotations specified are defined on beans in the
-	 * {@link BeanFactory}.
+	 * when all the annotations specified are defined on beans in the {@link BeanFactory}.
 	 * @return the class-level annotation types to check
 	 */
 	Class<? extends Annotation>[] annotation() default {};
 
 	/**
-	 * The names of beans to check. The condition matches when all of the bean names
+	 * The names of beans to check. The condition matches when all the bean names
 	 * specified are contained in the {@link BeanFactory}.
 	 * @return the names of beans to check
 	 */

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

@@ -343,7 +343,7 @@ public class FlywayProperties {
 	private String oracleKerberosCacheFile;
 
 	/**
-	 * Location of the Oracle Wallet, used to sign-in to the database automatically.
+	 * Location of the Oracle Wallet, used to sign in to the database automatically.
 	 * Requires Flyway Teams.
 	 */
 	private String oracleWalletLocation;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java

@@ -702,7 +702,7 @@ public static class Streams {
 		private String applicationId;
 
 		/**
-		 * Whether or not to auto-start the streams factory bean.
+		 * Whether to auto-start the streams factory bean.
 		 */
 		private boolean autoStartup = true;
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -140,7 +140,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManager
 	protected abstract Map<String, Object> getVendorProperties();
 
 	/**
-	 * Customize vendor properties before they are used. Allows for post processing (for
+	 * Customize vendor properties before they are used. Allows for post-processing (for
 	 * example to configure JTA specific settings).
 	 * @param vendorProperties the vendor properties to customize
 	 */

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,10 +25,9 @@
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional @Conditional} that checks whether or not the Spring resource
- * handling chain is enabled. Matches if
- * {@link WebProperties.Resources.Chain#getEnabled()} is {@code true} or if
- * {@code webjars-locator-core} is on the classpath.
+ * {@link Conditional @Conditional} that checks whether the Spring resource handling chain
+ * is enabled. Matches if {@link WebProperties.Resources.Chain#getEnabled()} is
+ * {@code true} or if {@code webjars-locator-core} is on the classpath.
  *
  * @author Stephane Nicoll
  * @since 1.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -27,8 +27,7 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * {@link Condition} that checks whether or not the Spring resource handling chain is
- * enabled.
+ * {@link Condition} that checks whether the Spring resource handling chain is enabled.
  *
  * @author Stephane Nicoll
  * @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java

@@ -141,7 +141,7 @@ void determineServerUriWithDeprecatedPropertyShouldOverrideDefault() {
 
 	@Test
 	@Deprecated
-	void determineServerUriWithCustoUriShouldTakePrecedenceOverDeprecatedProperty() {
+	void determineServerUriWithCustomUriShouldTakePrecedenceOverDeprecatedProperty() {
 		URI customUri = URI.create("bolt://localhost:4242");
 		URI anotherCustomURI = URI.create("bolt://localhost:2424");
 		Neo4jProperties properties = new Neo4jProperties();

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java

@@ -105,9 +105,8 @@ void setOutput(String output) {
 	}
 
 	/**
-	 * Whether or not the project archive should be extracted in the output location. If
-	 * the {@link #getOutput() output} ends with "/", the project is extracted
-	 * automatically.
+	 * Whether the project archive should be extracted in the output location. If the
+	 * {@link #getOutput() output} ends with "/", the project is extracted automatically.
 	 * @return {@code true} if the archive should be extracted, otherwise {@code false}
 	 */
 	boolean isExtract() {
@@ -242,7 +241,7 @@ void setFormat(String format) {
 	}
 
 	/**
-	 * Whether or not the type should be detected based on the build and format value.
+	 * Whether the type should be detected based on the build and format value.
 	 * @return {@code true} if type detection will be performed, otherwise {@code false}
 	 */
 	boolean isDetectType() {

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -96,7 +96,7 @@ public void compileAndRun() throws Exception {
 				stop();
 				Class<?>[] compiledSources = compile();
 				monitorForChanges();
-				// Run in new thread to ensure that the context classloader is setup
+				// Run in new thread to ensure that the context classloader is set up
 				this.runThread = new RunThread(compiledSources);
 				this.runThread.start();
 				this.runThread.join();