2.0.0.0 serivce

CHANGELOG.md

@@ -18,4 +18,5 @@
 - [fix: memory not released while using wildcard api call with circuitbreaker enabled](https://github.com/Tencent/spring-cloud-tencent/pull/1335)
 - [feat: support 2.0.0](https://github.com/Tencent/spring-cloud-tencent/pull/1458)
 - [feat: support 2.0.0 config](https://github.com/Tencent/spring-cloud-tencent/pull/1463)
-- [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1467)
+- [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1467)
+- [feat:upgrade 2.0.0 service.](https://github.com/Tencent/spring-cloud-tencent/pull/1471)

spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptorTest.java

@@ -18,13 +18,10 @@
 package com.tencent.cloud.metadata.core;
 
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Map;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.metadata.MetadataContextHolder;
-import com.tencent.cloud.rpc.enhancement.plugin.DefaultEnhancedPluginRunner;
-import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateInterceptor;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -79,15 +76,10 @@ protected static class TestApplication {
 
 		@Bean
 		public RestTemplate restTemplate() {
-
-			EncodeTransferMedataRestTemplateEnhancedPlugin plugin = new EncodeTransferMedataRestTemplateEnhancedPlugin();
-			EnhancedRestTemplateInterceptor interceptor = new EnhancedRestTemplateInterceptor(
-					new DefaultEnhancedPluginRunner(Arrays.asList(plugin), new MockRegistration(), null));
-			RestTemplate template = new RestTemplate();
-			template.setInterceptors(Arrays.asList(interceptor));
-			return template;
+			return new RestTemplate();
 		}
 
+
 		@RequestMapping("/test")
 		public String test() {
 			return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisResultToErrorCode.java

@@ -17,7 +17,7 @@
 
 package com.tencent.cloud.polaris.circuitbreaker.common;
 
-import com.tencent.cloud.polaris.circuitbreaker.zuul.PolarisCircuitBreakerPostZuulFilter;
+import com.tencent.cloud.polaris.context.CircuitBreakerStatusCodeException;
 import com.tencent.polaris.circuitbreak.api.pojo.ResultToErrorCode;
 import feign.FeignException;
 
@@ -50,8 +50,8 @@ else if (checkClassExist("org.springframework.web.reactive.function.client.WebCl
 				&& e instanceof WebClientResponseException) {
 			return ((WebClientResponseException) e).getRawStatusCode();
 		}
-		else if (e instanceof PolarisCircuitBreakerPostZuulFilter.CircuitBreakerStatusCodeException) {
-			return ((PolarisCircuitBreakerPostZuulFilter.CircuitBreakerStatusCodeException) e).getRawStatusCode();
+		else if (e instanceof CircuitBreakerStatusCodeException) {
+			return ((CircuitBreakerStatusCodeException) e).getRawStatusCode();
 		}
 		return -1;
 	}

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java

@@ -17,21 +17,11 @@
 
 package com.tencent.cloud.polaris.circuitbreaker.config;
 
-import com.tencent.cloud.polaris.circuitbreaker.ReactivePolarisCircuitBreakerFactory;
-import com.tencent.cloud.polaris.circuitbreaker.gateway.PolarisCircuitBreakerFilterFactory;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
 import org.springframework.cloud.gateway.config.GatewayAutoConfiguration;
 import org.springframework.cloud.gateway.config.conditional.ConditionalOnEnabledFilter;
-import org.springframework.cloud.gateway.discovery.DiscoveryLocatorProperties;
 import org.springframework.cloud.gateway.filter.factory.FallbackHeadersGatewayFilterFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,23 +34,9 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
-@AutoConfigureAfter({ReactivePolarisCircuitBreakerAutoConfiguration.class})
-@ConditionalOnClass({DispatcherHandler.class, ReactivePolarisCircuitBreakerAutoConfiguration.class,
-		ReactiveCircuitBreakerFactory.class, ReactivePolarisCircuitBreakerFactory.class, GatewayAutoConfiguration.class})
+@ConditionalOnClass({ DispatcherHandler.class, GatewayAutoConfiguration.class})
 public class GatewayPolarisCircuitBreakerAutoConfiguration {
 
-	@Bean
-	@ConditionalOnBean(ReactiveCircuitBreakerFactory.class)
-	@ConditionalOnEnabledFilter
-	public PolarisCircuitBreakerFilterFactory polarisCircuitBreakerFilterFactory(
-			ReactiveCircuitBreakerFactory reactiveCircuitBreakerFactory,
-			ObjectProvider<DispatcherHandler> dispatcherHandler,
-			@Autowired(required = false) ReactiveDiscoveryClient discoveryClient,
-			@Autowired(required = false) DiscoveryLocatorProperties properties
-	) {
-		return new PolarisCircuitBreakerFilterFactory(reactiveCircuitBreakerFactory, dispatcherHandler, discoveryClient, properties);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnEnabledFilter

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerAutoConfiguration.java

@@ -24,11 +24,9 @@
 
 import com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreakerFactory;
 import com.tencent.cloud.polaris.circuitbreaker.common.CircuitBreakerConfigModifier;
+import com.tencent.cloud.polaris.circuitbreaker.reporter.CircuitBreakerPlugin;
 import com.tencent.cloud.polaris.circuitbreaker.reporter.ExceptionCircuitBreakerReporter;
 import com.tencent.cloud.polaris.circuitbreaker.reporter.SuccessCircuitBreakerReporter;
-import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisCircuitBreakerRestTemplateBeanPostProcessor;
-import com.tencent.cloud.polaris.circuitbreaker.zuul.PolarisCircuitBreakerPostZuulFilter;
-import com.tencent.cloud.polaris.circuitbreaker.zuul.PolarisCircuitBreakerZuulFilter;
 import com.tencent.cloud.polaris.circuitbreaker.zuul.PolarisZuulFallbackFactory;
 import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementAutoConfiguration;
@@ -42,10 +40,8 @@
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.client.circuitbreaker.Customizer;
 import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 
 
 /**
@@ -68,20 +64,19 @@ public class PolarisCircuitBreakerAutoConfiguration {
 		System.setProperty("hystrix.command.default.circuitBreaker.enabled", "false");
 	}
 
-	@Bean
-	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	public static PolarisCircuitBreakerRestTemplateBeanPostProcessor polarisCircuitBreakerRestTemplateBeanPostProcessor(
-			ApplicationContext applicationContext) {
-		return new PolarisCircuitBreakerRestTemplateBeanPostProcessor(applicationContext);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(SuccessCircuitBreakerReporter.class)
 	public SuccessCircuitBreakerReporter successCircuitBreakerReporter(RpcEnhancementReporterProperties properties,
 			PolarisSDKContextManager polarisSDKContextManager) {
 		return new SuccessCircuitBreakerReporter(properties, polarisSDKContextManager.getCircuitBreakAPI());
 	}
 
+	@Bean
+	@ConditionalOnMissingBean(CircuitBreakerPlugin.class)
+	public CircuitBreakerPlugin circuitBreakerPlugin(CircuitBreakerFactory circuitBreakerFactory) {
+		return new CircuitBreakerPlugin(circuitBreakerFactory);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean(ExceptionCircuitBreakerReporter.class)
 	public ExceptionCircuitBreakerReporter exceptionCircuitBreakerReporter(RpcEnhancementReporterProperties properties,
@@ -116,20 +111,5 @@ protected static class PolarisCircuitBreakerZuulFilterConfig {
 		public PolarisZuulFallbackFactory polarisZuulFallbackFactory() {
 			return new PolarisZuulFallbackFactory(zuulFallbackProviders);
 		}
-
-		@Bean
-		public PolarisCircuitBreakerZuulFilter polarisCircuitBreakerZuulFilter(
-				CircuitBreakerFactory circuitBreakerFactory,
-				PolarisZuulFallbackFactory polarisZuulFallbackFactory,
-				Environment environment) {
-			return new PolarisCircuitBreakerZuulFilter(circuitBreakerFactory, polarisZuulFallbackFactory, environment);
-		}
-
-		@Bean
-		public PolarisCircuitBreakerPostZuulFilter polarisCircuitBreakerPostZuulFilter(
-				PolarisZuulFallbackFactory polarisZuulFallbackFactory,
-				Environment environment) {
-			return new PolarisCircuitBreakerPostZuulFilter(polarisZuulFallbackFactory, environment);
-		}
 	}
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfiguration.java

@@ -30,7 +30,6 @@
 @ConditionalOnProperty("spring.cloud.polaris.enabled")
 @Import({
 		PolarisCircuitBreakerAutoConfiguration.class,
-		ReactivePolarisCircuitBreakerAutoConfiguration.class,
 		PolarisCircuitBreakerFeignClientAutoConfiguration.class,
 		GatewayPolarisCircuitBreakerAutoConfiguration.class
 })