Merge branch '3.5.x' into 4.0.x

Closes gh-49727

core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java

@@ -544,7 +544,7 @@ public final class PropertyMapper {
 			public interface Mapper<R extends @Nullable Object, T> {
 
 				/**
-				 * Map a existing instance for the given nullable value.
+				 * Map an existing instance for the given nullable value.
 				 * @param instance the existing instance
 				 * @param value the value to map (may be {@code null})
 				 * @return the resulting mapped instance

core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java

@@ -394,7 +394,7 @@ public interface JsonWriter<T> {
 
 		/**
 		 * Only include this member when an extracted value is not {@code null}.
-		 * @param extractor an function used to extract the value to test
+		 * @param extractor a function used to extract the value to test
 		 * @return a {@link Member} which may be configured further
 		 */
 		public Member<T> whenNotNull(Function<@Nullable T, ?> extractor) {

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/Archive.java

@@ -98,7 +98,7 @@ public interface Archive extends AutoCloseable {
 	 * Factory method to create an appropriate {@link Archive} from the given
 	 * {@link Class} target.
 	 * @param target a target class that will be used to find the archive code source
-	 * @return an new {@link Archive} instance
+	 * @return a new {@link Archive} instance
 	 * @throws Exception if the archive cannot be created
 	 */
 	static Archive create(Class<?> target) throws Exception {

module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonMixinModuleEntriesBeanRegistrationAotProcessor.java

@@ -40,7 +40,7 @@ import org.springframework.javapoet.CodeBlock;
 
 /**
  * {@link BeanRegistrationAotProcessor} that replaces any {@link JsonMixinModuleEntries}
- * by an hard-coded equivalent. This has the effect of disabling scanning at runtime.
+ * by a hard-coded equivalent. This has the effect of disabling scanning at runtime.
  *
  * @author Stephane Nicoll
  * @deprecated since 4.0.0 for removal in 4.3.0 in favor of Jackson 3