Merge branch '6.2.x'

Author: sbrannen

Diff for: spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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 @@
  * applying the mapping and mirroring rules of an {@link AnnotationTypeMapping}.
  *
  * <p>Root attribute values are extracted from a source object using a supplied
- * {@code BiFunction}. This allows various different annotation models to be
+ * {@link ValueExtractor}. This allows various different annotation models to be
  * supported by the same class. For example, the attributes source might be an
  * actual {@link Annotation} instance where methods on the annotation instance
  * are {@linkplain AnnotationUtils#invokeAnnotationMethod(Method, Object) invoked}

Diff for: spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@@ -582,6 +582,7 @@ void stringListToListOfSubclassOfUnboundGenericClass() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void stringToListOfMapConverterWithFallbackMatch() {
 		conversionService.addConverter(new StringToListOfMapConverter());