root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-03-06 16:27:48 +01:00
parent 2a98b3137d 2d88f18bf1
commit d722b9434e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,7 +39,7 @@ import org.springframework.util.ClassUtils;
* applying the mapping and mirroring rules of an {@link AnnotationTypeMapping}. * applying the mapping and mirroring rules of an {@link AnnotationTypeMapping}.
* *
* <p>Root attribute values are extracted from a source object using a supplied * <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 * supported by the same class. For example, the attributes source might be an
* actual {@link Annotation} instance where methods on the annotation instance * actual {@link Annotation} instance where methods on the annotation instance
* are {@linkplain AnnotationUtils#invokeAnnotationMethod(Method, Object) invoked} * are {@linkplain AnnotationUtils#invokeAnnotationMethod(Method, Object) invoked}

1
spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
View File

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