Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent conversion of Optional array/list arrangements

Browse Source 
Issue: SPR-15918
Issue: SPR-15919
Issue: SPR-15676
This commit is contained in:
Juergen Hoeller
2017-09-20 18:28:49 +02:00
parent ea01c4113a
commit 15c82afc1c
5 changed files with 302 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java
View File

@@ -16,7 +16,9 @@
package org.springframework.core.convert.support;
import java.util.Collections;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Optional;
import java.util.Set;
@@ -46,7 +48,11 @@ final class ObjectToOptionalConverter implements ConditionalGenericConverter {
@Override
public Set<ConvertiblePair> getConvertibleTypes() {
return Collections.singleton(new ConvertiblePair(Object.class, Optional.class));
Set<ConvertiblePair> convertibleTypes = new LinkedHashSet<>(4);
convertibleTypes.add(new ConvertiblePair(Collection.class, Optional.class));
convertibleTypes.add(new ConvertiblePair(Object[].class, Optional.class));
convertibleTypes.add(new ConvertiblePair(Object.class, Optional.class));
return convertibleTypes;
}
@Override
@@ -69,7 +75,11 @@ final class ObjectToOptionalConverter implements ConditionalGenericConverter {
}
else if (targetType.getResolvableType().hasGenerics()) {
Object target = this.conversionService.convert(source, sourceType, new GenericTypeDescriptor(targetType));
return Optional.ofNullable(target);
if (target == null || (target.getClass().isArray() && Array.getLength(target) == 0) ||
(target instanceof Collection && ((Collection) target).isEmpty())) {
return Optional.empty();
}
return Optional.of(target);
}
else {
return Optional.of(source);

6
spring-core/src/main/java/org/springframework/util/ObjectUtils.java
View File

@@ -139,12 +139,12 @@ public abstract class ObjectUtils {
if (obj instanceof Optional) {
return !((Optional) obj).isPresent();
}
if (obj.getClass().isArray()) {
return Array.getLength(obj) == 0;
}
if (obj instanceof CharSequence) {
return ((CharSequence) obj).length() == 0;
}
if (obj.getClass().isArray()) {
return Array.getLength(obj) == 0;
}
if (obj instanceof Collection) {
return ((Collection) obj).isEmpty();
}