|
23 | 23 | import java.lang.reflect.Modifier; |
24 | 24 | import java.lang.reflect.Parameter; |
25 | 25 | import java.util.ArrayList; |
26 | | -import java.util.Arrays; |
27 | 26 | import java.util.Collection; |
28 | 27 | import java.util.Collections; |
29 | 28 | import java.util.EnumMap; |
@@ -144,20 +143,17 @@ public <T> void onUnableToCreateInstance(Bindable<T> target, Context context, Ru |
144 | 143 | return context.getConverter().convert(null, type); |
145 | 144 | } |
146 | 145 |
|
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]; |
150 | 148 | for (int i = 0; i < defaultValue.length; i++) { |
151 | 149 | Object value = resolver.resolvePlaceholders(defaultValue[i]); |
152 | | - resolved[i] = value; |
153 | | - strings = strings && (value == null || value instanceof String); |
| 150 | + resolved[i] = String.valueOf(value); |
154 | 151 | } |
155 | | - // Preserve the source type for converters that accept String[]. |
156 | | - return strings ? Arrays.copyOf(resolved, resolved.length, String[].class) : resolved; |
| 152 | + return resolved; |
157 | 153 | } |
158 | 154 |
|
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) { |
161 | 157 | try { |
162 | 158 | return converter.convert(defaultValue, type, annotations); |
163 | 159 | } |
|
0 commit comments