fix BasicTypeConverterFactory priority bug

chentianming11 · chentianming11 · commit 2bd57b85e188 · 2022-07-04T17:13:02.000+08:00
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ gitee项目地址：[https://gitee.com/lianjiatech/retrofit-spring-boot-starter]
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.5</version>
+   <version>2.3.6</version>
 </dependency>
 ```
 
@@ -60,7 +60,7 @@ gitee项目地址：[https://gitee.com/lianjiatech/retrofit-spring-boot-starter]
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.5</version>
+   <version>2.3.6</version>
 </dependency>
  <dependency>
     <groupId>com.squareup.okhttp3</groupId>
@@ -148,8 +148,9 @@ public class TestService {
 
 ```yaml
 retrofit:
-   # 全局转换器工厂(组件扩展的转换器工厂已经内置，这里请勿重复配置)
+   # 全局转换器工厂
    global-converter-factories:
+      - com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory
       - retrofit2.converter.jackson.JacksonConverterFactory
    # 全局调用适配器工厂(组件扩展的调用适配器工厂已经内置，这里请勿重复配置)
    global-call-adapter-factories:
@@ -775,8 +776,9 @@ retrofit:
 
 ```yaml
 retrofit:
-   # 全局转换器工厂(组件扩展的转换器工厂已经内置，这里请勿重复配置)
+   # 全局转换器工厂
    global-converter-factories:
+      - com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory
       - retrofit2.converter.jackson.JacksonConverterFactory
 ```
 
diff --git a/README_EN.md b/README_EN.md
@@ -37,7 +37,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.5</version>
+   <version>2.3.6</version>
 </dependency>
 ```
 
@@ -47,7 +47,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.5</version>
+   <version>2.3.6</version>
 </dependency>
  <dependency>
     <groupId>com.squareup.okhttp3</groupId>
@@ -137,6 +137,7 @@ The component supports multiple configurable properties to deal with different b
 ```yaml
 retrofit:
    global-converter-factories:
+      - com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory
       - retrofit2.converter.jackson.JacksonConverterFactory
    global-call-adapter-factories:
    global-log:
@@ -721,8 +722,8 @@ If you need to modify the `Jackson` configuration, you can override the `bean` c
 
 ```yaml
 retrofit:
-   # The `Converter.Factory` of the component extension has been built in, please do not repeat the configuration here
    global-converter-factories:
+      - com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory
       - retrofit2.converter.jackson.JacksonConverterFactory
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>
diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -60,6 +61,11 @@ public static PathMatchInterceptorBdfProcessor prototypeInterceptorBdfProcessor(
         }
     }
 
+    @Bean
+    public BasicTypeConverterFactory basicTypeConverterFactory() {
+        return BasicTypeConverterFactory.INSTANCE;
+    }
+
     @Bean
     @ConditionalOnMissingBean
     public SourceOkHttpClientRegistry sourceOkHttpClientRegistry(
diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitProperties.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitProperties.java
@@ -1,5 +1,6 @@
 package com.github.lianjiatech.retrofit.spring.boot.config;
 
+import com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
@@ -47,7 +48,8 @@ public class RetrofitProperties {
      */
     @SuppressWarnings("unchecked")
     private Class<? extends Converter.Factory>[] globalConverterFactories =
-            (Class<? extends Converter.Factory>[])new Class[] {JacksonConverterFactory.class};
+            (Class<? extends Converter.Factory>[])new Class[] {BasicTypeConverterFactory.class,
+                JacksonConverterFactory.class};
 
     /**
      * 全局调用适配器工厂，转换器实例优先从Spring容器获取，如果没有获取到，则反射创建。
diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/RetrofitFactoryBean.java
@@ -171,7 +171,6 @@ private Retrofit createRetrofit() {
         retrofitBuilder.addCallAdapterFactory(ResponseCallAdapterFactory.INSTANCE);
         retrofitBuilder.addCallAdapterFactory(BodyCallAdapterFactory.INSTANCE);
 
-        retrofitBuilder.addConverterFactory(BasicTypeConverterFactory.INSTANCE);
         combineAndCreate(retrofitClient.converterFactories(), retrofitConfigBean.getGlobalConverterFactoryClasses())
                 .forEach(retrofitBuilder::addConverterFactory);
 
@@ -182,7 +181,7 @@ private void addReactiveCallAdapterFactory(Retrofit.Builder retrofitBuilder) {
         if (reactor3ClassExist()) {
             retrofitBuilder.addCallAdapterFactory(MonoCallAdapterFactory.INSTANCE);
         }
-        if (rxjava2CalssExist()) {
+        if (rxjava2ClassExist()) {
             retrofitBuilder.addCallAdapterFactory(Rxjava2SingleCallAdapterFactory.INSTANCE);
             retrofitBuilder.addCallAdapterFactory(Rxjava2CompletableCallAdapterFactory.INSTANCE);
         }
@@ -201,7 +200,7 @@ private boolean rxjava3ClassExist() {
         }
     }
 
-    private boolean rxjava2CalssExist() {
+    private boolean rxjava2ClassExist() {
         try {
             Class.forName("io.reactivex.Single");
             return true;
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
@@ -57,12 +57,6 @@ public class RetrofitStarterTest {
     @Autowired
     private HttpApi3 httpApi3;
 
-    @Autowired
-    private InterceptApi interceptApi;
-
-    @Autowired
-    private DownloadApi downloadApi;
-
     private static final ObjectMapper objectMapper =
             new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                     .setSerializationInclusion(JsonInclude.Include.NON_NULL);
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -1,7 +1,8 @@
 
 retrofit:
-  # 全局转换器工厂(组件扩展的转换器工厂已经内置，这里请勿重复配置)
+  # 全局转换器工厂
   global-converter-factories:
+    - com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory
     - retrofit2.converter.jackson.JacksonConverterFactory
   # 全局调用适配器工厂(组件扩展的调用适配器工厂已经内置，这里请勿重复配置)
   global-call-adapter-factories:

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ private Retrofit createRetrofit() {`
`171`	`171`	`retrofitBuilder.addCallAdapterFactory(ResponseCallAdapterFactory.INSTANCE);`
`172`	`172`	`retrofitBuilder.addCallAdapterFactory(BodyCallAdapterFactory.INSTANCE);`
`173`	`173`
`174`		`- retrofitBuilder.addConverterFactory(BasicTypeConverterFactory.INSTANCE);`
`175`	`174`	`combineAndCreate(retrofitClient.converterFactories(), retrofitConfigBean.getGlobalConverterFactoryClasses())`
`176`	`175`	`.forEach(retrofitBuilder::addConverterFactory);`
`177`	`176`
`@@ -182,7 +181,7 @@ private void addReactiveCallAdapterFactory(Retrofit.Builder retrofitBuilder) {`
`182`	`181`	`if (reactor3ClassExist()) {`
`183`	`182`	`retrofitBuilder.addCallAdapterFactory(MonoCallAdapterFactory.INSTANCE);`
`184`	`183`	`}`
`185`		`- if (rxjava2CalssExist()) {`
	`184`	`+ if (rxjava2ClassExist()) {`
`186`	`185`	`retrofitBuilder.addCallAdapterFactory(Rxjava2SingleCallAdapterFactory.INSTANCE);`
`187`	`186`	`retrofitBuilder.addCallAdapterFactory(Rxjava2CompletableCallAdapterFactory.INSTANCE);`
`188`	`187`	`}`
`@@ -201,7 +200,7 @@ private boolean rxjava3ClassExist() {`
`201`	`200`	`}`
`202`	`201`	`}`
`203`	`202`
`204`		`- private boolean rxjava2CalssExist() {`
	`203`	`+ private boolean rxjava2ClassExist() {`
`205`	`204`	`try {`
`206`	`205`	`Class.forName("io.reactivex.Single");`
`207`	`206`	`return true;`