From 96875fe015dbd050d40bab1a85e960e693a3aa70 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 13 Apr 2016 18:52:52 +0200 Subject: [PATCH] Avoid unnecessary GenericHttpMessageConverter re-declaration --- .../json/AbstractJackson2HttpMessageConverter.java | 9 ++++----- .../http/converter/json/GsonHttpMessageConverter.java | 5 ++--- 2 files changed, 6 insertions(+), 8 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 8df7454d70..a2971598f6 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 @@ -58,8 +58,7 @@ import org.springframework.util.TypeUtils; * @author Sebastien Deleuze * @since 4.1 */ -public abstract class AbstractJackson2HttpMessageConverter extends AbstractGenericHttpMessageConverter - implements GenericHttpMessageConverter { +public abstract class AbstractJackson2HttpMessageConverter extends AbstractGenericHttpMessageConverter { public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); @@ -71,19 +70,19 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper) { this.objectMapper = objectMapper; - this.setDefaultCharset(DEFAULT_CHARSET); + setDefaultCharset(DEFAULT_CHARSET); } protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper, MediaType supportedMediaType) { super(supportedMediaType); this.objectMapper = objectMapper; - this.setDefaultCharset(DEFAULT_CHARSET); + setDefaultCharset(DEFAULT_CHARSET); } protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper, MediaType... supportedMediaTypes) { super(supportedMediaTypes); this.objectMapper = objectMapper; - this.setDefaultCharset(DEFAULT_CHARSET); + setDefaultCharset(DEFAULT_CHARSET); } diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java index e917d26d9e..a2ca8c488c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java @@ -48,15 +48,14 @@ import org.springframework.util.Assert; * By default, it supports {@code application/json} and {@code application/*+json} with * {@code UTF-8} character set. * - *

Tested against Gson 2.3; compatible with Gson 2.0 and higher. + *

Tested against Gson 2.6; compatible with Gson 2.0 and higher. * * @author Roy Clarkson * @since 4.1 * @see #setGson * @see #setSupportedMediaTypes */ -public class GsonHttpMessageConverter extends AbstractGenericHttpMessageConverter - implements GenericHttpMessageConverter { +public class GsonHttpMessageConverter extends AbstractGenericHttpMessageConverter { public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");