Merge branch '5.3.x'

# Conflicts:
#	spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java

Author: sbrannen

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java

@@ -64,7 +64,16 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 	 * @param uriVariables zero or more URI variables
 	 */
 	MockMultipartHttpServletRequestBuilder(String urlTemplate, Object... uriVariables) {
-		super(HttpMethod.POST, urlTemplate, uriVariables);
+		this(HttpMethod.POST, urlTemplate, uriVariables);
+	}
+
+	/**
+	 * Variant of {@link #MockMultipartHttpServletRequestBuilder(String, Object...)}
+	 * that also accepts an {@link HttpMethod}.
+	 * @since 5.3.22
+	 */
+	MockMultipartHttpServletRequestBuilder(HttpMethod httpMethod, String urlTemplate, Object... uriVariables) {
+		super(httpMethod, urlTemplate, uriVariables);
 		super.contentType(MediaType.MULTIPART_FORM_DATA);
 	}
 
@@ -74,8 +83,7 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 	 * @since 4.0.3
 	 */
 	MockMultipartHttpServletRequestBuilder(URI uri) {
-		super(HttpMethod.POST, uri);
-		super.contentType(MediaType.MULTIPART_FORM_DATA);
+		this(HttpMethod.POST, uri);
 	}
 
 	/**

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java

@@ -50,10 +50,10 @@ public abstract class MockMvcRequestBuilders {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a GET request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -68,10 +68,10 @@ public static MockHttpServletRequestBuilder get(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a POST request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -86,10 +86,10 @@ public static MockHttpServletRequestBuilder post(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a PUT request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -104,10 +104,10 @@ public static MockHttpServletRequestBuilder put(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a PATCH request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -122,10 +122,10 @@ public static MockHttpServletRequestBuilder patch(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a DELETE request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -140,10 +140,10 @@ public static MockHttpServletRequestBuilder delete(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for an OPTIONS request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -158,11 +158,11 @@ public static MockHttpServletRequestBuilder options(URI uri) {
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a HEAD request.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 * @since 4.1
 	 */
-	public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -178,10 +178,10 @@ public static MockHttpServletRequestBuilder head(URI uri) {
 	 * Create a {@link MockHttpServletRequestBuilder} for a request with the given HTTP method.
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 */
-	public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVars) {
-		return new MockHttpServletRequestBuilder(method, urlTemplate, uriVars);
+	public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVariables) {
+		return new MockHttpServletRequestBuilder(method, urlTemplate, uriVariables);
 	}
 
 	/**
@@ -205,13 +205,26 @@ public static MockHttpServletRequestBuilder request(String httpMethod, URI uri)
 	}
 
 	/**
-	 * Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
+	 * Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request,
+	 * using POST as the HTTP method.
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
+	 * @param uriVariables zero or more URI variables
 	 * @since 5.0
 	 */
-	public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... uriVars) {
-		return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
+	public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... uriVariables) {
+		return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVariables);
+	}
+
+	/**
+	 * Variant of {@link #multipart(String, Object...)} that also accepts an
+	 * {@link HttpMethod}.
+	 * @param httpMethod the HTTP method to use
+	 * @param urlTemplate a URL template; the resulting URL will be encoded
+	 * @param uriVariables zero or more URI variables
+	 * @since 5.3.22
+	 */
+	public static MockMultipartHttpServletRequestBuilder multipart(HttpMethod httpMethod, String urlTemplate, Object... uriVariables) {
+		return new MockMultipartHttpServletRequestBuilder(httpMethod, urlTemplate, uriVariables);
 	}
 
 	/**