SPR-8532 Upgrade org.springframework.web.servlet to Servlet 3.0 (as provided dependency) and add support for javax.servlet.Part parameter

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.mock.web;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -27,6 +28,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -34,19 +36,28 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
 
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest}
- * interface. Supports the Servlet 2.5 API level.
+ * interface. Supports the Servlet 2.5 API level; throws
+ * {@link UnsupportedOperationException} for all methods introduced in Servlet 3.0.
  *
  * <p>Used for testing the web framework; also useful for testing
  * application controllers.
@@ -55,6 +66,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  * @author Rod Johnson
  * @author Rick Evans
  * @author Mark Fisher
+ * @author Chris Beams
  * @since 1.0.2
  */
 public class MockHttpServletRequest implements HttpServletRequest {
@@ -134,6 +146,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	private int localPort = DEFAULT_SERVER_PORT;
 
+	private Map<String, Part> parts = new HashMap<String, Part>();
 
 	//---------------------------------------------------------------------
 	// HttpServletRequest properties
@@ -847,4 +860,57 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return isRequestedSessionIdFromURL();
 	}
 
+
+	//---------------------------------------------------------------------
+	// Methods introduced in Servlet 3.0
+	//---------------------------------------------------------------------
+
+	public AsyncContext getAsyncContext() {
+		throw new UnsupportedOperationException();
+	}
+
+	public DispatcherType getDispatcherType() {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean isAsyncSupported() {
+		throw new UnsupportedOperationException();
+	}
+
+	public AsyncContext startAsync() {
+		throw new UnsupportedOperationException();
+	}
+
+	public AsyncContext startAsync(ServletRequest arg0, ServletResponse arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean isAsyncStarted() {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException {
+		throw new UnsupportedOperationException();
+	}
+	
+	public void addPart(Part part) {
+		parts.put(part.getName(), part);
+	}
+
+	public Part getPart(String key) throws IOException, IllegalStateException, ServletException {
+		return parts.get(key);
+	}
+
+	public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException {
+		return parts.values();
+	}
+
+	public void login(String arg0, String arg1) throws ServletException {
+		throw new UnsupportedOperationException();
+	}
+
+	public void logout() throws ServletException {
+		throw new UnsupportedOperationException();
+	}
+
 }

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
@@ -292,9 +293,9 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * @param name the name of the header
 	 * @return the associated header value, or <code>null<code> if none
 	 */
-	public Object getHeader(String name) {
+	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		return (header != null ? header.getValue() : null);
+		return (header != null ? header.getValue().toString() : null);
 	}
 
 	/**
@@ -302,9 +303,9 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * @param name the name of the header
 	 * @return the associated header values, or an empty List if none
 	 */
-	public List<Object> getHeaders(String name) {
+	public List<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		return (header != null ? header.getValues() : Collections.emptyList());
+		return (header != null ? header.getStringValues() : Collections.<String>emptyList());
 	}
 
 	/**

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPart.java

@@ -0,0 +1,139 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.mock.web;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.servlet.http.Part;
+
+import org.springframework.util.Assert;
+import org.springframework.util.FileCopyUtils;
+
+/**
+ * Mock implementation of the {@link Part} interface.
+ *
+ * @author Rossen Stoyanchev
+ * @since 3.1
+ * @see MockHttpServletRequest
+ */
+public class MockPart implements Part {
+
+	private static final String CONTENT_TYPE = "Content-Type";
+
+	private final String name;
+
+	private String contentType;
+
+	private final byte[] content;
+
+	/**
+	 * Create a new MockPart with the given content.
+	 * @param name the name of the part
+	 * @param content the content for the part
+	 */
+	public MockPart(String name, byte[] content) {
+		this(name, "", content);
+	}
+
+	/**
+	 * Create a new MockPart with the given content.
+	 * @param name the name of the part
+	 * @param contentStream the content of the part as stream
+	 * @throws IOException if reading from the stream failed
+	 */
+	public MockPart(String name, InputStream contentStream) throws IOException {
+		this(name, "", FileCopyUtils.copyToByteArray(contentStream));
+	}
+
+	/**
+	 * Create a new MockPart with the given content.
+	 * @param name the name of the file
+	 * @param contentType the content type (if known)
+	 * @param content the content of the file
+	 */
+	public MockPart(String name, String contentType, byte[] content) {
+		Assert.hasLength(name, "Name must not be null");
+		this.name = name;
+		this.contentType = contentType;
+		this.content = (content != null ? content : new byte[0]);
+	}
+
+	/**
+	 * Create a new MockPart with the given content.
+	 * @param name the name of the file
+	 * @param contentType the content type (if known)
+	 * @param contentStream the content of the part as stream
+	 * @throws IOException if reading from the stream failed
+	 */
+	public MockPart(String name, String contentType, InputStream contentStream)
+			throws IOException {
+
+		this(name, contentType, FileCopyUtils.copyToByteArray(contentStream));
+	}
+
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getContentType() {
+		return this.contentType;
+	}
+
+	public long getSize() {
+		return this.content.length;
+	}
+
+	public InputStream getInputStream() throws IOException {
+		return new ByteArrayInputStream(this.content);
+	}
+
+	public String getHeader(String name) {
+		if (CONTENT_TYPE.equalsIgnoreCase(name)) {
+			return this.contentType;
+		}
+		else {
+			return null;
+		}
+	}
+
+	public Collection<String> getHeaders(String name) {
+		if (CONTENT_TYPE.equalsIgnoreCase(name)) {
+			return Collections.singleton(this.contentType);
+		}
+		else {
+			return null;
+		}
+	}
+
+	public Collection<String> getHeaderNames() {
+		return Collections.singleton(CONTENT_TYPE);
+	}
+
+	public void write(String fileName) throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	public void delete() throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+}

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.EventListener;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -30,9 +31,17 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.activation.FileTypeMap;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.FilterRegistration.Dynamic;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -67,8 +76,12 @@ import org.springframework.web.util.WebUtils;
  * and XmlWebApplicationContext with an underlying MockServletContext (as long as
  * the MockServletContext has been configured with a FileSystemResourceLoader).
  *
+ * Supports the Servlet 3.0 API level, but throws {@link UnsupportedOperationException}
+ * for all methods introduced in Servlet 3.0.
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Chris Beams
  * @since 1.0.2
  * @see #MockServletContext(org.springframework.core.io.ResourceLoader)
  * @see org.springframework.web.context.support.XmlWebApplicationContext
@@ -89,6 +102,8 @@ public class MockServletContext implements ServletContext {
 
 	private String contextPath = "";
 
+	private int minorVersion = 5;
+
 	private final Map<String, ServletContext> contexts = new HashMap<String, ServletContext>();
 
 	private final Map<String, String> initParameters = new LinkedHashMap<String, String>();
@@ -180,8 +195,15 @@ public class MockServletContext implements ServletContext {
 		return 2;
 	}
 
+	public void setMinorVersion(int minorVersion) {
+		if (minorVersion < 3 || minorVersion > 5) {
+			throw new IllegalArgumentException("Only Servlet minor versions between 3 and 5 are supported");
+		}
+		this.minorVersion = minorVersion;
+	}
+
 	public int getMinorVersion() {
-		return 5;
+		return this.minorVersion;
 	}
 
 	public String getMimeType(String filePath) {
@@ -352,4 +374,119 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+
+	//---------------------------------------------------------------------
+	// Methods introduced in Servlet 3.0
+	//---------------------------------------------------------------------
+
+	public Dynamic addFilter(String arg0, String arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Dynamic addFilter(String arg0, Filter arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public void addListener(Class<? extends EventListener> arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public void addListener(String arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public <T extends EventListener> void addListener(T arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+			Servlet arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+			Class<? extends Servlet> arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public <T extends Filter> T createFilter(Class<T> arg0)
+			throws ServletException {
+		throw new UnsupportedOperationException();
+	}
+
+	public <T extends EventListener> T createListener(Class<T> arg0)
+			throws ServletException {
+		throw new UnsupportedOperationException();
+	}
+
+	public <T extends Servlet> T createServlet(Class<T> arg0)
+			throws ServletException {
+		throw new UnsupportedOperationException();
+	}
+
+	public void declareRoles(String... arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public ClassLoader getClassLoader() {
+		throw new UnsupportedOperationException();
+	}
+
+	public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+		throw new UnsupportedOperationException();
+	}
+
+	public int getEffectiveMajorVersion() {
+		throw new UnsupportedOperationException();
+	}
+
+	public int getEffectiveMinorVersion() {
+		throw new UnsupportedOperationException();
+	}
+
+	public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+		throw new UnsupportedOperationException();
+	}
+
+	public FilterRegistration getFilterRegistration(String arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+		throw new UnsupportedOperationException();
+	}
+
+	public JspConfigDescriptor getJspConfigDescriptor() {
+		throw new UnsupportedOperationException();
+	}
+
+	public ServletRegistration getServletRegistration(String arg0) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+		throw new UnsupportedOperationException();
+	}
+
+	public SessionCookieConfig getSessionCookieConfig() {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean setInitParameter(String arg0, String arg1) {
+		throw new UnsupportedOperationException();
+	}
+
+	public void setSessionTrackingModes(Set<SessionTrackingMode> arg0)
+			throws IllegalStateException, IllegalArgumentException {
+		throw new UnsupportedOperationException();
+	}
+
 }

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java

@@ -207,7 +207,7 @@ public class DispatcherServletTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		simpleDispatcherServlet.service(request, response);
 		assertTrue("Not forwarded", response.getForwardedUrl() == null);
-		assertEquals(new Long(98), response.getHeader("Last-Modified"));
+		assertEquals("98", response.getHeader("Last-Modified"));
 	}
 
 	public void testUnknownRequest() throws Exception {
@@ -280,7 +280,7 @@ public class DispatcherServletTests extends TestCase {
 		assertTrue(request.getAttribute("test3") != null);
 		assertTrue(request.getAttribute("test3x") != null);
 		assertTrue(request.getAttribute("test3y") != null);
-		assertEquals(new Long(99), response.getHeader("Last-Modified"));
+		assertEquals("99", response.getHeader("Last-Modified"));
 	}
 
 	public void testExistingMultipartRequest() throws Exception {

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java

@@ -144,7 +144,7 @@ public class CommandControllerTests extends TestCase {
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/ok.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		mc.handleRequest(request, response);
-		assertTrue("Correct expires header", response.getHeader("Expires").equals(new Long(1)));
+		assertTrue("Correct expires header", response.getHeader("Expires").equals("1"));
 		List cacheControl = response.getHeaders("Cache-Control");
 		assertTrue("Correct cache control", cacheControl.contains("no-cache"));
 		assertTrue("Correct cache control", cacheControl.contains("no-store"));
@@ -170,7 +170,7 @@ public class CommandControllerTests extends TestCase {
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/ok.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		mc.handleRequest(request, response);
-		assertTrue("Correct expires header", response.getHeader("Expires").equals(new Long(1)));
+		assertTrue("Correct expires header", response.getHeader("Expires").equals("1"));
 		assertTrue("No cache control", response.getHeader("Cache-Control") == null);
 	}
 
@@ -259,7 +259,7 @@ public class CommandControllerTests extends TestCase {
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/ok.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		mc.handleRequest(request, response);
-		assertTrue("Correct expires header", response.getHeader("Expires").equals(new Long(1)));
+		assertTrue("Correct expires header", response.getHeader("Expires").equals("1"));
 		List cacheControl = response.getHeaders("Cache-Control");
 		assertTrue("Correct cache control", cacheControl.contains("no-cache"));
 		assertTrue("Correct cache control", cacheControl.contains("no-store"));

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java

@@ -146,7 +146,7 @@ public class RequestMappingHandlerAdapterTests {
 	@SuppressWarnings("unchecked")
 	public void setCustomArgumentResolvers() {
 		TestHanderMethodArgumentResolver resolver = new TestHanderMethodArgumentResolver();
-		handlerAdapter.setCustomArgumentResolvers(Arrays.asList(resolver));
+		handlerAdapter.setCustomArgumentResolvers(Arrays.<HandlerMethodArgumentResolver>asList(resolver));
 		handlerAdapter.afterPropertiesSet();
 		
 		HandlerMethodArgumentResolverComposite composite = (HandlerMethodArgumentResolverComposite) 
@@ -170,7 +170,7 @@ public class RequestMappingHandlerAdapterTests {
 	@SuppressWarnings("unchecked")
 	public void setCustomReturnValueHandlers() {
 		TestHandlerMethodReturnValueHandler handler = new TestHandlerMethodReturnValueHandler();
-		handlerAdapter.setCustomReturnValueHandlers(Arrays.asList(handler));
+		handlerAdapter.setCustomReturnValueHandlers(Arrays.<HandlerMethodReturnValueHandler>asList(handler));
 		handlerAdapter.afterPropertiesSet();
 		
 		HandlerMethodReturnValueHandlerComposite composite = (HandlerMethodReturnValueHandlerComposite) 

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolverTests.java

@@ -23,17 +23,20 @@ import static org.easymock.EasyMock.isA;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
+import javax.servlet.http.Part;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
@@ -43,10 +46,13 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.mock.web.MockMultipartHttpServletRequest;
+import org.springframework.mock.web.MockPart;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+import org.springframework.web.bind.ServletRequestBindingException;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -67,31 +73,42 @@ public class RequestPartMethodArgumentResolverTests {
 
 	private HttpMessageConverter<SimpleBean> messageConverter;
 	
-	private MultipartFile multipartFile;
+	private MultipartFile multipartFile1;
+	private MultipartFile multipartFile2;
 
 	private MethodParameter paramRequestPart;
 	private MethodParameter paramNamedRequestPart;
 	private MethodParameter paramValidRequestPart;
 	private MethodParameter paramMultipartFile;
+	private MethodParameter paramMultipartFileList;
 	private MethodParameter paramInt;
+	private MethodParameter paramMultipartFileNotAnnot;
+	private MethodParameter paramServlet30Part;
 
 	private NativeWebRequest webRequest;
 
-	private MockMultipartHttpServletRequest servletRequest;
+	private MockMultipartHttpServletRequest multipartRequest;
 
 	private MockHttpServletResponse servletResponse;
 
 	@SuppressWarnings("unchecked")
 	@Before
 	public void setUp() throws Exception {
-		Method handle = getClass().getMethod("handle", 
-				SimpleBean.class, SimpleBean.class, SimpleBean.class, MultipartFile.class, Integer.TYPE);
-		paramRequestPart = new MethodParameter(handle, 0);
+		
+		Method method = getClass().getMethod("handle", SimpleBean.class, SimpleBean.class, SimpleBean.class,
+				MultipartFile.class, List.class, Integer.TYPE, MultipartFile.class, Part.class);
+		
+		paramRequestPart = new MethodParameter(method, 0);
 		paramRequestPart.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
-		paramNamedRequestPart = new MethodParameter(handle, 1);
-		paramValidRequestPart = new MethodParameter(handle, 2);
-		paramMultipartFile = new MethodParameter(handle, 3);
-		paramInt = new MethodParameter(handle, 4);
+		paramNamedRequestPart = new MethodParameter(method, 1);
+		paramValidRequestPart = new MethodParameter(method, 2);
+		paramMultipartFile = new MethodParameter(method, 3);
+		paramMultipartFileList = new MethodParameter(method, 4);
+		paramInt = new MethodParameter(method, 5);
+		paramMultipartFileNotAnnot = new MethodParameter(method, 6);
+		paramMultipartFileNotAnnot.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
+		paramServlet30Part = new MethodParameter(method, 7);
+		paramServlet30Part.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
 
 		messageConverter = createMock(HttpMessageConverter.class);
 		expect(messageConverter.getSupportedMediaTypes()).andReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
@@ -100,19 +117,64 @@ public class RequestPartMethodArgumentResolverTests {
 		resolver = new RequestPartMethodArgumentResolver(Collections.<HttpMessageConverter<?>>singletonList(messageConverter));
 		reset(messageConverter);
 		
-		multipartFile = new MockMultipartFile("requestPart", "", "text/plain", (byte[]) null);
-		servletRequest = new MockMultipartHttpServletRequest();
-		servletRequest.addFile(multipartFile);
+		multipartFile1 = new MockMultipartFile("requestPart", "", "text/plain", (byte[]) null);
+		multipartFile2 = new MockMultipartFile("requestPart", "", "text/plain", (byte[]) null);
+		multipartRequest = new MockMultipartHttpServletRequest();
+		multipartRequest.addFile(multipartFile1);
+		multipartRequest.addFile(multipartFile2);
 		servletResponse = new MockHttpServletResponse();
-		webRequest = new ServletWebRequest(servletRequest, servletResponse);
+		webRequest = new ServletWebRequest(multipartRequest, servletResponse);
 	}
 
 	@Test
 	public void supportsParameter() {
 		assertTrue("RequestPart parameter not supported", resolver.supportsParameter(paramRequestPart));
+		assertTrue("MultipartFile parameter not supported", resolver.supportsParameter(paramMultipartFileNotAnnot));
+		assertTrue("Part parameter not supported", resolver.supportsParameter(paramServlet30Part));
 		assertFalse("non-RequestPart parameter supported", resolver.supportsParameter(paramInt));
 	}	
-	
+
+	@Test 
+	public void resolveMultipartFile() throws Exception {
+		Object actual = resolver.resolveArgument(paramMultipartFile, null, webRequest, null);
+		assertNotNull(actual);
+		assertSame(multipartFile1, actual);
+	}
+
+	@Test 
+	public void resolveMultipartFileList() throws Exception {
+		Object actual = resolver.resolveArgument(paramMultipartFileList, null, webRequest, null);
+		assertNotNull(actual);
+		assertTrue(actual instanceof List);
+		assertEquals(Arrays.asList(multipartFile1, multipartFile2), actual);
+	}
+
+	@Test
+	public void resolveMultipartFileNotAnnotArgument() throws Exception {
+		MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
+		MultipartFile expected = new MockMultipartFile("multipartFileNotAnnot", "Hello World".getBytes());
+		request.addFile(expected);
+		webRequest = new ServletWebRequest(request);
+
+		Object result = resolver.resolveArgument(paramMultipartFileNotAnnot, null, webRequest, null);
+
+		assertTrue(result instanceof MultipartFile);
+		assertEquals("Invalid result", expected, result);
+	}
+
+	@Test
+	public void resolveServlet30PartArgument() throws Exception {
+		MockPart expected = new MockPart("servlet30Part", "Hello World".getBytes());
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addPart(expected);
+		webRequest = new ServletWebRequest(request);
+
+		Object result = resolver.resolveArgument(paramServlet30Part, null, webRequest, null);
+
+		assertTrue(result instanceof Part);
+		assertEquals("Invalid result", expected, result);
+	}
+
 	@Test
 	public void resolveRequestPart() throws Exception {
 		testResolveArgument(new SimpleBean("foo"), paramRequestPart);
@@ -122,13 +184,6 @@ public class RequestPartMethodArgumentResolverTests {
 	public void resolveNamedRequestPart() throws Exception {
 		testResolveArgument(new SimpleBean("foo"), paramNamedRequestPart);
 	}
-
-	@Test 
-	public void resolveMultipartFile() throws Exception {
-		Object actual = resolver.resolveArgument(paramMultipartFile, null, webRequest, null);
-		assertNotNull(actual);
-		assertSame(multipartFile, actual);
-	}
 	
 	@Test
 	public void resolveRequestPartNotValid() throws Exception {
@@ -144,12 +199,27 @@ public class RequestPartMethodArgumentResolverTests {
 	
 	@Test
 	public void resolveRequestPartValid() throws Exception {
-		testResolveArgument(new SimpleBean("foo"), paramValidRequestPart);
+		testResolveArgument(new SimpleBean("foo"), paramNamedRequestPart);
 	}
 	
+	@Test
+	public void resolveRequestPartRequired() throws Exception {
+		try {
+			testResolveArgument(null, paramValidRequestPart);
+			fail("Expected exception");
+		} catch (ServletRequestBindingException e) {
+			assertTrue(e.getMessage().contains("Missing request part"));
+		}
+	}
+
+	@Test
+	public void resolveRequestPartNotRequired() throws Exception {
+		testResolveArgument(new SimpleBean("foo"), paramValidRequestPart);
+	}
+
 	private void testResolveArgument(SimpleBean expectedValue, MethodParameter parameter) throws IOException, Exception {
 		MediaType contentType = MediaType.TEXT_PLAIN;
-		servletRequest.addHeader("Content-Type", contentType.toString());
+		multipartRequest.addHeader("Content-Type", contentType.toString());
 
 		expect(messageConverter.canRead(SimpleBean.class, contentType)).andReturn(true);
 		expect(messageConverter.read(eq(SimpleBean.class), isA(RequestPartServletServerHttpRequest.class))).andReturn(expectedValue);
@@ -164,13 +234,6 @@ public class RequestPartMethodArgumentResolverTests {
 		verify(messageConverter);
 	}	
 
-	public void handle(@RequestPart SimpleBean requestPart, 
-					   @RequestPart("requestPart") SimpleBean namedRequestPart, 
-					   @Valid @RequestPart("requestPart") SimpleBean validRequestPart, 
-					   @RequestPart("requestPart") MultipartFile multipartFile,
-					   int i) {
-	}
-
 	private static class SimpleBean {
 
 		@NotNull
@@ -195,5 +258,15 @@ public class RequestPartMethodArgumentResolverTests {
 			return dataBinder;
 		}
 	}
-	
+
+	public void handle(@RequestPart SimpleBean requestPart, 
+					   @RequestPart(value="requestPart", required=false) SimpleBean namedRequestPart, 
+					   @Valid @RequestPart("requestPart") SimpleBean validRequestPart, 
+					   @RequestPart("requestPart") MultipartFile multipartFile,
+					   @RequestPart("requestPart") List<MultipartFile> multipartFileList,
+					   int i,
+					   MultipartFile multipartFileNotAnnot,
+					   Part servlet30Part) {
+	}
+
 }

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java

@@ -60,10 +60,11 @@ public class ResourceHttpRequestHandlerTests {
 		handler.handleRequest(request, response);
 		assertEquals("text/css", response.getContentType());
 		assertEquals(17, response.getContentLength());
-		assertTrue(((Long)response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
+		assertTrue(Long.valueOf(response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
 		assertEquals("max-age=3600, must-revalidate", response.getHeader("Cache-Control"));
 		assertTrue(response.containsHeader("Last-Modified"));
-		assertEquals(response.getHeader("Last-Modified"), new ClassPathResource("test/foo.css", getClass()).getFile().lastModified());
+		assertEquals(Long.valueOf(response.getHeader("Last-Modified")).longValue(), 
+				new ClassPathResource("test/foo.css", getClass()).getFile().lastModified());
 		assertEquals("h1 { color:red; }", response.getContentAsString());
 	}
 	
@@ -75,10 +76,11 @@ public class ResourceHttpRequestHandlerTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		handler.handleRequest(request, response);
 		assertEquals("text/html", response.getContentType());
-		assertTrue(((Long)response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
+		assertTrue(Long.valueOf(response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
 		assertEquals("max-age=3600, must-revalidate", response.getHeader("Cache-Control"));
 		assertTrue(response.containsHeader("Last-Modified"));
-		assertEquals(response.getHeader("Last-Modified"), new ClassPathResource("test/foo.html", getClass()).getFile().lastModified());
+		assertEquals(Long.valueOf(response.getHeader("Last-Modified")).longValue(), 
+				new ClassPathResource("test/foo.html", getClass()).getFile().lastModified());
 	}
 	
 	@Test
@@ -90,10 +92,11 @@ public class ResourceHttpRequestHandlerTests {
 		handler.handleRequest(request, response);
 		assertEquals("text/css", response.getContentType());
 		assertEquals(17, response.getContentLength());
-		assertTrue(((Long)response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
+		assertTrue(Long.valueOf(response.getHeader("Expires")) >= System.currentTimeMillis() - 1000 + (3600 * 1000));
 		assertEquals("max-age=3600, must-revalidate", response.getHeader("Cache-Control"));
 		assertTrue(response.containsHeader("Last-Modified"));
-		assertEquals(response.getHeader("Last-Modified"), new ClassPathResource("testalternatepath/baz.css", getClass()).getFile().lastModified());
+		assertEquals(Long.valueOf(response.getHeader("Last-Modified")).longValue(), 
+				new ClassPathResource("testalternatepath/baz.css", getClass()).getFile().lastModified());
 		assertEquals("h1 { color:red; }", response.getContentAsString());
 	}