1.4.9

tuya · Aug 27, 2024 · 19b1841 · 19b1841
1 parent 7bbe32e
commit 19b1841
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/connector-api/pom.xml b/connector-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-api</artifactId>

diff --git a/connector-api/src/main/java/com/tuya/connector/api/config/ApiDataSource.java b/connector-api/src/main/java/com/tuya/connector/api/config/ApiDataSource.java
@@ -9,6 +9,7 @@
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import okhttp3.OkHttpClient;
+import retrofit2.Converter;
 
 import java.util.Objects;
 
@@ -132,5 +133,5 @@ public ApiDataSource(String baseUrl, String ak, String sk,String entry) {
      */
     OkHttpClient specificClient;
 
-    GsonBuilder gsonBuilder;
+    Converter.Factory converterFactory;
 }
diff --git a/connector-api/src/main/java/com/tuya/connector/api/core/delegate/RetrofitDelegate.java b/connector-api/src/main/java/com/tuya/connector/api/core/delegate/RetrofitDelegate.java
@@ -24,6 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import retrofit2.Call;
+import retrofit2.Converter;
 import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -279,13 +280,13 @@ private Retrofit getGlobalRetrofit() {
                         Logging.Level loggingLevel = apiDataSource.getLoggingLevel();
                         Logging.Strategy loggingStrategy = apiDataSource.getLoggingStrategy();
                         okHttpBuilder.connectionPool(new okhttp3.ConnectionPool(connectionPool.getMaxIdleConnections(),
-                                connectionPool.getKeepAliveSecond(), TimeUnit.SECONDS))
-                            .callTimeout(timeout.getCallTimeout(), TimeUnit.SECONDS)
-                            .connectTimeout(timeout.getConnectTimeout(), TimeUnit.SECONDS)
-                            .readTimeout(timeout.getReadTimeout(), TimeUnit.SECONDS)
-                            .writeTimeout(timeout.getWriteTimeout(), TimeUnit.SECONDS)
-                            .retryOnConnectionFailure(retryOnConnectionFailure)
-                            .addInterceptor(HttpLoggingFactory.createHttpLoggingInterceptor(loggingLevel, loggingStrategy));
+                                        connectionPool.getKeepAliveSecond(), TimeUnit.SECONDS))
+                                .callTimeout(timeout.getCallTimeout(), TimeUnit.SECONDS)
+                                .connectTimeout(timeout.getConnectTimeout(), TimeUnit.SECONDS)
+                                .readTimeout(timeout.getReadTimeout(), TimeUnit.SECONDS)
+                                .writeTimeout(timeout.getWriteTimeout(), TimeUnit.SECONDS)
+                                .retryOnConnectionFailure(retryOnConnectionFailure)
+                                .addInterceptor(HttpLoggingFactory.createHttpLoggingInterceptor(loggingLevel, loggingStrategy));
                     }
                     boolean autoSetHeader = configuration.getApiDataSource().isAutoSetHeader();
                     HeaderProcessor headerProcessor = apiDataSource.getHeaderProcessor();
@@ -294,18 +295,18 @@ private Retrofit getGlobalRetrofit() {
                         Objects.requireNonNull(headerProcessor, "HeaderProcessor must not be null when autoSetHeader is enabled");
                         okHttpBuilder.addInterceptor(new DefaultHeaderInterceptor(headerProcessor, apiDataSource.getContextManager()));
                     }
-                    GsonBuilder gsonBuilder = apiDataSource.getGsonBuilder();
-                    if (Objects.isNull(gsonBuilder)) {
-                        gsonBuilder = new GsonBuilder();
+                    Converter.Factory converterFactory = apiDataSource.getConverterFactory();
+                    if (Objects.isNull(converterFactory)) {
+                        GsonBuilder gsonBuilder = new GsonBuilder();
                         gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
                         gsonBuilder.setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE);
+                        converterFactory = GsonConverterFactory.create(gsonBuilder.create());
                     }
-
                     retrofitClient = new Retrofit.Builder()
                             .baseUrl(apiDataSource.getBaseUrl())
                             .validateEagerly(validateEagerly)
                             .client(okHttpBuilder.build())
-                            .addConverterFactory(GsonConverterFactory.create(gsonBuilder.create()))
+                            .addConverterFactory(converterFactory)
                             .build();
                 }
             }

diff --git a/connector-messaging/pom.xml b/connector-messaging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-messaging</artifactId>

diff --git a/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml b/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector-spring-boot</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-spring-boot-autoconfigure</artifactId>

diff --git a/connector-spring-boot/connector-spring-boot-starter/pom.xml b/connector-spring-boot/connector-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector-spring-boot</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-spring-boot-starter</artifactId>

diff --git a/connector-spring-boot/pom.xml b/connector-spring-boot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-spring-boot</artifactId>

diff --git a/connector-spring/pom.xml b/connector-spring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.4.7</version>
+        <version>1.4.9</version>
     </parent>
 
     <artifactId>connector-spring</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.tuya</groupId>
     <artifactId>connector</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.7</version>
+    <version>1.4.9</version>
 
     <modules>
         <module>connector-api</module>