Skip to content

Improve primitive array handling in AnnotationAttributes.toString() #37395

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

Merged
sbrannen merged 1 commit into from
Oct 5, 2026
Merged

Improve primitive array handling in AnnotationAttributes.toString() #37395

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
11 changes: 8 additions & 3 deletions spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.StringJoiner;

import org.jspecify.annotations.Nullable;

import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;

/**
* {@link LinkedHashMap} subclass representing annotation attribute
Expand Down Expand Up @@ -396,8 +396,13 @@ private String valueToString(@Nullable Object value) {
if (value == this) {
return "(this Map)";
}
if (value instanceof Object[] objects) {
return "[" + StringUtils.arrayToDelimitedString(objects, ", ") + "]";
if (value != null && value.getClass().isArray()) {
int length = Array.getLength(value);
StringJoiner sj = new StringJoiner(", ", "[", "]");
for (int i = 0; i < length; i++) {
sj.add(valueToString(Array.get(value, i)));
}
return sj.toString();
}
return String.valueOf(value);
}
Expand Down
Loading