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

Polishing

This commit is contained in:
Juergen Hoeller 2016-12-01 20:19:49 +01:00
parent 0028b29760
commit eb97335c6f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
* Abstract base class for resolving method arguments from a named value. * Abstract base class for resolving method arguments from a named value.
* Request parameters, request headers, and path variables are examples of named * Request parameters, request headers, and path variables are examples of named
* values. Each may have a name, a required flag, and a default value. * values. Each may have a name, a required flag, and a default value.
*
* <p>Subclasses define how to do the following: * <p>Subclasses define how to do the following:
* <ul> * <ul>
* <li>Obtain named value information for a method parameter * <li>Obtain named value information for a method parameter
@ -46,9 +47,11 @@ import org.springframework.web.method.support.ModelAndViewContainer;
* <li>Handle missing argument values when argument values are required * <li>Handle missing argument values when argument values are required
* <li>Optionally handle a resolved value * <li>Optionally handle a resolved value
* </ul> * </ul>
*
* <p>A default value string can contain ${...} placeholders and Spring Expression * <p>A default value string can contain ${...} placeholders and Spring Expression
* Language #{...} expressions. For this to work a * Language #{...} expressions. For this to work a
* {@link ConfigurableBeanFactory} must be supplied to the class constructor. * {@link ConfigurableBeanFactory} must be supplied to the class constructor.
*
* <p>A {@link WebDataBinder} is created to apply type conversion to the resolved * <p>A {@link WebDataBinder} is created to apply type conversion to the resolved
* argument value if it doesn't match the method parameter type. * argument value if it doesn't match the method parameter type.
* *
@ -63,7 +66,8 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
private final BeanExpressionContext expressionContext; private final BeanExpressionContext expressionContext;
private final Map<MethodParameter, NamedValueInfo> namedValueInfoCache = new ConcurrentHashMap<MethodParameter, NamedValueInfo>(256); private final Map<MethodParameter, NamedValueInfo> namedValueInfoCache =
new ConcurrentHashMap<MethodParameter, NamedValueInfo>(256);
public AbstractNamedValueMethodArgumentResolver() { public AbstractNamedValueMethodArgumentResolver() {
@ -78,7 +82,8 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
*/ */
public AbstractNamedValueMethodArgumentResolver(ConfigurableBeanFactory beanFactory) { public AbstractNamedValueMethodArgumentResolver(ConfigurableBeanFactory beanFactory) {
this.configurableBeanFactory = beanFactory; this.configurableBeanFactory = beanFactory;
this.expressionContext = (beanFactory != null ? new BeanExpressionContext(beanFactory, new RequestScope()) : null); this.expressionContext =
(beanFactory != null ? new BeanExpressionContext(beanFactory, new RequestScope()) : null);
} }
@ -204,7 +209,9 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
* @param request the current request * @param request the current request
* @since 4.3 * @since 4.3
*/ */
protected void handleMissingValue(String name, MethodParameter parameter, NativeWebRequest request) throws Exception { protected void handleMissingValue(String name, MethodParameter parameter, NativeWebRequest request)
throws Exception {
handleMissingValue(name, parameter); handleMissingValue(name, parameter);
} }
@ -241,7 +248,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
* @param arg the resolved argument value * @param arg the resolved argument value
* @param name the argument name * @param name the argument name
* @param parameter the argument parameter type * @param parameter the argument parameter type
* @param mavContainer the {@link ModelAndViewContainer}, which may be {@code null} * @param mavContainer the {@link ModelAndViewContainer} (may be {@code null})
* @param webRequest the current request * @param webRequest the current request
*/ */
protected void handleResolvedValue(Object arg, String name, MethodParameter parameter, protected void handleResolvedValue(Object arg, String name, MethodParameter parameter,

7
spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
View File

@ -181,7 +181,9 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
} }
@Override @Override
protected void handleMissingValue(String name, MethodParameter parameter, NativeWebRequest request) throws Exception { protected void handleMissingValue(String name, MethodParameter parameter, NativeWebRequest request)
throws Exception {
HttpServletRequest servletRequest = request.getNativeRequest(HttpServletRequest.class); HttpServletRequest servletRequest = request.getNativeRequest(HttpServletRequest.class);
if (MultipartResolutionDelegate.isMultipartArgument(parameter)) { if (MultipartResolutionDelegate.isMultipartArgument(parameter)) {
if (!MultipartResolutionDelegate.isMultipartRequest(servletRequest)) { if (!MultipartResolutionDelegate.isMultipartRequest(servletRequest)) {
@ -192,7 +194,8 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
} }
} }
else { else {
throw new MissingServletRequestParameterException(name, parameter.getNestedParameterType().getSimpleName()); throw new MissingServletRequestParameterException(name,
parameter.getNestedParameterType().getSimpleName());
} }
} }