Skip to content

Fix OptionalToObjectConverter applicability check #36913

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

Open
junhyeong9812 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −1
Open

Fix OptionalToObjectConverter applicability check #36913

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion ...ore/src/main/java/org/springframework/core/convert/support/OptionalToObjectConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.jspecify.annotations.Nullable;

import org.springframework.core.ResolvableType;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.ConditionalGenericConverter;
Expand Down Expand Up @@ -51,7 +52,14 @@ public Set<ConvertiblePair> getConvertibleTypes() {

@Override
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
ResolvableType elementType = sourceType.getResolvableType().getGeneric();
if (elementType.resolve() == null) {
// Unknown Optional element type (raw Optional, wildcard, or unresolved
// type variable): remain permissive.
return true;
}
TypeDescriptor sourceElementType = new TypeDescriptor(elementType, null, null);
return ConversionUtils.canConvertElements(sourceElementType, targetType, this.conversionService);
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions ...c/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.sql.Time;
import java.sql.Timestamp;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.AbstractList;
import java.util.ArrayList;
Expand Down Expand Up @@ -962,6 +963,25 @@ class OptionalConversionTests {
private static final TypeDescriptor rawOptionalType = TypeDescriptor.valueOf(Optional.class);


@Test
void canConvertOptionalToObjectReflectsContainedElementType() {
TypeDescriptor integerOptionalType =
new TypeDescriptor(ResolvableType.forClassWithGenerics(Optional.class, Integer.class), null, null);
TypeDescriptor localDateType = TypeDescriptor.valueOf(LocalDate.class);

// Integer -> String is convertible
assertThat(conversionService.canConvert(integerOptionalType, TypeDescriptor.valueOf(String.class))).isTrue();

// Integer -> LocalDate is not convertible, so canConvert must not over-report...
assertThat(conversionService.canConvert(integerOptionalType, localDateType)).isFalse();
// ...and must stay consistent with convert(): no converter is selected
assertThatExceptionOfType(ConverterNotFoundException.class)
.isThrownBy(() -> conversionService.convert(Optional.of(42), integerOptionalType, localDateType));

// An Optional with an unknown element type remains permissive
assertThat(conversionService.canConvert(rawOptionalType, localDateType)).isTrue();
}

@Test
@SuppressWarnings("unchecked")
void convertObjectToOptional() {
Expand Down