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

Refine type conversion errors in ModelAttributeMethodProcessor

Browse Source 
This commit turns TypeMismatchException thrown in
ModelAttributeMethodArgumentResolver#createAttribute into
proper ServerWebInputException in order get HTTP response
with 400 Bad Request status code instead of 500 Internal error.

Closes gh-31045
This commit is contained in:
Sébastien Deleuze
2023-08-18 11:46:00 +02:00
parent 8af9648c43
commit e6565c600a
3 changed files with 106 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
View File

@@ -26,6 +26,7 @@ import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.TypeMismatchException;
import org.springframework.context.i18n.LocaleContext;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.core.MethodParameter;
@@ -45,6 +46,7 @@ import org.springframework.web.bind.support.WebExchangeDataBinder;
import org.springframework.web.reactive.BindingContext;
import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolverSupport;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.ServerWebInputException;
/**
* Resolve {@code @ModelAttribute} annotated method arguments.
@@ -63,6 +65,7 @@ import org.springframework.web.server.ServerWebExchange;
* @author Rossen Stoyanchev
* @author Juergen Hoeller
* @author Sam Brannen
* @author Sebastien Deleuze
* @since 5.0
*/
public class ModelAttributeMethodArgumentResolver extends HandlerMethodArgumentResolverSupport {
@@ -255,7 +258,12 @@ public class ModelAttributeMethodArgumentResolver extends HandlerMethodArgumentR
args[i] = (methodParam.getParameterType() == Optional.class ? Optional.empty() : null);
}
else {
args[i] = binder.convertIfNecessary(value, paramTypes[i], methodParam);
try {
args[i] = binder.convertIfNecessary(value, paramTypes[i], methodParam);
}
catch (TypeMismatchException ex) {
throw new ServerWebInputException("Type mismatch.", methodParam, ex);
}
}
}
return BeanUtils.instantiateClass(ctor, args);