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

Ensure filename is written

Browse Source 
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
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());
}
String filename = (body instanceof Resource ? ((Resource) body).getFilename() : null);
outputMessage.getHeaders().setContentDispositionFormData(name, filename);
if (body instanceof Resource) {
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();