diff --git a/http-service/src/main/java/net/runelite/http/service/CustomConfiguration.java b/http-service/src/main/java/net/runelite/http/service/CustomConfiguration.java deleted file mode 100644 index 0c50980f4c..0000000000 --- a/http-service/src/main/java/net/runelite/http/service/CustomConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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 com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import java.util.List; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.GsonHttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.client.RestTemplate; - -@Configuration -public class CustomConfiguration -{ - @Bean - public HttpMessageConverters customConverters() - { - Gson gson = new GsonBuilder() - .setPrettyPrinting() - .create(); - - GsonHttpMessageConverter gsonHttpMessageConverter = new GsonHttpMessageConverter(); - gsonHttpMessageConverter.setGson(gson); - - // normally you can simply exclude jackson from the classpath to cause - // Spring to use gson, but minio also depends on jackson - List> converters = new RestTemplate().getMessageConverters(); - converters.removeIf(converter -> converter.getClass() == MappingJackson2HttpMessageConverter.class); - converters.add(gsonHttpMessageConverter); - - return new HttpMessageConverters(false, converters); - } -} diff --git a/http-service/src/test/resources/application.properties b/http-service/src/test/resources/application.properties index 6c9bc73c2f..cb3dcc0507 100644 --- a/http-service/src/test/resources/application.properties +++ b/http-service/src/test/resources/application.properties @@ -8,3 +8,4 @@ runelite.twitter.consumerkey=moo runelite.twitter.secretkey=cow runelite.twitter.listid=968949795153948673 logging.level.net.runelite=DEBUG +spring.jackson.serialization.indent_output=true \ No newline at end of file