From ae1d15c8f4d10d21e9cb9abc42a95e9584683fef Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 8 Sep 2020 12:22:25 +0200 Subject: [PATCH] Declare protected getCharset method as non-static See gh-25509 --- .../json/AbstractJackson2HttpMessageConverter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java index 78ca9fb8d3..9799165a5f 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java @@ -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. *

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(); }