From 6186314dbc81abe94f0fdd24049b2e2c110154bd Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 18 Feb 2019 16:39:34 -0500 Subject: [PATCH] http service: fix overwriting all default message converters The previous change to try and force GSON for serialization broke default message converters such as text/plain. Change to use extendMessageConverters and remove the Jackson converter instead. --- .../net/runelite/http/service/SpringWebMvcConfigurer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/http-service/src/main/java/net/runelite/http/service/SpringWebMvcConfigurer.java b/http-service/src/main/java/net/runelite/http/service/SpringWebMvcConfigurer.java index f0fd4ed99c..704e4f9cb2 100644 --- a/http-service/src/main/java/net/runelite/http/service/SpringWebMvcConfigurer.java +++ b/http-service/src/main/java/net/runelite/http/service/SpringWebMvcConfigurer.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.GsonHttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @@ -52,8 +53,11 @@ public class SpringWebMvcConfigurer extends WebMvcConfigurerAdapter * @param converters */ @Override - public void configureMessageConverters(List> converters) + public void extendMessageConverters(List> converters) { + // Could not figure out a better way to force GSON + converters.removeIf(MappingJackson2HttpMessageConverter.class::isInstance); + GsonHttpMessageConverter gsonHttpMessageConverter = new GsonHttpMessageConverter(); gsonHttpMessageConverter.setGson(RuneLiteAPI.GSON); converters.add(gsonHttpMessageConverter);