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

Ensure filename is written 

Now that SPR-16307 makes it possible to write a part with a Publisher
we need to ensure we get the filename correctly when writing with
Publisher<Resource>.

Issue: SPR-16376
This commit is contained in:
Rossen Stoyanchev 2018-01-19 22:12:53 -05:00
parent aea6bb6357
commit 283811b16b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
View File

@ -252,8 +252,17 @@ public class MultipartHttpMessageWriter implements HttpMessageWriter<MultiValueM
resolvableType = ResolvableType.forClass(body.getClass()); resolvableType = ResolvableType.forClass(body.getClass());
} }
String filename = (body instanceof Resource ? ((Resource) body).getFilename() : null); if (body instanceof Resource) {
outputMessage.getHeaders().setContentDispositionFormData(name, filename); outputMessage.getHeaders().setContentDispositionFormData(name, ((Resource) body).getFilename());
}
else if (Resource.class.equals(resolvableType.getRawClass())) {
body = (T) Mono.from((Publisher<?>) body).doOnNext(o -> {
outputMessage.getHeaders().setContentDispositionFormData(name, ((Resource) o).getFilename());
});
}
else {
outputMessage.getHeaders().setContentDispositionFormData(name, null);
}
MediaType contentType = outputMessage.getHeaders().getContentType(); MediaType contentType = outputMessage.getHeaders().getContentType();

5
spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
View File

@ -170,9 +170,8 @@ public class MultipartHttpMessageWriterTests {
Part part = requestParts.getFirst("logo"); Part part = requestParts.getFirst("logo");
assertEquals("logo", part.name()); assertEquals("logo", part.name());
// TODO: a Resource written as an async part doesn't have a file name in the contentDisposition assertTrue(part instanceof FilePart);
// assertTrue(part instanceof FilePart); assertEquals("logo.jpg", ((FilePart) part).filename());
// assertEquals("logo.jpg", ((FilePart) part).filename());
assertEquals(MediaType.IMAGE_JPEG, part.headers().getContentType()); assertEquals(MediaType.IMAGE_JPEG, part.headers().getContentType());
assertEquals(logo.getFile().length(), part.headers().getContentLength()); assertEquals(logo.getFile().length(), part.headers().getContentLength());
} }