Revert "Set error handler named EnhancedRestTemplateReporter for RestTemplate"

This reverts commit d2d5e5feb4.

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java

@@ -17,7 +17,6 @@
 
 package com.tencent.cloud.rpc.enhancement.config;
 
-import java.util.Collections;
 import java.util.List;
 
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
@@ -30,14 +29,13 @@ import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.SuccessPolarisRep
 import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateReporter;
 import com.tencent.polaris.api.core.ConsumerAPI;
 
-import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
@@ -101,10 +99,6 @@ public class RpcEnhancementAutoConfiguration {
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
 	protected static class PolarisRestTemplateAutoConfiguration {
 
-		@LoadBalanced
-		@Autowired(required = false)
-		private List<RestTemplate> restTemplates = Collections.emptyList();
-
 		@Bean
 		public EnhancedRestTemplateReporter polarisRestTemplateResponseErrorHandler(
 				RpcEnhancementReporterProperties properties,
@@ -113,12 +107,8 @@ public class RpcEnhancementAutoConfiguration {
 		}
 
 		@Bean
-		public SmartInitializingSingleton setErrorHandlerForRestTemplate(EnhancedRestTemplateReporter reporter) {
-			return () -> {
-				for (RestTemplate restTemplate : restTemplates) {
-					restTemplate.setErrorHandler(reporter);
-				}
-			};
+		public RestTemplateCustomizer setErrorHandlerCustomizer(EnhancedRestTemplateReporter reporter) {
+			return restTemplate -> restTemplate.setErrorHandler(reporter);
 		}
 	}
 }

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java

@@ -17,6 +17,9 @@
 
 package com.tencent.cloud.rpc.enhancement.config;
 
+import java.io.IOException;
+import java.net.URI;
+
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignBeanPostProcessor;
 import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignPluginRunner;
@@ -29,7 +32,11 @@ import org.junit.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
@@ -47,7 +54,8 @@ public class RpcEnhancementAutoConfigurationTest {
 			.withConfiguration(AutoConfigurations.of(
 					PolarisContextAutoConfiguration.class,
 					RpcEnhancementAutoConfiguration.class,
-					PolarisRestTemplateAutoConfigurationTester.class))
+					PolarisRestTemplateAutoConfigurationTester.class,
+					LoadBalancerAutoConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
 	@Test
@@ -74,5 +82,30 @@ public class RpcEnhancementAutoConfigurationTest {
 		RestTemplate restTemplate() {
 			return new RestTemplate();
 		}
+
+		@Bean
+		LoadBalancerClient loadBalancerClient() {
+			return new LoadBalancerClient() {
+				@Override
+				public ServiceInstance choose(String serviceId) {
+					return null;
+				}
+
+				@Override
+				public <T> T execute(String serviceId, LoadBalancerRequest<T> request) throws IOException {
+					return null;
+				}
+
+				@Override
+				public <T> T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest<T> request) throws IOException {
+					return null;
+				}
+
+				@Override
+				public URI reconstructURI(ServiceInstance instance, URI original) {
+					return null;
+				}
+			};
+		}
 	}
 }