From 19b18415abec8322a7fa9c8c342916282d790aeb Mon Sep 17 00:00:00 2001 From: mgy Date: Tue, 27 Aug 2024 16:48:59 +0800 Subject: [PATCH] 1.4.9 --- connector-api/pom.xml | 2 +- .../connector/api/config/ApiDataSource.java | 3 ++- .../api/core/delegate/RetrofitDelegate.java | 25 ++++++++++--------- connector-messaging/pom.xml | 2 +- .../pom.xml | 2 +- .../connector-spring-boot-starter/pom.xml | 2 +- connector-spring-boot/pom.xml | 2 +- connector-spring/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/connector-api/pom.xml b/connector-api/pom.xml index dc98446..414c2d9 100644 --- a/connector-api/pom.xml +++ b/connector-api/pom.xml @@ -6,7 +6,7 @@ connector com.tuya - 1.4.7 + 1.4.9 connector-api 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 index 9a86d9f..5c53745 100644 --- 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 index 30afb76..f414e80 100644 --- 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 index 767c619..9412e91 100644 --- a/connector-messaging/pom.xml +++ b/connector-messaging/pom.xml @@ -6,7 +6,7 @@ connector com.tuya - 1.4.7 + 1.4.9 connector-messaging diff --git a/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml b/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml index 501fac5..ef99c9c 100644 --- a/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml +++ b/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ connector-spring-boot com.tuya - 1.4.7 + 1.4.9 connector-spring-boot-autoconfigure diff --git a/connector-spring-boot/connector-spring-boot-starter/pom.xml b/connector-spring-boot/connector-spring-boot-starter/pom.xml index adf3473..c4c8e2c 100644 --- a/connector-spring-boot/connector-spring-boot-starter/pom.xml +++ b/connector-spring-boot/connector-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ connector-spring-boot com.tuya - 1.4.7 + 1.4.9 connector-spring-boot-starter diff --git a/connector-spring-boot/pom.xml b/connector-spring-boot/pom.xml index a1d4dc2..cd0476b 100644 --- a/connector-spring-boot/pom.xml +++ b/connector-spring-boot/pom.xml @@ -6,7 +6,7 @@ connector com.tuya - 1.4.7 + 1.4.9 connector-spring-boot diff --git a/connector-spring/pom.xml b/connector-spring/pom.xml index 74ae1ac..a343db9 100644 --- a/connector-spring/pom.xml +++ b/connector-spring/pom.xml @@ -6,7 +6,7 @@ connector com.tuya - 1.4.7 + 1.4.9 connector-spring diff --git a/pom.xml b/pom.xml index 0915606..23a0b12 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tuya connector pom - 1.4.7 + 1.4.9 connector-api