From 416a24c6bc0a9453ad5b8a20eb4f33d47da2eb92 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 (cherry picked from commit 96875fe) --- .../json/AbstractJackson2HttpMessageConverter.java | 4 +--- .../http/converter/json/GsonHttpMessageConverter.java | 8 +++----- 2 files changed, 4 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 a98222d4e92..2bad6fc4407 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 @@ -37,7 +37,6 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; import org.springframework.http.converter.AbstractGenericHttpMessageConverter; -import org.springframework.http.converter.GenericHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; @@ -58,8 +57,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"); 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 1cfe37ead3c..38f7f432899 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; import org.springframework.http.converter.AbstractGenericHttpMessageConverter; -import org.springframework.http.converter.GenericHttpMessageConverter; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.util.Assert; @@ -48,15 +47,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");