Merge branch 'develop'

LianjiaTech · Jan 4, 2021 · 38d7095 · 38d7095
2 parents 4ba44ed + 2c9bd25
commit 38d7095
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -708,6 +708,7 @@ retrofit:
 - [Wire](https://github.com/square/wire): com.squareup.Retrofit:converter-wire
 - [Simple XML](http://simple.sourceforge.net/): com.squareup.Retrofit:converter-simplexml
 - [JAXB](https://docs.oracle.com/javase/tutorial/jaxb/intro/index.html): com.squareup.retrofit2:converter-jaxb
+- fastJson：com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory
 
 `retrofit-spring-boot-starter`支持通过`retrofit.global-converter-factories`配置全局数据转换器工厂，转换器工厂实例优先从Spring容器获取，如果没有获取到，则反射创建。默认的全局数据转换器工厂是`retrofit2.converter.jackson.JacksonConverterFactory`，你可以直接通过`spring.jackson.*`配置`jackson`序列化规则，配置可参考[Customize the Jackson ObjectMapper](https://docs.spring.io/spring-boot/docs/2.1.5.RELEASE/reference/htmlsingle/#howto-customize-the-jackson-objectmapper)！
 

diff --git a/README_EN.md b/README_EN.md
@@ -696,6 +696,7 @@ For each Java interface, you can also specify the `CallAdapter.Factory` used by
 - [Wire](https://github.com/square/wire): com.squareup.Retrofit:converter-wire
 - [Simple XML](http://simple.sourceforge.net/): com.squareup.Retrofit:converter-simplexml
 - [JAXB](https://docs.oracle.com/javase/tutorial/jaxb/intro/index.html): com.squareup.retrofit2:converter-jaxb
+- fastJson：com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory
 
 `retrofit-spring-boot-starter` supports configuring the global `converter factory` through `retrofit.global-converter-factories`. The converter factory instance is first obtained from the Spring container. If it is not obtained, it is created by reflection. The default global data converter factory is `retrofit2.converter.jackson.JacksonConverterFactory`, you can directly configure the `jackson` serialization rules through `spring.jackson.*`, please refer to [Customize the Jackson ObjectMapper](https://docs.spring.io/spring-boot/docs/2.1.5.RELEASE/reference/htmlsingle/#howto-customize-the-jackson-objectmapper)
 

diff --git a/src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/RetrofitStarterTest.java b/src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/RetrofitStarterTest.java
@@ -1,6 +1,7 @@
 package com.github.lianjiatech.retrofit.spring.boot.test;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.lianjiatech.retrofit.spring.boot.test.entity.Person;
@@ -304,5 +305,25 @@ public void testNoBaseUrl() throws IOException {
 
     }
 
+    @Test
+    public void testMap() throws IOException {
+
+        Map<String, Map<String, String>> map = new HashMap<>(4);
+        Map<String, String> test = new HashMap<>(4);
+        test.put("a", "aa");
+        test.put("b", "bb");
+        map.put("test", test);
+
+        MockResponse response = new MockResponse()
+                .setResponseCode(200)
+                .addHeader("Content-Type", "application/json; charset=utf-8")
+                .addHeader("Cache-Control", "no-cache")
+                .setBody(objectMapper.writeValueAsString(map));
+        server.enqueue(response);
+
+        Map<String, Map<String, String>> stringMapMap = httpApi2.testMap();
+        System.out.println(stringMapMap);
+    }
+
 
 }
diff --git a/src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/http/HttpApi2.java b/src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/http/HttpApi2.java
@@ -10,6 +10,8 @@
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
+import java.util.Map;
+
 /**
  * @author 陈添明
  */
@@ -26,4 +28,8 @@ public interface HttpApi2 {
      */
     @GET("person")
     Result<Person> getPerson(@Query("id") Long id);
+
+
+    @GET("testMap")
+    Map<String, Map<String, String>> testMap();
 }