Merge branch 'main' into main

CHANGELOG.md

@@ -27,4 +27,5 @@
 - [Feature: Optimize static metadata manager](https://github.com/Tencent/spring-cloud-tencent/pull/327)
 - [test:update junit of metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/340)
 - [Optimize code style & unit test case](https://github.com/Tencent/spring-cloud-tencent/pull/336)
-- [fix: shutdown thread pool before the container closes](https://github.com/Tencent/spring-cloud-tencent/pull/354)
+- [rm code: Condition 'null != interceptors' is always 'true' ](https://github.com/Tencent/spring-cloud-tencent/pull/342)
+- [fix: shutdown thread pool before the container closes](https://github.com/Tencent/spring-cloud-tencent/pull/354)

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java

@@ -168,8 +168,7 @@ public class MetadataTransferAutoConfiguration {
 					List<ClientHttpRequestInterceptor> interceptors = restTemplate
 							.getInterceptors();
 					// Avoid setting interceptor repeatedly.
-					if (null != interceptors && !interceptors
-							.contains(encodeTransferMedataRestTemplateInterceptor)) {
+					if (!interceptors.contains(encodeTransferMedataRestTemplateInterceptor)) {
 						interceptors.add(encodeTransferMedataRestTemplateInterceptor);
 						restTemplate.setInterceptors(interceptors);
 					}
@@ -207,10 +206,8 @@ public class MetadataTransferAutoConfiguration {
 					List<ClientHttpRequestInterceptor> interceptors = restTemplate
 							.getInterceptors();
 					// Avoid setting interceptor repeatedly.
-					if (null != interceptors && !interceptors
-							.contains(encodeTransferMedataRestTemplateInterceptor)) {
-						interceptors
-								.add(this.encodeTransferMedataRestTemplateInterceptor);
+					if (!interceptors.contains(encodeTransferMedataRestTemplateInterceptor)) {
+						interceptors.add(this.encodeTransferMedataRestTemplateInterceptor);
 						restTemplate.setInterceptors(interceptors);
 					}
 				}