root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

This commit is contained in:
Phillip Webb 2021-01-30 12:34:28 -08:00
parent 82b90d5749 dd997cda9c
commit 01746453f7
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/IndexedElementsBinder.java
View File

@ -32,7 +32,6 @@ import org.springframework.boot.context.properties.source.IterableConfigurationP
import org.springframework.core.ResolvableType;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
/**
* Base class for {@link AggregateBinder AggregateBinders} that read a sequential run of
@ -90,7 +89,7 @@ abstract class IndexedElementsBinder<T> extends AggregateBinder<T> {
private void bindValue(Bindable<?> target, Collection<Object> collection, ResolvableType aggregateType,
ResolvableType elementType, Object value) {
if (value instanceof String && !StringUtils.hasText((String) value)) {
if (value == null || value instanceof CharSequence && ((CharSequence) value).length() == 0) {
return;
}
Object aggregate = convert(value, aggregateType, target.getAnnotations());

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/CharSequenceToObjectConverterTests.java
View File

@ -40,7 +40,6 @@ class CharSequenceToObjectConverterTests {
@ConversionServiceTest
void convertWhenCanConvertDirectlySkipsStringConversion(ConversionService conversionService) {
assertThat(conversionService.convert(new String("1"), Long.class)).isEqualTo(1);
System.out.println(conversionService.getClass());
if (!ConversionServiceArguments.isApplicationConversionService(conversionService)) {
assertThat(conversionService.convert(new StringBuilder("1"), Long.class)).isEqualTo(2);
}