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

Restore @⁠Nullable on AnnotatedElementUtils.getAllAnnotationAttributes(...) 

Closes gh-34394
This commit is contained in:
Sam Brannen 2025-02-10 10:52:32 +01:00
parent 6d63abd4e9
commit 1a29fbda48
1 changed files with 2 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/AnnotatedElementUtils.java
View File

@ -478,7 +478,7 @@ public abstract class AnnotatedElementUtils {
* attributes from all annotations found, or {@code null} if not found * attributes from all annotations found, or {@code null} if not found
* @see #getAllAnnotationAttributes(AnnotatedElement, String, boolean, boolean) * @see #getAllAnnotationAttributes(AnnotatedElement, String, boolean, boolean)
*/ */
public static MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes( public static @Nullable MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(
AnnotatedElement element, String annotationName) { AnnotatedElement element, String annotationName) {
return getAllAnnotationAttributes(element, annotationName, false, false); return getAllAnnotationAttributes(element, annotationName, false, false);
@ -502,7 +502,7 @@ public abstract class AnnotatedElementUtils {
* @return a {@link MultiValueMap} keyed by attribute name, containing the annotation * @return a {@link MultiValueMap} keyed by attribute name, containing the annotation
* attributes from all annotations found, or {@code null} if not found * attributes from all annotations found, or {@code null} if not found
*/ */
public static MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(AnnotatedElement element, public static @Nullable MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(AnnotatedElement element,
String annotationName, final boolean classValuesAsString, final boolean nestedAnnotationsAsMap) { String annotationName, final boolean classValuesAsString, final boolean nestedAnnotationsAsMap) {
Adapt[] adaptations = Adapt.values(classValuesAsString, nestedAnnotationsAsMap); Adapt[] adaptations = Adapt.values(classValuesAsString, nestedAnnotationsAsMap);