Tencent · SkyeBeFreeman · May 10, 2025 · May 7, 2025 · May 7, 2025 · May 7, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,3 +25,4 @@
 - [docs:update circuit breaker examples.](https://github.com/Tencent/spring-cloud-tencent/pull/1521)
 - [feat:support zuul circuit breaker fallback response.](https://github.com/Tencent/spring-cloud-tencent/pull/1522)
 - [feat:support auth.](https://github.com/Tencent/spring-cloud-tencent/pull/1541)
+- [feat:support smooth upgrade from tsf. ](https://github.com/Tencent/spring-cloud-tencent/pull/1542)
diff --git a/spring-cloud-starter-tencent-all/pom.xml b/spring-cloud-starter-tencent-all/pom.xml
@@ -59,6 +59,17 @@
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-starter-tencent-polaris-auth</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-fault-tolerance</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/spring-cloud-starter-tencent-metadata-transfer/pom.xml b/spring-cloud-starter-tencent-metadata-transfer/pom.xml
@@ -15,11 +15,6 @@
 
 	<dependencies>
 		<!-- Spring Cloud Tencent dependencies start -->
-		<dependency>
-			<groupId>com.tencent.cloud</groupId>
-			<artifactId>spring-cloud-tencent-commons</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-tencent-rpc-enhancement</artifactId>

diff --git a/...sfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilterTest.java b/...sfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilterTest.java
@@ -27,8 +27,8 @@
 import com.tencent.cloud.common.metadata.StaticMetadataManager;
 import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
+import com.tencent.cloud.rpc.enhancement.instrument.scg.EnhancedGatewayGlobalFilter;
 import com.tencent.cloud.rpc.enhancement.plugin.DefaultEnhancedPluginRunner;
-import com.tencent.cloud.rpc.enhancement.scg.EnhancedGatewayGlobalFilter;
 import org.assertj.core.util.Maps;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...ent-polaris-auth/src/main/java/org/springframework/tsf/auth/annotation/EnableTsfAuth.java b/...ent-polaris-auth/src/main/java/org/springframework/tsf/auth/annotation/EnableTsfAuth.java
@@ -0,0 +1,42 @@
+/*
+ * Tencent is pleased to support the open source community by making spring-cloud-tencent available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package org.springframework.tsf.auth.annotation;
+
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Empty annotation. Compatible with old versions TSF SDK.
+ * <p>
+ * Deprecated since 2.0.0.0.
+ *
+ * @author Haotian Zhang
+ */
+@Deprecated
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface EnableTsfAuth {
+
+}
diff --git a/spring-cloud-starter-tencent-polaris-auth/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-tencent-polaris-auth/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.tencent.cloud.polaris.auth.config.PolarisAuthPropertiesAutoConfiguration,\
+  com.tencent.cloud.polaris.auth.config.PolarisAuthAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.auth.config.PolarisAuthPropertiesBootstrapConfiguration
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/...s-auth/src/test/java/com/tencent/cloud/polaris/auth/config/PolarisAuthPropertiesTest.java b/...s-auth/src/test/java/com/tencent/cloud/polaris/auth/config/PolarisAuthPropertiesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Tencent is pleased to support the open source community by making spring-cloud-tencent available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.auth.config;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link PolarisAuthProperties}.
+ *
+ * @author Haotian Zhang
+ */
+public class PolarisAuthPropertiesTest {
+
+	private final ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(PolarisAuthPropertiesAutoConfiguration.class))
+			.withPropertyValues("spring.cloud.polaris.auth.enabled=false");
+
+	@Test
+	public void testGetAndSet() {
+		this.applicationContextRunner.run(context -> {
+			PolarisAuthProperties properties = context.getBean(PolarisAuthProperties.class);
+			assertThat(properties.isEnabled()).isFalse();
+		});
+	}
+}
diff --git a/...loud/polaris/circuitbreaker/config/PolarisCircuitBreakerFeignClientAutoConfiguration.java b/...loud/polaris/circuitbreaker/config/PolarisCircuitBreakerFeignClientAutoConfiguration.java
@@ -17,8 +17,8 @@
 
 package com.tencent.cloud.polaris.circuitbreaker.config;
 
-import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisCircuitBreakerNameResolver;
-import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignCircuitBreaker;
+import com.tencent.cloud.polaris.circuitbreaker.instrument.feign.PolarisCircuitBreakerNameResolver;
+import com.tencent.cloud.polaris.circuitbreaker.instrument.feign.PolarisFeignCircuitBreaker;
 import feign.Feign;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

diff --git a/...PolarisCircuitBreakerFallbackFactory.java → ...PolarisCircuitBreakerFallbackFactory.java b/...PolarisCircuitBreakerFallbackFactory.java → ...PolarisCircuitBreakerFallbackFactory.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.feign;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.feign;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

diff --git a/...gn/PolarisCircuitBreakerNameResolver.java → ...gn/PolarisCircuitBreakerNameResolver.java b/...gn/PolarisCircuitBreakerNameResolver.java → ...gn/PolarisCircuitBreakerNameResolver.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.feign;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.feign;
 
 import java.lang.reflect.Method;
 import java.net.URI;

diff --git a/...ker/feign/PolarisFeignCircuitBreaker.java → ...ent/feign/PolarisFeignCircuitBreaker.java b/...ker/feign/PolarisFeignCircuitBreaker.java → ...ent/feign/PolarisFeignCircuitBreaker.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.feign;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.feign;
 
 import java.lang.reflect.Field;
 

diff --git a/...FeignCircuitBreakerInvocationHandler.java → ...FeignCircuitBreakerInvocationHandler.java b/...FeignCircuitBreakerInvocationHandler.java → ...FeignCircuitBreakerInvocationHandler.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.feign;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.feign;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;

diff --git a/...or/PolarisCircuitBreakerFluxOperator.java → ...or/PolarisCircuitBreakerFluxOperator.java b/...or/PolarisCircuitBreakerFluxOperator.java → ...or/PolarisCircuitBreakerFluxOperator.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.reactor;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.reactor;
 
 import com.tencent.polaris.circuitbreak.api.InvokeHandler;
 import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;

diff --git a/...or/PolarisCircuitBreakerMonoOperator.java → ...or/PolarisCircuitBreakerMonoOperator.java b/...or/PolarisCircuitBreakerMonoOperator.java → ...or/PolarisCircuitBreakerMonoOperator.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.reactor;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.reactor;
 
 import com.tencent.polaris.circuitbreak.api.InvokeHandler;
 import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;

diff --git a/...larisCircuitBreakerReactorSubscriber.java → ...larisCircuitBreakerReactorSubscriber.java b/...larisCircuitBreakerReactorSubscriber.java → ...larisCircuitBreakerReactorSubscriber.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.reactor;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.reactor;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/...arisCircuitBreakerReactorTransformer.java → ...arisCircuitBreakerReactorTransformer.java b/...arisCircuitBreakerReactorTransformer.java → ...arisCircuitBreakerReactorTransformer.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.reactor;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.reactor;
 
 import java.util.function.Function;
 

diff --git a/...r/resttemplate/PolarisCircuitBreaker.java → ...t/resttemplate/PolarisCircuitBreaker.java b/...r/resttemplate/PolarisCircuitBreaker.java → ...t/resttemplate/PolarisCircuitBreaker.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.resttemplate;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -28,12 +28,15 @@
  * if coded fallback or fallbackClass provided, RestTemplate will always return fallback when any exception occurs,
  * if none coded fallback or fallbackClass provided, RestTemplate will return fallback response from Polaris server when fallback occurs.
  * fallback and fallbackClass cannot provide at same time.
+ * <p>
+ * Deprecated since 2.0.0.0.
  *
  * @author sean yu
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Deprecated
 public @interface PolarisCircuitBreaker {
 
 	/**

diff --git a/...mplate/PolarisCircuitBreakerFallback.java → ...mplate/PolarisCircuitBreakerFallback.java b/...mplate/PolarisCircuitBreakerFallback.java → ...mplate/PolarisCircuitBreakerFallback.java
@@ -15,13 +15,16 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.resttemplate;
 
 /**
  * PolarisCircuitBreakerFallback.
+ * <p>
+ * Deprecated since 2.0.0.0.
  *
  * @author sean yu
  */
+@Deprecated
 public interface PolarisCircuitBreakerFallback {
 
 	PolarisCircuitBreakerHttpResponse fallback();

diff --git a/...te/PolarisCircuitBreakerHttpResponse.java → ...te/PolarisCircuitBreakerHttpResponse.java b/...te/PolarisCircuitBreakerHttpResponse.java → ...te/PolarisCircuitBreakerHttpResponse.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+package com.tencent.cloud.polaris.circuitbreaker.instrument.resttemplate;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/...src/main/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPlugin.java b/...src/main/java/com/tencent/cloud/polaris/circuitbreaker/reporter/CircuitBreakerPlugin.java
@@ -21,7 +21,7 @@
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreaker;
-import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisCircuitBreakerHttpResponse;
+import com.tencent.cloud.polaris.circuitbreaker.instrument.resttemplate.PolarisCircuitBreakerHttpResponse;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;

diff --git a/...src/main/java/org/springframework/cloud/openfeign/PolarisFeignCircuitBreakerTargeter.java b/...src/main/java/org/springframework/cloud/openfeign/PolarisFeignCircuitBreakerTargeter.java
@@ -17,7 +17,7 @@
 
 package org.springframework.cloud.openfeign;
 
-import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignCircuitBreaker;
+import com.tencent.cloud.polaris.circuitbreaker.instrument.feign.PolarisFeignCircuitBreaker;
 import feign.Feign;
 import feign.Target;
 

diff --git a/...java/org/springframework/cloud/tsf/circuitbreaker/annotation/EnableTsfCircuitBreaker.java b/...java/org/springframework/cloud/tsf/circuitbreaker/annotation/EnableTsfCircuitBreaker.java
@@ -0,0 +1,40 @@
+/*
+ * Tencent is pleased to support the open source community by making spring-cloud-tencent available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package org.springframework.cloud.tsf.circuitbreaker.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Empty annotation. Compatible with old versions TSF SDK.
+ * <p>
+ * Deprecated since 2.0.0.0.
+ *
+ * @author Haotian Zhang
+ */
+@Deprecated
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface EnableTsfCircuitBreaker {
+}