Skip to content

Commit

Permalink
Restore @⁠Nullable on AnnotatedElementUtils.getAllAnnotationAttribute…
Browse files Browse the repository at this point in the history
…s(...)

Closes spring-projectsgh-34394
  • Loading branch information
sbrannen committed Feb 10, 2025
1 parent 6d63abd commit 1a29fbd
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ public static <A extends Annotation> Set<A> getMergedRepeatableAnnotations(
* attributes from all annotations found, or {@code null} if not found
* @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) {

return getAllAnnotationAttributes(element, annotationName, false, false);
Expand All @@ -502,7 +502,7 @@ public static <A extends Annotation> Set<A> getMergedRepeatableAnnotations(
* @return a {@link MultiValueMap} keyed by attribute name, containing the annotation
* 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) {

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

0 comments on commit 1a29fbd

Please sign in to comment.