feat:add Tencent Cloud TSF support.

CHANGELOG.md

@@ -16,4 +16,4 @@
 - [feat:add zero protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1346)
 - [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1347)
 - [fix:fix the ratelimit bug for 2022](https://github.com/Tencent/spring-cloud-tencent/pull/1348)
-- [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1349)
+- [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1350)

spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,7 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.tencent.cloud.polaris.config.PolarisConfigAutoConfiguration,\
+  com.tencent.cloud.polaris.config.endpoint.PolarisConfigEndpointAutoConfiguration,\
+  com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration,\
   com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigBootstrapConfiguration
@@ -11,4 +15,3 @@ org.springframework.boot.diagnostics.FailureAnalyzer=\
   com.tencent.cloud.polaris.config.configdata.PolarisImportExceptionFailureAnalyzer
 org.springframework.boot.env.EnvironmentPostProcessor=\
   com.tencent.cloud.polaris.config.configdata.PolarisConfigDataMissingEnvironmentPostProcessor
-

spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +0,0 @@
-com.tencent.cloud.polaris.config.PolarisConfigAutoConfiguration
-com.tencent.cloud.polaris.config.endpoint.PolarisConfigEndpointAutoConfiguration
-com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration
-com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigAutoConfiguration

spring-cloud-starter-tencent-polaris-contract/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.tencent.cloud.polaris.contract.config.PolarisSwaggerAutoConfiguration,\
-  com.tencent.cloud.polaris.contract.config.PolarisContractProperties
+  com.tencent.cloud.polaris.contract.config.PolarisContractProperties,\
+  com.tencent.cloud.polaris.contract.tsf.TsfContractPropertiesAutoConfiguration,\
+  com.tencent.cloud.polaris.contract.tsf.TsfSwaggerAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.contract.config.PolarisContractPropertiesBootstrapConfiguration,\
   com.tencent.cloud.polaris.contract.tsf.TsfContractPropertiesBootstrapConfiguration

spring-cloud-starter-tencent-polaris-contract/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +0,0 @@
-com.tencent.cloud.polaris.contract.config.PolarisSwaggerAutoConfiguration
-com.tencent.cloud.polaris.contract.config.PolarisContractPropertiesAutoConfiguration
-com.tencent.cloud.polaris.contract.tsf.TsfContractPropertiesAutoConfiguration
-com.tencent.cloud.polaris.contract.tsf.TsfSwaggerAutoConfiguration

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java

@@ -17,10 +17,11 @@
 
 package com.tencent.cloud.polaris.tsf;
 
-import jakarta.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMax;
-import jakarta.validation.constraints.DecimalMin;
+import javax.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Min;
+import javax.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
+
 import org.apache.commons.logging.Log;
 import org.joda.time.Period;
 

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfDiscoveryRegistryAutoConfiguration.java

@@ -16,13 +16,14 @@
  */
 
 package com.tencent.cloud.polaris.tsf.registry;
+import javax.servlet.ServletContext;
 
 import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.cloud.polaris.context.tsf.ConditionalOnTsfEnabled;
 import com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration;
 import com.tencent.cloud.polaris.tsf.TsfDiscoveryProperties;
 import com.tencent.cloud.polaris.tsf.TsfHeartbeatProperties;
-import jakarta.servlet.ServletContext;
+
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfServletRegistrationCustomizer.java

@@ -22,11 +22,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
+
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.polaris.registry.PolarisRegistration;
 import com.tencent.cloud.polaris.registry.PolarisRegistrationCustomizer;
 import com.tencent.polaris.plugins.connector.common.constant.ConsulConstant;
-import jakarta.servlet.ServletContext;
+
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.util.StringUtils;

spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/spring.factories

@@ -3,7 +3,9 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration,\
   com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration,\
   com.tencent.cloud.polaris.endpoint.PolarisDiscoveryEndpointAutoConfiguration,\
-  com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerAutoConfiguration
+  com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerAutoConfiguration,\
+  com.tencent.cloud.polaris.tsf.TsfDiscoveryPropertiesAutoConfiguration,\
+  com.tencent.cloud.polaris.tsf.registry.TsfDiscoveryRegistryAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.DiscoveryPropertiesBootstrapAutoConfiguration,\
   com.tencent.cloud.polaris.tsf.TsfDiscoveryPropertiesBootstrapConfiguration

spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,7 +0,0 @@
-com.tencent.cloud.polaris.DiscoveryPropertiesAutoConfiguration
-com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration
-com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration
-com.tencent.cloud.polaris.endpoint.PolarisDiscoveryEndpointAutoConfiguration
-com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerAutoConfiguration
-com.tencent.cloud.polaris.tsf.TsfDiscoveryPropertiesAutoConfiguration
-com.tencent.cloud.polaris.tsf.registry.TsfDiscoveryRegistryAutoConfiguration

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java

@@ -140,8 +140,8 @@ public class LosslessRegistryAspectTest {
 			assertThatCode(() -> {
 				assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse();
 			}).doesNotThrowAnyException();
-			// delay register after 5s
+			// delay register after 10s
-			Thread.sleep(5000);
+			Thread.sleep(10000);
 			PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class);
 			PolarisRegistration registration = context.getBean(PolarisRegistration.class);
 

spring-cloud-tencent-commons/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,5 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.tencent.cloud.common.util.inet.PolarisInetUtilsBootstrapConfiguration
+  com.tencent.cloud.common.util.inet.PolarisInetUtilsAutoConfiguration,\
+  com.tencent.cloud.common.util.ApplicationContextAwareUtils,\
+  com.tencent.cloud.common.metadata.config.MetadataAutoConfiguration,\
+  com.tencent.cloud.common.metadata.endpoint.PolarisMetadataEndpointAutoConfiguration

spring-cloud-tencent-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +0,0 @@
-com.tencent.cloud.common.util.ApplicationContextAwareUtils
-com.tencent.cloud.common.metadata.config.MetadataAutoConfiguration
-com.tencent.cloud.common.metadata.endpoint.PolarisMetadataEndpointAutoConfiguration
-com.tencent.cloud.common.util.inet.PolarisInetUtilsAutoConfiguration

spring-cloud-tencent-dependencies/pom.xml

@@ -78,12 +78,12 @@
 
 		<!-- Dependencies -->
 		<guava.version>32.0.1-jre</guava.version>
-		<springdoc.version>2.2.0</springdoc.version>
+		<springdoc.version>1.7.0</springdoc.version>
 		<mocktio.version>4.9.0</mocktio.version>
 		<byte-buddy.version>1.12.19</byte-buddy.version>
-		<jackson.version>2.15.3</jackson.version>
+		<jackson.version>2.13.5</jackson.version>
 		<protobuf-java.version>3.21.7</protobuf-java.version>
-		<okio.version>3.0.0</okio.version>
+		<okio.version>3.9.0</okio.version>
 		<joda-time.version>2.9.9</joda-time.version>
 		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
 
@@ -222,13 +222,13 @@
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+				<artifactId>springdoc-openapi-webflux-ui</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+				<artifactId>springdoc-openapi-ui</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 

spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/pom.xml

@@ -23,7 +23,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-bootstrap</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>

spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/java/com/tencent/cloud/tsf/demo/provider/ProviderController.java

@@ -23,8 +23,9 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Enumeration;
 
+import javax.servlet.http.HttpServletResponse;
+
 import com.tencent.cloud.tsf.demo.provider.config.ProviderNameConfig;
-import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,4 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.plugin.lossless.config.LosslessPropertiesBootstrapConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.tencent.cloud.plugin.lossless.config.LosslessAutoConfiguration

spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.tencent.cloud.plugin.lossless.config.LosslessAutoConfiguration

spring-cloud-tencent-polaris-context/pom.xml

@@ -109,6 +109,14 @@
 			<groupId>com.tencent.polaris</groupId>
 			<artifactId>polaris-assembly-factory</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.tencent.polaris</groupId>
+			<artifactId>polaris-ratelimit-factory</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.tencent.polaris</groupId>
+			<artifactId>polaris-circuitbreaker-factory</artifactId>
+		</dependency>
 		<!-- Polaris dependencies end -->
 
 		<dependency>

spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulProperties.java

@@ -18,7 +18,7 @@
 package com.tencent.cloud.polaris.context.tsf.consul;
 
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;

spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,8 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration,\
-  com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration
+  com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration,\
+  com.tencent.cloud.polaris.context.tsf.config.TsfCorePropertiesAutoConfiguration,\
+  com.tencent.cloud.polaris.context.tsf.consul.TsfConsulAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.context.config.PolarisContextBootstrapAutoConfiguration,\
   com.tencent.cloud.polaris.context.tsf.config.TsfCorePropertiesBootstrapConfiguration,\

spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +0,0 @@
-com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration
-com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration
-com.tencent.cloud.polaris.context.tsf.config.TsfCorePropertiesAutoConfiguration
-com.tencent.cloud.polaris.context.tsf.consul.TsfConsulAutoConfiguration