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

Fix issue where FormHttpMessageConverter fails to write multipart data 

FormHttpMessageConverter incorrectly determines that the media type
"multipart/form-data; charset=utf-8" is not multipart. This commit
allows the media type to contain a charset parameter.
This commit is contained in:
Roy Clarkson 2014-12-02 00:24:11 -06:00 committed by Rossen Stoyanchev
parent 7aa5e65235
commit 83ecf5ca1d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
View File

@ -244,7 +244,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
private boolean isMultipart(MultiValueMap<String, ?> map, MediaType contentType) { private boolean isMultipart(MultiValueMap<String, ?> map, MediaType contentType) {
if (contentType != null) { if (contentType != null) {
return MediaType.MULTIPART_FORM_DATA.equals(contentType); return MediaType.MULTIPART_FORM_DATA.includes(contentType);
} }
for (String name : map.keySet()) { for (String name : map.keySet()) {
for (Object value : map.get(name)) { for (Object value : map.get(name)) {

3
spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
View File

@ -69,6 +69,7 @@ public class FormHttpMessageConverterTests {
public void canWrite() { public void canWrite() {
assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded"))); assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded")));
assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("multipart", "form-data"))); assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("multipart", "form-data")));
assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("multipart", "form-data", Charset.forName("UTF-8"))));
assertTrue(converter.canWrite(MultiValueMap.class, MediaType.ALL)); assertTrue(converter.canWrite(MultiValueMap.class, MediaType.ALL));
} }
@ -135,7 +136,7 @@ public class FormHttpMessageConverterTests {
MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
converter.setMultipartCharset(Charset.forName("UTF-8")); converter.setMultipartCharset(Charset.forName("UTF-8"));
converter.write(parts, MediaType.MULTIPART_FORM_DATA, outputMessage); converter.write(parts, new MediaType("multipart", "form-data", Charset.forName("UTF-8")), outputMessage);
final MediaType contentType = outputMessage.getHeaders().getContentType(); final MediaType contentType = outputMessage.getHeaders().getContentType();
assertNotNull("No boundary found", contentType.getParameter("boundary")); assertNotNull("No boundary found", contentType.getParameter("boundary"));