Skip to content

Admit nullable-valued maps in MergedAnnotation.asMap #37450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vlsi wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

Admit nullable-valued maps in MergedAnnotation.asMap #37450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ <T extends Annotation> MergedAnnotation<T>[] getAnnotationArray(String attribute
* @see #asAnnotationAttributes(Adapt...)
* @see #asMap(Adapt...)
*/
<T extends Map<String, Object>> T asMap(Function<MergedAnnotation<?>, T> factory, Adapt... adaptations);
<T extends Map<String, ? super Object>> T asMap(Function<MergedAnnotation<?>, T> factory, Adapt... adaptations);

/**
* Create a type-safe synthesized version of this merged annotation that can
Expand Down
4 changes: 3 additions & 1 deletion spring-core/src/main/java/org/springframework/core/annotation/MissingMergedAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ public Map<String, Object> asMap(Adapt... adaptations) {
}

@Override
public <T extends Map<String, Object>> T asMap(Function<MergedAnnotation<?>, T> factory, Adapt... adaptations) {
public <T extends Map<String, ? super Object>> T asMap(Function<MergedAnnotation<?>, T> factory,
Adapt... adaptations) {

return factory.apply(this);
}

Expand Down
6 changes: 4 additions & 2 deletions spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ public Map<String, Object> asMap(Adapt... adaptations) {
}

@Override
public <T extends Map<String, Object>> T asMap(Function<MergedAnnotation<?>, T> factory, Adapt... adaptations) {
public <T extends Map<String, ? super Object>> T asMap(Function<MergedAnnotation<?>, T> factory,
Adapt... adaptations) {

T map = factory.apply(this);
Assert.state(map != null, "Factory used to create MergedAnnotation Map must not return null");
AttributeMethods attributes = this.mapping.getAttributes();
Expand Down Expand Up @@ -302,7 +304,7 @@ private Class<?> getTypeForMapOptions(Method attribute, Adapt[] adaptations) {
return Object.class;
}

private <T extends Map<String, Object>> Object adaptValueForMapOptions(Method attribute, Object value,
private <T extends Map<String, ? super Object>> Object adaptValueForMapOptions(Method attribute, Object value,
Class<?> mapType, Function<MergedAnnotation<?>, T> factory, Adapt[] adaptations) {

if (value instanceof MergedAnnotation<?> annotation) {
Expand Down
Loading