6186314dbc
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.
66 lines
2.8 KiB
Java
66 lines
2.8 KiB
Java
/*
|
|
* Copyright (c) 2018, Adam <Adam@sigterm.info>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
package net.runelite.http.service;
|
|
|
|
import java.util.List;
|
|
import net.runelite.http.api.RuneLiteAPI;
|
|
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;
|
|
|
|
@Configuration
|
|
@EnableWebMvc
|
|
public class SpringWebMvcConfigurer extends WebMvcConfigurerAdapter
|
|
{
|
|
/**
|
|
* Configure .js as application/json to trick Cloudflare into caching json responses
|
|
*/
|
|
@Override
|
|
public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
|
|
{
|
|
configurer.mediaType("js", MediaType.APPLICATION_JSON);
|
|
}
|
|
|
|
/**
|
|
* Use GSON instead of Jackson for JSON serialization
|
|
* @param converters
|
|
*/
|
|
@Override
|
|
public void extendMessageConverters(List<HttpMessageConverter<?>> 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);
|
|
}
|
|
}
|