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

Polishing

This commit is contained in:
Juergen Hoeller 2014-09-07 22:51:21 +02:00
parent dedb04bd5c
commit c8bbd0bae4
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
} }
arg = handleNullValue(namedValueInfo.name, arg, paramType); arg = handleNullValue(namedValueInfo.name, arg, paramType);
} }
else if ("".equals(arg) && (namedValueInfo.defaultValue != null)) { else if ("".equals(arg) && namedValueInfo.defaultValue != null) {
arg = resolveDefaultValue(namedValueInfo.defaultValue); arg = resolveDefaultValue(namedValueInfo.defaultValue);
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -47,8 +47,8 @@ public class RequestHeaderMapMethodArgumentResolver implements HandlerMethodArgu
@Override @Override
public boolean supportsParameter(MethodParameter parameter) { public boolean supportsParameter(MethodParameter parameter) {
return parameter.hasParameterAnnotation(RequestHeader.class) return parameter.hasParameterAnnotation(RequestHeader.class) &&
&& Map.class.isAssignableFrom(parameter.getParameterType()); Map.class.isAssignableFrom(parameter.getParameterType());
} }
@Override @Override
@ -85,4 +85,5 @@ public class RequestHeaderMapMethodArgumentResolver implements HandlerMethodArgu
return result; return result;
} }
} }
} }

4
spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
View File

@ -54,8 +54,8 @@ public class RequestHeaderMethodArgumentResolver extends AbstractNamedValueMetho
@Override @Override
public boolean supportsParameter(MethodParameter parameter) { public boolean supportsParameter(MethodParameter parameter) {
return parameter.hasParameterAnnotation(RequestHeader.class) return parameter.hasParameterAnnotation(RequestHeader.class) &&
&& !Map.class.isAssignableFrom(parameter.getParameterType()); !Map.class.isAssignableFrom(parameter.getParameterType());
} }
@Override @Override

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

@ -153,9 +153,7 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
@Override @Override
protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) { protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class); RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class);
return (annotation != null) ? return (annotation != null) ? new RequestParamNamedValueInfo(annotation) : new RequestParamNamedValueInfo();
new RequestParamNamedValueInfo(annotation) :
new RequestParamNamedValueInfo();
} }
@Override @Override
@ -179,7 +177,8 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
else if (isMultipartFileArray(parameter)) { else if (isMultipartFileArray(parameter)) {
assertIsMultipartRequest(servletRequest); assertIsMultipartRequest(servletRequest);
Assert.notNull(multipartRequest, "Expected MultipartHttpServletRequest: is a MultipartResolver configured?"); Assert.notNull(multipartRequest, "Expected MultipartHttpServletRequest: is a MultipartResolver configured?");
arg = multipartRequest.getFiles(name).toArray(new MultipartFile[0]); List<MultipartFile> multipartFiles = multipartRequest.getFiles(name);
arg = multipartFiles.toArray(new MultipartFile[multipartFiles.size()]);
} }
else if ("javax.servlet.http.Part".equals(parameter.getParameterType().getName())) { else if ("javax.servlet.http.Part".equals(parameter.getParameterType().getName())) {
assertIsMultipartRequest(servletRequest); assertIsMultipartRequest(servletRequest);
@ -311,6 +310,7 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
} }
} }
private static class RequestPartResolver { private static class RequestPartResolver {
public static Object resolvePart(HttpServletRequest servletRequest) throws Exception { public static Object resolvePart(HttpServletRequest servletRequest) throws Exception {