Browse Source

StringHttpMessageConverter defaults to UTF-8 for JSON

Issue: SPR-17568
pull/2050/head
Rossen Stoyanchev 6 years ago
parent
commit
05d616240a
  1. 4
      spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java

4
spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java

@ -126,6 +126,10 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
if (contentType != null && contentType.getCharset() != null) { if (contentType != null && contentType.getCharset() != null) {
return contentType.getCharset(); return contentType.getCharset();
} }
else if (contentType != null && contentType.isCompatibleWith(MediaType.APPLICATION_JSON)) {
// Matching to AbstractJackson2HttpMessageConverter#DEFAULT_CHARSET
return StandardCharsets.UTF_8;
}
else { else {
Charset charset = getDefaultCharset(); Charset charset = getDefaultCharset();
Assert.state(charset != null, "No default charset"); Assert.state(charset != null, "No default charset");

Loading…
Cancel
Save