Skip to content

Commit bc60f1f

Browse files
committed
Simplify resolved default values to strings
Use String.valueOf for consistency with PropertySourcesPlaceholdersResolver and remove the conditional array type handling. See gh-51661 Signed-off-by: Wan bin yu <[email protected]>
1 parent aa48561 commit bc60f1f

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

‎core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.lang.reflect.Modifier;
2424
import java.lang.reflect.Parameter;
2525
import java.util.ArrayList;
26-
import java.util.Arrays;
2726
import java.util.Collection;
2827
import java.util.Collections;
2928
import java.util.EnumMap;
@@ -144,20 +143,17 @@ public <T> void onUnableToCreateInstance(Bindable<T> target, Context context, Ru
144143
return context.getConverter().convert(null, type);
145144
}
146145

147-
private @Nullable Object[] resolveDefaultValue(PlaceholdersResolver resolver, String[] defaultValue) {
148-
@Nullable Object[] resolved = new Object[defaultValue.length];
149-
boolean strings = true;
146+
private String[] resolveDefaultValue(PlaceholdersResolver resolver, String[] defaultValue) {
147+
String[] resolved = new String[defaultValue.length];
150148
for (int i = 0; i < defaultValue.length; i++) {
151149
Object value = resolver.resolvePlaceholders(defaultValue[i]);
152-
resolved[i] = value;
153-
strings = strings && (value == null || value instanceof String);
150+
resolved[i] = String.valueOf(value);
154151
}
155-
// Preserve the source type for converters that accept String[].
156-
return strings ? Arrays.copyOf(resolved, resolved.length, String[].class) : resolved;
152+
return resolved;
157153
}
158154

159-
private <T> @Nullable T convertDefaultValue(BindConverter converter, @Nullable Object[] defaultValue,
160-
ResolvableType type, Annotation[] annotations) {
155+
private <T> @Nullable T convertDefaultValue(BindConverter converter, String[] defaultValue, ResolvableType type,
156+
Annotation[] annotations) {
161157
try {
162158
return converter.convert(defaultValue, type, annotations);
163159
}

0 commit comments

Comments
 (0)