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

Empty string check after conversion in AbstractNamedValueArgumentResolver

Browse Source 
Closes gh-33794
This commit is contained in:
rstoyanchev
2024-11-06 14:10:45 +00:00
parent 59ec871e76
commit d4719493bd
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java
View File

@@ -32,6 +32,7 @@ import org.springframework.core.convert.TypeDescriptor;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.ValueConstants;
/**
@@ -191,11 +192,15 @@ public abstract class AbstractNamedValueArgumentResolver implements HttpServiceA
}
if (this.conversionService != null && !(value instanceof String)) {
Object beforeValue = value;
parameter = parameter.nestedIfOptional();
Class<?> type = parameter.getNestedParameterType();
value = (type != Object.class && !type.isArray() ?
this.conversionService.convert(value, new TypeDescriptor(parameter), STRING_TARGET_TYPE) :
this.conversionService.convert(value, String.class));
if (!StringUtils.hasText((String) value) && !required && beforeValue == null) {
value = null;
}
}
if (value == null) {

8
spring-web/src/test/java/org/springframework/web/service/invoker/NamedValueArgumentResolverTests.java
View File

@@ -74,6 +74,12 @@ class NamedValueArgumentResolverTests {
assertTestValue("value", "2022-09-16");
}
@Test // gh-33794
void dateNullValue() {
this.service.executeDate(null);
assertTestValue("value");
}
@Test
void objectTestValue() {
this.service.execute(Boolean.TRUE);
@@ -182,7 +188,7 @@ class NamedValueArgumentResolverTests {
void executeString(@TestValue String value);
@GetExchange
void executeDate(@TestValue @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate value);
void executeDate(@Nullable @TestValue(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate value);
@GetExchange
void execute(@TestValue Object value);