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

MockHttpServletRequestBuilder reliably detects form body content type again

Browse Source 
Issue: SPR-15116
(cherry picked from commit e88e8f1)
This commit is contained in:
Juergen Hoeller
2017-01-16 11:49:07 +01:00
parent 7f127300f9
commit cce84711c6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
View File

@@ -70,6 +70,7 @@ import org.springframework.web.util.UriUtils;
* {@code MockHttpServletRequest} can be plugged in via {@link #with(RequestPostProcessor)}.
*
* @author Rossen Stoyanchev
* @author Juergen Hoeller
* @author Arjen Poutsma
* @author Sam Brannen
* @author Kamill Sokol
@@ -633,10 +634,13 @@ public class MockHttpServletRequestBuilder
}
}
if (this.content != null && this.contentType != null) {
MediaType mediaType = MediaType.parseMediaType(this.contentType);
if (MediaType.APPLICATION_FORM_URLENCODED.includes(mediaType)) {
addRequestParams(request, parseFormData(mediaType));
if (this.content != null && this.content.length > 0) {
String requestContentType = request.getContentType();
if (requestContentType != null) {
MediaType mediaType = MediaType.parseMediaType(requestContentType);
if (MediaType.APPLICATION_FORM_URLENCODED.includes(mediaType)) {
addRequestParams(request, parseFormData(mediaType));
}
}
}