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

BufferedImage converter writes Content-Type again

Browse Source 
Issue: SPR-13906
This commit is contained in:
Rossen Stoyanchev
2016-02-04 14:59:13 -05:00
parent e90310612f
commit b49235ac59
3 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
View File

@@ -38,7 +38,6 @@ import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.MemoryCacheImageInputStream;
import javax.imageio.stream.MemoryCacheImageOutputStream;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpOutputMessage;
import org.springframework.http.MediaType;
@@ -209,29 +208,35 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
final HttpOutputMessage outputMessage)
throws IOException, HttpMessageNotWritableException {
final MediaType selectedContentType = getContentType(contentType);
outputMessage.getHeaders().setContentType(selectedContentType);
if (outputMessage instanceof StreamingHttpOutputMessage) {
StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
streamingOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
@Override
public void writeTo(OutputStream outputStream) throws IOException {
writeInternal(image, contentType, outputMessage.getHeaders(), outputStream);
writeInternal(image, selectedContentType, outputStream);
}
});
}
else {
writeInternal(image, contentType, outputMessage.getHeaders(), outputMessage.getBody());
writeInternal(image, selectedContentType, outputMessage.getBody());
}
}
private void writeInternal(BufferedImage image, MediaType contentType, HttpHeaders headers,
OutputStream body) throws IOException, HttpMessageNotWritableException {
private MediaType getContentType(MediaType contentType) {
if (contentType == null || contentType.isWildcardType() || contentType.isWildcardSubtype()) {
contentType = getDefaultContentType();
}
Assert.notNull(contentType,
"Count not determine Content-Type, set one using the 'defaultContentType' property");
headers.setContentType(contentType);
Assert.notNull(contentType, "Could not select Content-Type. " +
"Please specify one through the 'defaultContentType' property.");
return contentType;
}
private void writeInternal(BufferedImage image, MediaType contentType, OutputStream body)
throws IOException, HttpMessageNotWritableException {
ImageOutputStream imageOutputStream = null;
ImageWriter imageWriter = null;
try {