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

Apply default value in case of null after conversion 

Closes gh-29550
This commit is contained in:
rstoyanchev 2023-06-20 13:01:37 +01:00
parent 37ff9792be
commit b98c1ec36a
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.java
View File

@ -108,11 +108,15 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements SyncHa
if (parameter != nestedParameter || !ClassUtils.isAssignableValue(parameter.getParameterType(), arg)) { if (parameter != nestedParameter || !ClassUtils.isAssignableValue(parameter.getParameterType(), arg)) {
arg = this.conversionService.convert(arg, TypeDescriptor.forObject(arg), new TypeDescriptor(parameter)); arg = this.conversionService.convert(arg, TypeDescriptor.forObject(arg), new TypeDescriptor(parameter));
// Check for null value after conversion of incoming argument value // Check for null value after conversion of incoming argument value
if (arg == null && namedValueInfo.defaultValue == null && if (arg == null) {
namedValueInfo.required && !nestedParameter.isOptional()) { if (namedValueInfo.defaultValue != null) {
arg = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
}
else if (namedValueInfo.required && !nestedParameter.isOptional()) {
handleMissingValue(namedValueInfo.name, nestedParameter, message); handleMissingValue(namedValueInfo.name, nestedParameter, message);
} }
} }
}
return arg; return arg;
} }

8
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
View File

@ -116,11 +116,15 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
if (parameter != nestedParameter || !ClassUtils.isAssignableValue(parameter.getParameterType(), arg)) { if (parameter != nestedParameter || !ClassUtils.isAssignableValue(parameter.getParameterType(), arg)) {
arg = this.conversionService.convert(arg, TypeDescriptor.forObject(arg), new TypeDescriptor(parameter)); arg = this.conversionService.convert(arg, TypeDescriptor.forObject(arg), new TypeDescriptor(parameter));
// Check for null value after conversion of incoming argument value // Check for null value after conversion of incoming argument value
if (arg == null && namedValueInfo.defaultValue == null && if (arg == null) {
namedValueInfo.required && !nestedParameter.isOptional()) { if (namedValueInfo.defaultValue != null) {
arg = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
}
else if (namedValueInfo.required && !nestedParameter.isOptional()) {
handleMissingValue(namedValueInfo.name, nestedParameter, message); handleMissingValue(namedValueInfo.name, nestedParameter, message);
} }
} }
}
handleResolvedValue(arg, namedValueInfo.name, parameter, message); handleResolvedValue(arg, namedValueInfo.name, parameter, message);

8
spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
View File

@ -133,11 +133,15 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
namedValueInfo.name, parameter, ex.getCause()); namedValueInfo.name, parameter, ex.getCause());
} }
// Check for null value after conversion of incoming argument value // Check for null value after conversion of incoming argument value
if (arg == null && namedValueInfo.defaultValue == null && if (arg == null) {
namedValueInfo.required && !nestedParameter.isOptional()) { if (namedValueInfo.defaultValue != null) {
arg = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
}
else if (namedValueInfo.required && !nestedParameter.isOptional()) {
handleMissingValueAfterConversion(namedValueInfo.name, nestedParameter, webRequest); handleMissingValueAfterConversion(namedValueInfo.name, nestedParameter, webRequest);
} }
} }
}
handleResolvedValue(arg, namedValueInfo.name, parameter, mavContainer, webRequest); handleResolvedValue(arg, namedValueInfo.name, parameter, mavContainer, webRequest);

15
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
View File

@ -462,6 +462,21 @@ public class RequestParamMethodArgumentResolverTests {
assertThat(arg).isNull(); assertThat(arg).isNull();
} }
@Test // gh-29550
public void missingRequestParamEmptyValueNotRequiredWithDefaultValue() throws Exception {
WebDataBinder binder = new WebRequestDataBinder(null);
binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
WebDataBinderFactory binderFactory = mock();
given(binderFactory.createBinder(webRequest, null, "name")).willReturn(binder);
request.addParameter("name", " ");
MethodParameter param = this.testMethod.annot(requestParam().notRequired("bar")).arg(String.class);
Object arg = resolver.resolveArgument(param, null, webRequest, binderFactory);
assertThat(arg).isEqualTo("bar");
}
@Test @Test
public void resolveSimpleTypeParam() throws Exception { public void resolveSimpleTypeParam() throws Exception {
request.setParameter("stringNotAnnot", "plainValue"); request.setParameter("stringNotAnnot", "plainValue");