Skip to content

Commit 1a29fbd

Browse files
committed
Restore @⁠Nullable on AnnotatedElementUtils.getAllAnnotationAttributes(...)
Closes gh-34394
1 parent 6d63abd commit 1a29fbd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ public static <A extends Annotation> Set<A> getMergedRepeatableAnnotations(
478478
* attributes from all annotations found, or {@code null} if not found
479479
* @see #getAllAnnotationAttributes(AnnotatedElement, String, boolean, boolean)
480480
*/
481-
public static MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(
481+
public static @Nullable MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(
482482
AnnotatedElement element, String annotationName) {
483483

484484
return getAllAnnotationAttributes(element, annotationName, false, false);
@@ -502,7 +502,7 @@ public static <A extends Annotation> Set<A> getMergedRepeatableAnnotations(
502502
* @return a {@link MultiValueMap} keyed by attribute name, containing the annotation
503503
* attributes from all annotations found, or {@code null} if not found
504504
*/
505-
public static MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(AnnotatedElement element,
505+
public static @Nullable MultiValueMap<String, @Nullable Object> getAllAnnotationAttributes(AnnotatedElement element,
506506
String annotationName, final boolean classValuesAsString, final boolean nestedAnnotationsAsMap) {
507507

508508
Adapt[] adaptations = Adapt.values(classValuesAsString, nestedAnnotationsAsMap);

0 commit comments

Comments
 (0)