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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
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} * <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 * @param contentType the content type of the HTTP input message
* @return the charset to use * @return the charset to use
* @since 5.1.18 * @since 5.1.18
*/ */
protected static Charset getCharset(@Nullable MediaType contentType) { protected Charset getCharset(@Nullable MediaType contentType) {
if (contentType != null && contentType.getCharset() != null) { if (contentType != null && contentType.getCharset() != null) {
return contentType.getCharset(); return contentType.getCharset();
} }