Merge branch '6.1.x'

spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -33,7 +33,7 @@ import org.springframework.lang.Nullable;
  *
  * <p>First, creates a new Map of the requested targetType with a size equal to the
  * size of the source Map. Then copies each element in the source map to the target map.
- * Will perform a conversion from the source maps's parameterized K,V types to the target
+ * Will perform a conversion from the source map's parameterized K,V types to the target
  * map's parameterized types K,V if necessary.
  *
  * @author Keith Donald

spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2024 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,14 +49,14 @@ public interface SimpleJdbcCallOperations {
 	SimpleJdbcCallOperations withFunctionName(String functionName);
 
 	/**
-	 * Optionally, specify the name of the schema that contins the stored procedure.
+	 * Optionally, specify the name of the schema that contains the stored procedure.
 	 * @param schemaName the name of the schema
 	 * @return the instance of this SimpleJdbcCall
 	 */
 	SimpleJdbcCallOperations withSchemaName(String schemaName);
 
 	/**
-	 * Optionally, specify the name of the catalog that contins the stored procedure.
+	 * Optionally, specify the name of the catalog that contains the stored procedure.
 	 * <p>To provide consistency with the Oracle DatabaseMetaData, this is used to specify the
 	 * package name if the procedure is declared as part of a package.
 	 * @param catalogName the catalog or package name

spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageMappingInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -23,7 +23,7 @@ import org.springframework.messaging.handler.DestinationPatternsMessageCondition
 import org.springframework.messaging.handler.MessageCondition;
 
 /**
- * {@link MessageCondition} for SImple Messaging Protocols. Encapsulates the following
+ * {@link MessageCondition} for Simple Messaging Protocols. Encapsulates the following
  * request mapping conditions:
  * <ol>
  * <li>{@link SimpMessageTypeMessageCondition}

spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java

@@ -1,5 +1,5 @@
 /**
- * Annotations and for handling messages from SImple Messaging Protocols such as STOMP.
+ * Annotations and for handling messages from Simple Messaging Protocols such as STOMP.
  */
 @NonNullApi
 @NonNullFields

spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -39,7 +39,7 @@ import org.springframework.web.multipart.MultipartResolver;
  *
  * <p>If no MultipartResolver bean is found, this filter falls back to a default
  * MultipartResolver: {@link StandardServletMultipartResolver} for Servlet
- * oontainers, based on a multipart-config section in {@code web.xml}.
+ * containers, based on a multipart-config section in {@code web.xml}.
  * Note however that at present the Servlet specification only defines how to
  * enable multipart configuration on a Servlet and as a result multipart request
  * processing is likely not possible in a Filter unless the Servlet container

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java

@@ -479,8 +479,8 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 	@Override
 	protected boolean hasCorsConfigurationSource(Object handler) {
 		return super.hasCorsConfigurationSource(handler) ||
-				(handler instanceof HandlerMethod handerMethod &&
+				(handler instanceof HandlerMethod handlerMethod &&
-						this.mappingRegistry.getCorsConfiguration(handerMethod) != null);
+						this.mappingRegistry.getCorsConfiguration(handlerMethod) != null);
 	}
 
 	@Override