Declare protected getCharset method as non-static

See gh-25509
This commit is contained in:
Juergen Hoeller 2020-09-08 12:22:25 +02:00
parent d616c6632d
commit ae1d15c8f4
1 changed files with 3 additions and 3 deletions

View File

@ -286,14 +286,14 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
}
/**
* Return the charset to use for JSON input.
* Determine the charset to use for JSON input.
* <p>By default this is either the charset from the input {@code MediaType}
* or otherwise falling back on {@code UTF-8}.
* or otherwise falling back on {@code UTF-8}. Can be overridden in subclasses.
* @param contentType the content type of the HTTP input message
* @return the charset to use
* @since 5.1.18
*/
protected static Charset getCharset(@Nullable MediaType contentType) {
protected Charset getCharset(@Nullable MediaType contentType) {
if (contentType != null && contentType.getCharset() != null) {
return contentType.getCharset();
}