refactor:optimize project and code (#392)

CHANGELOG.md

@@ -31,3 +31,4 @@
 - [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/386)
 - [Feature: support spring cloud gateway routers](https://github.com/Tencent/spring-cloud-tencent/pull/388)
 - [Optimize:optimize load balancer code and add testcase](https://github.com/Tencent/spring-cloud-tencent/pull/379)
+- [refactor:optimize project and code](https://github.com/Tencent/spring-cloud-tencent/pull/392)

README-zh.md

@@ -3,11 +3,11 @@
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)
 [![Maven Central](https://img.shields.io/maven-central/v/com.tencent.cloud/spring-cloud-tencent?label=Maven%20Central)](https://search.maven.org/search?q=g:com.tencent.cloud%20AND%20a:spring-cloud-tencent)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/main/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=main)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2020.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2020.0)
 [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
-[English](./README.md) | 简体中文 
+[English](./README.md) | 简体中文
 
 ---
 
@@ -29,20 +29,22 @@ Spring Cloud Tencent提供的能力包括但不限于：
 - 服务注册和发现
 - 动态配置管理
 - 服务治理
-   - 服务限流
+    - 服务限流
-   - 服务熔断
+    - 服务熔断
-   - 服务路由
+    - 服务路由
-   - ...
+    - ...
 - 标签透传
 
 ## 体验环境
 
 - 管控台地址： http://14.116.241.63:8080/
-  - 账号：polaris
+    - 账号：polaris
-  - 密码：polaris 
+    - 密码：polaris
 - 控制面地址： `grpc://183.47.111.80:8091`
-- 
+-
-  `spring-cloud-tencent-example` 下 example 地址都默认指向了体验服务地址（`grpc://183.47.111.80:8091`），如果您只是体验 Spring Cloud Tencent，可直接一键运行任何 example。
+`spring-cloud-tencent-example` 下 example 地址都默认指向了体验服务地址（`grpc://183.47.111.80:8091`），如果您只是体验 Spring Cloud
+Tencent，可直接一键运行任何 example。
+
 ## 管控台
 
 <img width="1792" alt="image" src="https://user-images.githubusercontent.com/4991116/163402268-48493802-4555-4b93-8e31-011410f2166b.png">
@@ -88,8 +90,8 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要
     - [Spring Cloud Tencent 标签传递](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-Metadata-Transfer-%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
 
 - ### 开发文档
-  - [项目概览](https://github.com/Tencent/spring-cloud-tencent/wiki/%E9%A1%B9%E7%9B%AE%E6%A6%82%E8%A7%88)
+    - [项目概览](https://github.com/Tencent/spring-cloud-tencent/wiki/%E9%A1%B9%E7%9B%AE%E6%A6%82%E8%A7%88)
-  - [参与共建](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%8F%82%E4%B8%8E%E5%85%B1%E5%BB%BA)
+    - [参与共建](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%8F%82%E4%B8%8E%E5%85%B1%E5%BB%BA)
 
 ## 交流群
 
@@ -97,9 +99,10 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要
 
 <img src="https://user-images.githubusercontent.com/24446200/169198148-d4cc3494-3485-4515-9897-c8cb5504f706.png" width="30%" height="30%" />
 
-
 ## License
-The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE)
+
+The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in
+the file [LICENSE](LICENSE)
 
 ## Stargazers over time
 

README.md

@@ -4,7 +4,7 @@
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)
 [![Maven Central](https://img.shields.io/maven-central/v/com.tencent.cloud/spring-cloud-tencent?label=Maven%20Central)](https://search.maven.org/search?q=g:com.tencent.cloud%20AND%20a:spring-cloud-tencent)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/main/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=main)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2020.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2020.0)
 [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
@@ -14,9 +14,11 @@ English | [简体中文](./README-zh.md)
 
 Spring Cloud Tencent is a open source one-stop microservice solution from Tencent.
 
-Spring Cloud Tencent implements the Spring Cloud standard microservice SPI, so developers can quickly develop Spring Cloud cloud-native distributed applications based on Spring Cloud Tencent.
+Spring Cloud Tencent implements the Spring Cloud standard microservice SPI, so developers can quickly develop Spring
+Cloud cloud-native distributed applications based on Spring Cloud Tencent.
 
-The core of Spring Cloud Tencent relies on Tencent's open-source one-stop service discovery and governance platform [Polaris](https://github.com/polarismesh/polaris) to realize various distributed microservice scenarios.
+The core of Spring Cloud Tencent relies on Tencent's open-source one-stop service discovery and governance
+platform [Polaris](https://github.com/polarismesh/polaris) to realize various distributed microservice scenarios.
 
 - [Polaris Github home page](https://github.com/polarismesh/polaris)
 - [Polaris official website](https://polarismesh.cn/)
@@ -28,21 +30,22 @@ The capabilities provided by Spring Cloud Tencent include but are not limited to
 - Service registration and discovery
 - Dynamic configuration management
 - Service Governance
-  - Service rate limit
+    - Service rate limit
-  - Service circuit breaker
+    - Service circuit breaker
-  - Service routing
+    - Service routing
-  - ...
+    - ...
 - Label transparent transmission
 
 ## Demo Environment
 
 - Console Address : http://14.116.241.63:8080/
-  - Username: polaris
+    - Username: polaris
-  - Password: polaris 
+    - Password: polaris
 - Server Address: `grpc://183.47.111.80:8091`
 
-The example addresses under `spring-cloud-tencent-example` all point to the experience service address (`grpc://183.47.111.80:8091`) by default. 
+The example addresses under `spring-cloud-tencent-example` all point to the experience service
-If you only experience Spring Cloud Tencent, you can run any example directly with one click.  
+address (`grpc://183.47.111.80:8091`) by default. If you only experience Spring Cloud Tencent, you can run any example
+directly with one click.
 
 ## Screenshots
 
@@ -50,7 +53,8 @@ If you only experience Spring Cloud Tencent, you can run any example directly wi
 
 ## Use Guide
 
-All the components of Spring Cloud Tencent have been uploaded to the Maven central repository, just need to introduce dependencies.
+All the components of Spring Cloud Tencent have been uploaded to the Maven central repository, just need to introduce
+dependencies.
 
 For example:
 
@@ -79,7 +83,7 @@ For example:
 
 ````
 
- - ### Quick Start
+- ### Quick Start
     - [Spring Cloud Tencent Version Management](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-%E7%89%88%E6%9C%AC%E7%AE%A1%E7%90%86)
     - [Spring Cloud Tencent Discovery](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-Discovery-%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3)
     - [Spring Cloud Tencent Config](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-Config-%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3)
@@ -89,9 +93,9 @@ For example:
     - [Spring Cloud Tencent Metadata Transfer](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-Metadata-Transfer-%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
 
 - ### Development Documentation
-  - [Project Structure Overview](https://github.com/Tencent/spring-cloud-tencent/wiki/%E9%A1%B9%E7%9B%AE%E6%A6%82%E8%A7%88)
+    - [Project Structure Overview](https://github.com/Tencent/spring-cloud-tencent/wiki/%E9%A1%B9%E7%9B%AE%E6%A6%82%E8%A7%88)
-  - [Participate in co-construction](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%8F%82%E4%B8%8E%E5%85%B1%E5%BB%BA)
+    - [Participate in co-construction](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%8F%82%E4%B8%8E%E5%85%B1%E5%BB%BA)
-  
+
 ## Chat Group
 
 Please scan the QR code to join the chat group.
@@ -99,8 +103,9 @@ Please scan the QR code to join the chat group.
 <img src="https://user-images.githubusercontent.com/24446200/169198148-d4cc3494-3485-4515-9897-c8cb5504f706.png" width="30%" height="30%" />
 
 ## License
-The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE)
 
+The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in
+the file [LICENSE](LICENSE)
 
 ## Stargazers over time
 

changes/changes-1.5.3.md

@@ -0,0 +1,4 @@
+# Change Log
+---
+
+- [fix not load application.yml bug & fix guava version conflict bug](https://github.com/Tencent/spring-cloud-tencent/pull/287)

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

@@ -79,7 +79,6 @@ public class MetadataTransferAutoConfiguration {
 		public DecodeTransferMetadataServletFilter metadataServletFilter() {
 			return new DecodeTransferMetadataServletFilter();
 		}
-
 	}
 
 	/**
@@ -93,7 +92,6 @@ public class MetadataTransferAutoConfiguration {
 		public DecodeTransferMetadataReactiveFilter metadataReactiveFilter() {
 			return new DecodeTransferMetadataReactiveFilter();
 		}
-
 	}
 
 	/**
@@ -121,7 +119,6 @@ public class MetadataTransferAutoConfiguration {
 		public EncodeTransferMedataFeignInterceptor encodeTransferMedataFeignInterceptor() {
 			return new EncodeTransferMedataFeignInterceptor();
 		}
-
 	}
 
 	/**
@@ -197,9 +194,6 @@ public class MetadataTransferAutoConfiguration {
 				}
 				return bean;
 			}
-
 		}
-
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/CustomTransitiveMetadataResolver.java

@@ -33,12 +33,14 @@ import org.springframework.web.server.ServerWebExchange;
 
 /**
  * Resolve custom transitive metadata from request.
+ *
  * @author lepdou 2022-05-20
  */
-public class CustomTransitiveMetadataResolver {
+public final class CustomTransitiveMetadataResolver {
-
 	private static final String TRANSITIVE_HEADER_PREFIX = "X-SCT-Metadata-Transitive-";
 	private static final int TRANSITIVE_HEADER_PREFIX_LENGTH = TRANSITIVE_HEADER_PREFIX.length();
+	private CustomTransitiveMetadataResolver() {
+	}
 
 	public static Map<String, String> resolve(ServerWebExchange exchange) {
 		Map<String, String> result = new HashMap<>();

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java

@@ -95,5 +95,4 @@ public class DecodeTransferMetadataReactiveFilter implements WebFilter, Ordered
 
 		return JacksonUtils.deserialize2Map(customMetadataStr);
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java

@@ -88,5 +88,4 @@ public class DecodeTransferMetadataServletFilter extends OncePerRequestFilter {
 		// create custom metadata.
 		return JacksonUtils.deserialize2Map(customMetadataStr);
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java

@@ -71,5 +71,4 @@ public class EncodeTransferMedataFeignInterceptor implements RequestInterceptor,
 			}
 		}
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java

@@ -68,5 +68,4 @@ public class EncodeTransferMedataRestTemplateInterceptor implements ClientHttpRe
 		}
 		return clientHttpRequestExecution.execute(httpRequest, bytes);
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilter.java

@@ -78,5 +78,4 @@ public class EncodeTransferMedataScgFilter implements GlobalFilter, Ordered {
 
 		return chain.filter(exchange.mutate().request(builder.build()).build());
 	}
-
 }

spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfigurationTest.java

@@ -50,11 +50,11 @@ public class MetadataTransferAutoConfigurationTest {
 							.hasSingleBean(MetadataTransferAutoConfiguration.MetadataTransferRestTemplateConfig.class);
 					Assertions.assertThat(context).hasSingleBean(EncodeTransferMedataRestTemplateInterceptor.class);
 					Assertions.assertThat(context).hasSingleBean(
-							MetadataTransferAutoConfiguration.MetadataTransferRestTemplateConfig.EncodeTransferMetadataRestTemplatePostProcessor.class);
+							MetadataTransferAutoConfiguration.MetadataTransferRestTemplateConfig
+									.EncodeTransferMetadataRestTemplatePostProcessor.class);
 					Assertions.assertThat(context)
 							.hasSingleBean(MetadataTransferAutoConfiguration.MetadataTransferScgFilterConfig.class);
 					Assertions.assertThat(context).hasSingleBean(GlobalFilter.class);
 				});
 	}
-
 }

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

@@ -80,5 +80,4 @@ public class DecodeTransferMetadataReactiveFilterTest {
 				.isEqualTo("2");
 		Assertions.assertThat(metadataLocalProperties.getContent().get("c")).isNull();
 	}
-
 }

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

@@ -77,5 +77,4 @@ public class DecodeTransferMetadataServletFilterTest {
 	protected static class TestApplication {
 
 	}
-
 }

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

@@ -97,9 +97,6 @@ public class EncodeTransferMedataFeignInterceptorTest {
 				template.header(MetadataConstant.HeaderName.CUSTOM_METADATA,
 						"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
 			}
-
 		}
-
 	}
-
 }

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

@@ -85,7 +85,5 @@ public class EncodeTransferMedataRestTemplateInterceptorTest {
 				throws UnsupportedEncodingException {
 			return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");
 		}
-
 	}
-
 }

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

@@ -48,7 +48,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT,
 		classes = EncodeTransferMedataScgFilterTest.TestApplication.class,
-		properties = {"spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = reactive"})
+		properties = {"spring.config.location = classpath:application-test.yml",
+				"spring.main.web-application-type = reactive"})
 public class EncodeTransferMedataScgFilterTest {
 
 	@Autowired

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

@@ -68,5 +68,4 @@ public class PolarisCircuitBreakerBootstrapConfiguration {
 		}
 
 	}
-
 }

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

@@ -57,5 +57,4 @@ public class PolarisFeignClientAutoConfiguration {
 	public PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor(ConsumerAPI consumerAPI) {
 		return new PolarisFeignBeanPostProcessor(consumerAPI);
 	}
-
 }

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

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
 /**
- * Auto configuration PolarisRestTemplateAutoConfiguration .
+ * Auto configuration PolarisRestTemplateAutoConfiguration.
  *
  * @author wh 2022/6/21
  */
@@ -55,5 +55,4 @@ public class PolarisRestTemplateAutoConfiguration {
 			PolarisRestTemplateResponseErrorHandler restTemplateResponseErrorHandler) {
 		return new PolarisRestTemplateModifier(restTemplateResponseErrorHandler);
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java

@@ -86,5 +86,4 @@ public class PolarisFeignBeanPostProcessor implements BeanPostProcessor, BeanFac
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.factory = beanFactory;
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java

@@ -35,5 +35,4 @@ public class PolarisFeignBlockingLoadBalancerClient extends FeignBlockingLoadBal
 			LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
 		super(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java

@@ -60,7 +60,7 @@ public class PolarisFeignClient implements Client {
 		try {
 			Response response = delegate.execute(request, options);
 			// HTTP code greater than 500 is an exception
-			if (response.status() >= 500) {
+			if (response.status() > 500) {
 				resultRequest.setRetStatus(RetStatus.RetFail);
 			}
 			LOG.debug("Will report result of {}. Request=[{}]. Response=[{}].",
@@ -96,5 +96,4 @@ public class PolarisFeignClient implements Client {
 
 		return resultRequest;
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateModifier.java

@@ -29,15 +29,15 @@ import org.springframework.web.client.RestTemplate;
 
 /**
  * Auto configuration RestTemplate, Find the RestTemplate bean annotated with {@link LoadBalanced},
- * then replace {@link org.springframework.web.client.ResponseErrorHandler} with {@link PolarisRestTemplateResponseErrorHandler} .
+ * then replace {@link org.springframework.web.client.ResponseErrorHandler}
+ * with {@link PolarisRestTemplateResponseErrorHandler}.
  *
  * @author wh 2022/6/21
  */
 public class PolarisRestTemplateModifier implements ApplicationContextAware, SmartInitializingSingleton {
 
-	private ApplicationContext applicationContext;
-
 	private final PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler;
+	private ApplicationContext applicationContext;
 
 	public PolarisRestTemplateModifier(PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler) {
 		this.polarisRestTemplateResponseErrorHandler = polarisRestTemplateResponseErrorHandler;

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java

@@ -53,8 +53,8 @@ public class PolarisRestTemplateResponseErrorHandler implements ResponseErrorHan
 
 	private final PolarisResponseErrorHandler polarisResponseErrorHandler;
 
-
+	public PolarisRestTemplateResponseErrorHandler(
-	public PolarisRestTemplateResponseErrorHandler(ConsumerAPI consumerAPI, PolarisResponseErrorHandler polarisResponseErrorHandler) {
+			ConsumerAPI consumerAPI, PolarisResponseErrorHandler polarisResponseErrorHandler) {
 		this.consumerAPI = consumerAPI;
 		this.polarisResponseErrorHandler = polarisResponseErrorHandler;
 	}
@@ -111,5 +111,4 @@ public class PolarisRestTemplateResponseErrorHandler implements ResponseErrorHan
 		}
 		return resultRequest;
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java

@@ -32,14 +32,14 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PolarisCircuitBreakerBootstrapConfigurationTest {
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(PolarisCircuitBreakerBootstrapConfiguration.class))
-					AutoConfigurations.of(PolarisCircuitBreakerBootstrapConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
 	@Test
 	public void testDefaultInitialization() {
 		this.contextRunner.run(context -> {
-			assertThat(context).hasSingleBean(PolarisCircuitBreakerBootstrapConfiguration.CircuitBreakerConfigModifier.class);
+			assertThat(context).hasSingleBean(
+					PolarisCircuitBreakerBootstrapConfiguration.CircuitBreakerConfigModifier.class);
 		});
 	}
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java

@@ -35,11 +35,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PolarisFeignClientAutoConfigurationTest {
 
-	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(
-					AutoConfigurations.of(
+					PolarisContextAutoConfiguration.class,
-							PolarisContextAutoConfiguration.class,
+					PolarisFeignClientAutoConfiguration.class))
-							PolarisFeignClientAutoConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
 	@Test
@@ -49,5 +48,4 @@ public class PolarisFeignClientAutoConfigurationTest {
 			assertThat(context).hasSingleBean(PolarisFeignBeanPostProcessor.class);
 		});
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisRestTemplateAutoConfigurationTest.java

@@ -42,11 +42,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class PolarisRestTemplateAutoConfigurationTest {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(
-					AutoConfigurations.of(
+					PolarisRestTemplateAutoConfigurationTester.class,
-							PolarisRestTemplateAutoConfigurationTester.class,
+					PolarisContextAutoConfiguration.class,
-							PolarisContextAutoConfiguration.class,
+					PolarisRestTemplateAutoConfiguration.class))
-							PolarisRestTemplateAutoConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
 	@Test
@@ -68,5 +67,4 @@ public class PolarisRestTemplateAutoConfigurationTest {
 			return new RestTemplate();
 		}
 	}
-
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClientTest.java

@@ -90,7 +90,7 @@ public class PolarisFeignClientTest {
 				return Response.builder().request(request).status(200).build();
 			}
 			else if (request.httpMethod().equals(Request.HttpMethod.POST)) {
-				return Response.builder().request(request).status(500).build();
+				return Response.builder().request(request).status(502).build();
 			}
 			throw new IOException("Mock exception.");
 		}).when(delegate).execute(any(Request.class), nullable(Request.Options.class));
@@ -113,10 +113,10 @@ public class PolarisFeignClientTest {
 				Maps.newHashMap(), null, requestTemplate), null);
 		assertThat(response.status()).isEqualTo(200);
 
-		// 200
+		// 502
 		response = polarisFeignClient.execute(Request.create(Request.HttpMethod.POST, "http://localhost:8080/test",
 				Maps.newHashMap(), null, requestTemplate), null);
-		assertThat(response.status()).isEqualTo(500);
+		assertThat(response.status()).isEqualTo(502);
 
 		// Exception
 		try {

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/SimpleClientHttpResponseTest.java

@@ -102,5 +102,4 @@ public class SimpleClientHttpResponseTest extends AbstractClientHttpResponse {
 			// ignore
 		}
 	}
-
 }

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

@@ -57,5 +57,4 @@ public class PolarisConfigAutoConfiguration {
 	public PolarisConfigChangeEventListener polarisConfigChangeEventListener() {
 		return new PolarisConfigChangeEventListener();
 	}
-
 }

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

@@ -79,5 +79,4 @@ public class PolarisConfigBootstrapAutoConfiguration {
 			PolarisContextProperties polarisContextProperties) {
 		return new ConfigurationModifier(polarisConfigProperties, polarisContextProperties);
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java

@@ -204,5 +204,4 @@ public class PolarisConfigFileLocator implements PropertySourceLocator {
 
 		return new PolarisPropertySource(namespace, group, fileName, configKVFile, map);
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisPropertySource.java

@@ -74,5 +74,4 @@ public class PolarisPropertySource extends MapPropertySource {
 		return "PolarisPropertySource{" + "namespace='" + namespace + '\'' + ", group='" + group + '\'' + ", fileName='"
 				+ fileName + '\'' + '}';
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisPropertySourceAutoRefresher.java

@@ -51,12 +51,9 @@ public class PolarisPropertySourceAutoRefresher
 	private final PolarisConfigProperties polarisConfigProperties;
 
 	private final PolarisPropertySourceManager polarisPropertySourceManager;
-
-	private ApplicationContext applicationContext;
-
 	private final ContextRefresher contextRefresher;
-
 	private final AtomicBoolean registered = new AtomicBoolean(false);
+	private ApplicationContext applicationContext;
 
 	public PolarisPropertySourceAutoRefresher(PolarisConfigProperties polarisConfigProperties,
 			PolarisPropertySourceManager polarisPropertySourceManager, ContextRefresher contextRefresher) {
@@ -125,5 +122,4 @@ public class PolarisPropertySourceAutoRefresher
 			});
 		}
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisPropertySourceManager.java

@@ -39,5 +39,4 @@ public class PolarisPropertySourceManager {
 	public List<PolarisPropertySource> getAllPropertySources() {
 		return new ArrayList<>(polarisPropertySources.values());
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java

@@ -101,5 +101,4 @@ public class PolarisConfigAnnotationProcessor implements BeanPostProcessor, Prio
 
 		addChangeListener(configChangeListener, interestedKeys, interestedKeyPrefixes);
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java

@@ -54,5 +54,4 @@ public @interface PolarisConfigKVFileChangeListener {
 	 * @return interested key-prefixed in the listener
 	 */
 	String[] interestedKeyPrefixes() default {};
-
 }

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

@@ -56,5 +56,4 @@ public class ConfigFileGroup {
 	public String toString() {
 		return "ConfigFileGroup{" + "name='" + name + '\'' + ", file=" + files + '}';
 	}
-
 }

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

@@ -94,5 +94,4 @@ public class PolarisConfigProperties {
 	public void setGroups(List<ConfigFileGroup> groups) {
 		this.groups = groups;
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpoint.java

@@ -40,7 +40,8 @@ public class PolarisConfigEndpoint {
 	private final PolarisConfigProperties polarisConfigProperties;
 	private final PolarisPropertySourceManager polarisPropertySourceManager;
 
-	public PolarisConfigEndpoint(PolarisConfigProperties polarisConfigProperties, PolarisPropertySourceManager polarisPropertySourceManager) {
+	public PolarisConfigEndpoint(PolarisConfigProperties polarisConfigProperties,
+			PolarisPropertySourceManager polarisPropertySourceManager) {
 		this.polarisConfigProperties = polarisConfigProperties;
 		this.polarisPropertySourceManager = polarisPropertySourceManager;
 	}

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpointAutoConfiguration.java

@@ -43,7 +43,8 @@ public class PolarisConfigEndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnAvailableEndpoint
 	@ConditionalOnMissingBean
-	public PolarisConfigEndpoint polarisConfigEndpoint(PolarisConfigProperties polarisConfigProperties, PolarisPropertySourceManager polarisPropertySourceManager) {
+	public PolarisConfigEndpoint polarisConfigEndpoint(PolarisConfigProperties polarisConfigProperties,
+			PolarisPropertySourceManager polarisPropertySourceManager) {
 		return new PolarisConfigEndpoint(polarisConfigProperties, polarisPropertySourceManager);
 	}
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/enums/ConfigFileFormat.java

@@ -80,5 +80,4 @@ public enum ConfigFileFormat {
 		}
 		return true;
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/ConfigChangeEvent.java

@@ -84,5 +84,4 @@ public final class ConfigChangeEvent {
 	public Set<String> interestedChangedKeys() {
 		return interestedChangedKeys;
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/ConfigChangeListener.java

@@ -31,5 +31,4 @@ public interface ConfigChangeListener {
 	 * @param changeEvent the event for this change
 	 */
 	void onChange(ConfigChangeEvent changeEvent);
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigChangeEventListener.java

@@ -107,5 +107,4 @@ public final class PolarisConfigChangeEventListener implements ApplicationListen
 		});
 		return ret;
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java

@@ -55,37 +55,34 @@ import static com.tencent.polaris.configuration.api.core.ChangeType.MODIFIED;
  * @author Palmer Xu 2022-06-06
  */
 public final class PolarisConfigListenerContext {
-
 	/**
 	 * Logger instance.
 	 */
 	private static final Logger LOG = LoggerFactory.getLogger(PolarisConfigListenerContext.class);
-
 	/**
 	 * Execute service Atomic Reference Cache .
 	 */
 	private static final AtomicReference<ExecutorService> EAR = new AtomicReference<>();
-
 	/**
 	 * All custom {@link ConfigChangeListener} instance defined in application .
 	 */
 	private static final List<ConfigChangeListener> listeners = Lists.newCopyOnWriteArrayList();
-
 	/**
 	 * All custom interested keys defined in application .
 	 */
 	private static final Map<ConfigChangeListener, Set<String>> interestedKeys = Maps.newHashMap();
-
 	/**
 	 * All custom interested key prefixes defined in application .
 	 */
 	private static final Map<ConfigChangeListener, Set<String>> interestedKeyPrefixes = Maps.newHashMap();
-
 	/**
 	 * Cache all latest configuration information for users in the application environment .
 	 */
 	private static final Cache<String, Object> properties = CacheBuilder.newBuilder().build();
 
+	private PolarisConfigListenerContext() {
+	}
+
 	/**
 	 * Get or Created new execute server .
 	 * @return execute service instance of {@link ExecutorService}
@@ -273,5 +270,4 @@ public final class PolarisConfigListenerContext {
 
 		return Collections.unmodifiableSet(interestedChangedKeys);
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java

@@ -31,7 +31,8 @@ import com.tencent.polaris.configuration.api.core.ConfigKVFileChangeListener;
 
 /**
  * Mock config kv file for test.
- *@author lepdou 2022-06-11
+ *
+ * @author lepdou 2022-06-11
  */
 public class MockedConfigKVFile implements ConfigKVFile {
 

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocatorTest.java

@@ -41,12 +41,15 @@ import org.springframework.core.env.PropertySource;
 import static org.mockito.Mockito.when;
 
 /**
- * test for {@link PolarisConfigFileLocator}
+ * test for {@link PolarisConfigFileLocator}.
- *@author lepdou 2022-06-11
+ *
+ * @author lepdou 2022-06-11
  */
 @RunWith(MockitoJUnitRunner.class)
 public class PolarisConfigFileLocatorTest {
 
+	private final String testNamespace = "testNamespace";
+	private final String testServiceName = "testServiceName";
 	@Mock
 	private PolarisConfigProperties polarisConfigProperties;
 	@Mock
@@ -58,9 +61,6 @@ public class PolarisConfigFileLocatorTest {
 	@Mock
 	private Environment environment;
 
-	private final String testNamespace = "testNamespace";
-	private final String testServiceName = "testServiceName";
-
 	@Test
 	public void testLoadApplicationPropertiesFile() {
 		PolarisConfigFileLocator locator = new PolarisConfigFileLocator(polarisConfigProperties, polarisContextProperties,

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/PolarisPropertiesSourceAutoRefresherTest.java

@@ -38,12 +38,16 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
- * test for {@link PolarisPropertySourceAutoRefresher}
+ * test for {@link PolarisPropertySourceAutoRefresher}.
- *@author lepdou 2022-06-11
+ *
+ * @author lepdou 2022-06-11
  */
 @RunWith(MockitoJUnitRunner.class)
 public class PolarisPropertiesSourceAutoRefresherTest {
 
+	private final String testNamespace = "testNamespace";
+	private final String testServiceName = "testServiceName";
+	private final String testFileName = "application.properties";
 	@Mock
 	private PolarisConfigProperties polarisConfigProperties;
 	@Mock
@@ -51,10 +55,6 @@ public class PolarisPropertiesSourceAutoRefresherTest {
 	@Mock
 	private ContextRefresher contextRefresher;
 
-	private final String testNamespace = "testNamespace";
-	private final String testServiceName = "testServiceName";
-	private final String testFileName = "application.properties";
-
 	@Test
 	public void testConfigFileChanged() {
 		PolarisPropertySourceAutoRefresher refresher = new PolarisPropertySourceAutoRefresher(polarisConfigProperties,
@@ -118,5 +118,4 @@ public class PolarisPropertiesSourceAutoRefresherTest {
 		Assert.assertEquals("v1", polarisPropertySource.getProperty("k1"));
 		verify(contextRefresher).refresh();
 	}
-
 }

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/listener/ConfigChangeListenerTest.java

@@ -39,13 +39,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 
 /**
  * Integration testing for change listener.
- *@author lepdou 2022-06-11
+ *
+ * @author lepdou 2022-06-11
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = DEFINED_PORT,
 		classes = ConfigChangeListenerTest.TestApplication.class,
-		properties = {"server.port=8081",
+		properties = {"server.port=8081", "spring.config.location = classpath:application-test.yml"})
-				"spring.config.location = classpath:application-test.yml"})
 public class ConfigChangeListenerTest {
 
 	@Autowired
@@ -120,5 +120,4 @@ public class ConfigChangeListenerTest {
 			}
 		}
 	}
-
 }

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

@@ -27,9 +27,9 @@ import com.tencent.polaris.plugins.router.healthy.RecoverRouterConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- *  Spring Cloud Tencent config Override polaris config.
+ * Spring Cloud Tencent config Override polaris config.
  *
- *@author lepdou 2022-04-24
+ * @author lepdou 2022-04-24
  */
 public class DiscoveryConfigModifier implements PolarisConfigModifier {
 

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

@@ -41,7 +41,7 @@ import org.springframework.context.annotation.Import;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnPolarisEnabled
-@Import({ PolarisDiscoveryProperties.class, ConsulContextProperties.class })
+@Import({PolarisDiscoveryProperties.class, ConsulContextProperties.class})
 public class DiscoveryPropertiesAutoConfiguration {
 
 	@Autowired(required = false)
@@ -96,5 +96,4 @@ public class DiscoveryPropertiesAutoConfiguration {
 	public boolean isDiscoveryEnabled() {
 		return discoveryEnabled;
 	}
-
 }

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

@@ -256,7 +256,5 @@ public class PolarisDiscoveryProperties {
 		public int getOrder() {
 			return ContextConstant.ModifierOrder.LAST;
 		}
-
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java

@@ -46,5 +46,4 @@ public @interface PolarisClient {
 	 * @return namespace
 	 */
 	String namespace() default "";
-
 }

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

@@ -28,10 +28,12 @@ import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.context.annotation.Conditional;
 
 /**
+ * Condition if Polaris discovery is enabled.
+ *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnPolarisEnabled
 @Conditional(DiscoveryEnabledCondition.class)

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

@@ -34,13 +34,12 @@ public class DiscoveryEnabledCondition implements Condition {
 		boolean isDiscoveryEnabled = Boolean.parseBoolean(
 				conditionContext.getEnvironment().getProperty("spring.cloud.polaris.discovery.enabled", "true"));
 
-		boolean isConsulDiscoveryEnabled = Boolean
+		boolean isConsulDiscoveryEnabled = Boolean.parseBoolean(
-				.parseBoolean(conditionContext.getEnvironment().getProperty("spring.cloud.consul.enabled", "false"))
+				conditionContext.getEnvironment().getProperty("spring.cloud.consul.enabled", "false"))
-				&& Boolean.parseBoolean(
+				&& Boolean.parseBoolean(conditionContext.getEnvironment()
-						conditionContext.getEnvironment().getProperty("spring.cloud.consul.discovery.enabled", "true"));
+				.getProperty("spring.cloud.consul.discovery.enabled", "true"));
 
 		isDiscoveryEnabled |= isConsulDiscoveryEnabled;
 		return isDiscoveryEnabled;
 	}
-
 }

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

@@ -43,5 +43,4 @@ public class PolarisDiscoveryAutoConfiguration {
 			PolarisDiscoveryHandler polarisDiscoveryHandler) {
 		return new PolarisServiceDiscovery(polarisDiscoveryHandler);
 	}
-
 }

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

@@ -54,5 +54,4 @@ public class PolarisDiscoveryClient implements DiscoveryClient {
 	public List<String> getServices() {
 		return polarisServiceDiscovery.getServices();
 	}
-
 }

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

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBlockingDiscoveryEnabled
-@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class })
+@AutoConfigureBefore({SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class})
 @AutoConfigureAfter(PolarisDiscoveryAutoConfiguration.class)
 public class PolarisDiscoveryClientConfiguration {
 
@@ -41,5 +41,4 @@ public class PolarisDiscoveryClientConfiguration {
 	public DiscoveryClient polarisDiscoveryClient(PolarisServiceDiscovery polarisServiceDiscovery) {
 		return new PolarisDiscoveryClient(polarisServiceDiscovery);
 	}
-
 }

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

@@ -95,5 +95,4 @@ public class PolarisDiscoveryHandler {
 		request.setNamespace(namespace);
 		return polarisConsumer.getServices(request);
 	}
-
 }

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

@@ -31,6 +31,8 @@ import com.tencent.polaris.api.rpc.InstancesResponse;
 import org.springframework.cloud.client.ServiceInstance;
 
 /**
+ * Polaris service discovery service.
+ *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng
  */
 public class PolarisServiceDiscovery {
@@ -66,5 +68,4 @@ public class PolarisServiceDiscovery {
 		return polarisDiscoveryHandler.GetServices().getServices().stream().map(ServiceInfo::getService)
 				.collect(Collectors.toList());
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClient.java

@@ -82,5 +82,4 @@ public class PolarisReactiveDiscoveryClient implements ReactiveDiscoveryClient {
 			}
 		}).subscribeOn(Schedulers.boundedElastic());
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfiguration.java

@@ -36,9 +36,8 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnReactiveDiscoveryEnabled
-@AutoConfigureAfter({ PolarisDiscoveryAutoConfiguration.class,
+@AutoConfigureAfter({PolarisDiscoveryAutoConfiguration.class, ReactiveCompositeDiscoveryClientAutoConfiguration.class})
-		ReactiveCompositeDiscoveryClientAutoConfiguration.class })
+@AutoConfigureBefore({ReactiveCommonsClientAutoConfiguration.class})
-@AutoConfigureBefore({ ReactiveCommonsClientAutoConfiguration.class })
 public class PolarisReactiveDiscoveryClientConfiguration {
 
 	@Bean
@@ -47,5 +46,4 @@ public class PolarisReactiveDiscoveryClientConfiguration {
 			PolarisServiceDiscovery polarisServiceDiscovery) {
 		return new PolarisReactiveDiscoveryClient(polarisServiceDiscovery);
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/refresh/PolarisRefreshApplicationReadyEventListener.java

@@ -39,7 +39,8 @@ import static com.tencent.cloud.polaris.discovery.refresh.PolarisServiceStatusCh
  *
  * @author Haotian Zhang
  */
-public class PolarisRefreshApplicationReadyEventListener implements ApplicationListener<ApplicationReadyEvent>, ApplicationEventPublisherAware, DisposableBean {
+public class PolarisRefreshApplicationReadyEventListener
+		implements ApplicationListener<ApplicationReadyEvent>, ApplicationEventPublisherAware, DisposableBean {
 
 	private static final Logger LOG = LoggerFactory.getLogger(PolarisRefreshApplicationReadyEventListener.class);
 	private static final int DELAY = 60;

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/refresh/PolarisServiceStatusChangeListener.java

@@ -35,7 +35,8 @@ import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.util.CollectionUtils;
 
 /**
- * Change listener of Polaris service info. When service info is created or deleted, or, instance of service is from 0 to
+ * Change listener of Polaris service info. When service info is created or deleted, or, instance of service is from
+ * 0 to many.
  *
  * @author Haotian Zhang
  */

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPoint.java

@@ -45,7 +45,8 @@ public class PolarisDiscoveryEndPoint {
 	private final DiscoveryClient polarisDiscoveryClient;
 	private final PolarisDiscoveryHandler polarisDiscoveryHandler;
 
-	public PolarisDiscoveryEndPoint(PolarisDiscoveryProperties polarisDiscoveryProperties, DiscoveryClient polarisDiscoveryClient, PolarisDiscoveryHandler polarisDiscoveryHandler) {
+	public PolarisDiscoveryEndPoint(PolarisDiscoveryProperties polarisDiscoveryProperties,
+			DiscoveryClient polarisDiscoveryClient, PolarisDiscoveryHandler polarisDiscoveryHandler) {
 		this.polarisDiscoveryProperties = polarisDiscoveryProperties;
 		this.polarisDiscoveryClient = polarisDiscoveryClient;
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;
@@ -53,16 +54,16 @@ public class PolarisDiscoveryEndPoint {
 
 	@ReadOperation
 	public Map<String, Object> polarisDiscovery(@Selector String serviceId) {
-		Map<String, Object> polarisDisConveryInfo = new HashMap<>();
+		Map<String, Object> polarisDiscoveryInfo = new HashMap<>();
-		polarisDisConveryInfo.put("PolarisDiscoveryProperties", polarisDiscoveryProperties);
+		polarisDiscoveryInfo.put("PolarisDiscoveryProperties", polarisDiscoveryProperties);
 
 		List<ServiceInstances> serviceInstancesInfoList = new ArrayList<>();
 
 		if (StringUtils.isNotEmpty(serviceId)) {
 			ServiceInstances serviceInstances = getServiceInstances(serviceId);
 			serviceInstancesInfoList.add(serviceInstances);
-			polarisDisConveryInfo.put("ServiceInstances", serviceInstancesInfoList);
+			polarisDiscoveryInfo.put("ServiceInstances", serviceInstancesInfoList);
-			return polarisDisConveryInfo;
+			return polarisDiscoveryInfo;
 		}
 
 		for (String service : polarisDiscoveryClient.getServices()) {
@@ -70,8 +71,8 @@ public class PolarisDiscoveryEndPoint {
 			serviceInstancesInfoList.add(serviceInstances);
 		}
 
-		polarisDisConveryInfo.put("ServiceInstances", serviceInstancesInfoList);
+		polarisDiscoveryInfo.put("ServiceInstances", serviceInstancesInfoList);
-		return polarisDisConveryInfo;
+		return polarisDiscoveryInfo;
 	}
 
 	private ServiceInstances getServiceInstances(String serviceId) {

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java

@@ -166,5 +166,4 @@ public class ConsulContextProperties {
 		}
 
 	}
-
 }

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

@@ -27,10 +27,12 @@ import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
 import org.springframework.context.annotation.Conditional;
 
 /**
+ * Condition if Polaris registry is enabled.
+ *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
 @ConditionalOnPolarisEnabled
 @Conditional(RegisterEnabledCondition.class)
 public @interface ConditionalOnPolarisRegisterEnabled {

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

@@ -93,5 +93,4 @@ public class PolarisAutoServiceRegistration extends AbstractAutoServiceRegistrat
 		String appName = registration.getPolarisProperties().getService();
 		return StringUtils.isEmpty(appName) ? super.getAppName() : appName;
 	}
-
 }

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

@@ -220,5 +220,4 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			}
 		}, ttl, ttl, TimeUnit.SECONDS);
 	}
-
 }

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

@@ -33,13 +33,12 @@ public class RegisterEnabledCondition implements Condition {
 		boolean isRegisterEnabled = Boolean.parseBoolean(
 				conditionContext.getEnvironment().getProperty("spring.cloud.polaris.discovery.register", "true"));
 
-		boolean isConsulRegisterEnabled = Boolean
+		boolean isConsulRegisterEnabled = Boolean.parseBoolean(
-				.parseBoolean(conditionContext.getEnvironment().getProperty("spring.cloud.consul.enabled", "false"))
+				conditionContext.getEnvironment().getProperty("spring.cloud.consul.enabled", "false"))
 				&& Boolean.parseBoolean(conditionContext.getEnvironment()
-						.getProperty("spring.cloud.consul.discovery.register", "true"));
+				.getProperty("spring.cloud.consul.discovery.register", "true"));
 
 		isRegisterEnabled |= isConsulRegisterEnabled;
 		return isRegisterEnabled;
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java

@@ -86,5 +86,4 @@ public final class OkHttpUtil {
 			});
 		}
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfigurationTest.java

@@ -30,7 +30,6 @@ 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.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import static com.tencent.polaris.test.common.Consts.PORT;
@@ -46,11 +45,14 @@ public class PolarisDiscoveryAutoConfigurationTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(PolarisContextAutoConfiguration.class,
+			.withConfiguration(AutoConfigurations.of(
-					PolarisDiscoveryAutoConfiguration.class, PolarisDiscoveryClientConfiguration.class,
+					PolarisContextAutoConfiguration.class,
+					PolarisDiscoveryAutoConfiguration.class,
+					PolarisDiscoveryClientConfiguration.class,
 					PolarisContextAutoConfiguration.class))
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081");
 
 	@BeforeClass
@@ -59,7 +61,7 @@ public class PolarisDiscoveryAutoConfigurationTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -77,9 +79,7 @@ public class PolarisDiscoveryAutoConfigurationTest {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisDiscoveryAutoConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientConfigurationTest.java

@@ -26,7 +26,6 @@ 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.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import static com.tencent.polaris.test.common.Consts.PORT;
@@ -42,10 +41,13 @@ public class PolarisDiscoveryClientConfigurationTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(PolarisContextAutoConfiguration.class,
+			.withConfiguration(AutoConfigurations.of(
-					PolarisDiscoveryClientConfiguration.class, PolarisContextAutoConfiguration.class))
+					PolarisContextAutoConfiguration.class,
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+					PolarisDiscoveryClientConfiguration.class,
+					PolarisContextAutoConfiguration.class))
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081");
 
 	@BeforeClass
@@ -54,7 +56,7 @@ public class PolarisDiscoveryClientConfigurationTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -73,9 +75,7 @@ public class PolarisDiscoveryClientConfigurationTest {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisDiscoveryClientConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java

@@ -32,7 +32,6 @@ 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.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
@@ -49,12 +48,15 @@ public class PolarisServiceDiscoveryTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(PolarisContextAutoConfiguration.class,
+			.withConfiguration(AutoConfigurations.of(
+					PolarisContextAutoConfiguration.class,
 					PolarisServiceDiscoveryTest.PolarisPropertiesConfiguration.class,
-					PolarisDiscoveryClientConfiguration.class, PolarisDiscoveryAutoConfiguration.class,
+					PolarisDiscoveryClientConfiguration.class,
+					PolarisDiscoveryAutoConfiguration.class,
 					PolarisContextAutoConfiguration.class))
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
 			.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
 			.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
@@ -73,7 +75,7 @@ public class PolarisServiceDiscoveryTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -104,9 +106,7 @@ public class PolarisServiceDiscoveryTest {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisPropertiesConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfigurationTest.java

@@ -27,7 +27,6 @@ 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.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import static com.tencent.polaris.test.common.Consts.PORT;
@@ -43,11 +42,13 @@ public class PolarisReactiveDiscoveryClientConfigurationTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(PolarisContextAutoConfiguration.class,
+			.withConfiguration(AutoConfigurations.of(
+					PolarisContextAutoConfiguration.class,
 					PolarisReactiveDiscoveryClientConfiguration.class, PolarisDiscoveryClientConfiguration.class,
 					PolarisContextAutoConfiguration.class))
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081");
 
 	@BeforeClass
@@ -56,7 +57,7 @@ public class PolarisReactiveDiscoveryClientConfigurationTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -69,9 +70,7 @@ public class PolarisReactiveDiscoveryClientConfigurationTest {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisReactiveDiscoveryClientConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/PolarisServiceStatusChangeListenerTest.java

@@ -64,7 +64,8 @@ public class PolarisServiceStatusChangeListenerTest {
 		polarisServiceStatusChangeListener.setApplicationEventPublisher(publisher);
 
 		// Service update event
-		ServiceEventKey serviceUpdateEventKey = new ServiceEventKey(new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER), ServiceEventKey.EventType.SERVICE);
+		ServiceEventKey serviceUpdateEventKey = new ServiceEventKey(
+				new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER), ServiceEventKey.EventType.SERVICE);
 		ServiceInfo serviceInfo = new ServiceInfo();
 		serviceInfo.setNamespace(NAMESPACE_TEST);
 		serviceInfo.setService(SERVICE_PROVIDER);
@@ -81,7 +82,8 @@ public class PolarisServiceStatusChangeListenerTest {
 
 
 		// Instance update event
-		ServiceEventKey instanceUpdateEventKey = new ServiceEventKey(new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER), ServiceEventKey.EventType.INSTANCE);
+		ServiceEventKey instanceUpdateEventKey = new ServiceEventKey(
+				new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER), ServiceEventKey.EventType.INSTANCE);
 		DefaultInstance instance = new DefaultInstance();
 		instance.setNamespace(NAMESPACE_TEST);
 		instance.setService(SERVICE_PROVIDER);
@@ -96,7 +98,7 @@ public class PolarisServiceStatusChangeListenerTest {
 			instances.set(oldInstances, Collections.emptyList());
 			ServiceInstancesByProto newInstances = new ServiceInstancesByProto();
 			instances.set(newInstances, Collections.singletonList(instance));
-			polarisServiceStatusChangeListener.onResourceUpdated(serviceUpdateEventKey, oldInstances, newInstances);
+			polarisServiceStatusChangeListener.onResourceUpdated(instanceUpdateEventKey, oldInstances, newInstances);
 			verify(publisher, times(2)).publishEvent(any(ApplicationEvent.class));
 
 			// No need update
@@ -104,7 +106,7 @@ public class PolarisServiceStatusChangeListenerTest {
 			instances.set(oldInstances, Collections.singletonList(instance));
 			newInstances = new ServiceInstancesByProto();
 			instances.set(newInstances, Collections.singletonList(instance));
-			polarisServiceStatusChangeListener.onResourceUpdated(serviceUpdateEventKey, oldInstances, newInstances);
+			polarisServiceStatusChangeListener.onResourceUpdated(instanceUpdateEventKey, oldInstances, newInstances);
 			verify(publisher, times(2)).publishEvent(any(ApplicationEvent.class));
 		}
 		catch (NoSuchFieldException | IllegalAccessException e) {

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndPointTest.java

@@ -33,7 +33,6 @@ 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.discovery.DiscoveryClient;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
@@ -59,8 +58,7 @@ public class PolarisDiscoveryEndPointTest {
 			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
 			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
-			.withPropertyValues(
+			.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
-					"spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
 			.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
 
 	@BeforeClass
@@ -69,7 +67,7 @@ public class PolarisDiscoveryEndPointTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -83,20 +81,18 @@ public class PolarisDiscoveryEndPointTest {
 			DiscoveryClient discoveryClient = context
 					.getBean(PolarisDiscoveryClient.class);
 			PolarisDiscoveryHandler polarisDiscoveryHandler = context.getBean(PolarisDiscoveryHandler.class);
-			PolarisDiscoveryEndPoint polarisDiscoveryEndPoint = new PolarisDiscoveryEndPoint(polarisDiscoveryProperties, discoveryClient, polarisDiscoveryHandler);
+			PolarisDiscoveryEndPoint polarisDiscoveryEndPoint =
+					new PolarisDiscoveryEndPoint(polarisDiscoveryProperties, discoveryClient, polarisDiscoveryHandler);
 
 			Map<String, Object> mapInfo = polarisDiscoveryEndPoint.polarisDiscovery("java_provider_test");
 
 			assertThat(polarisDiscoveryProperties).isEqualTo(mapInfo.get("PolarisDiscoveryProperties"));
-
 		});
 	}
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisPropertiesConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java

@@ -140,5 +140,4 @@ public class PolarisAutoServiceRegistrationTest {
 		doReturn(SERVICE_PROVIDER).when(polarisDiscoveryProperties).getService();
 		assertThat(polarisAutoServiceRegistration.getAppName()).isEqualTo(SERVICE_PROVIDER);
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfigurationTest.java

@@ -28,7 +28,6 @@ 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.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 
@@ -45,10 +44,13 @@ public class PolarisServiceRegistryAutoConfigurationTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(PolarisContextAutoConfiguration.class,
+			.withConfiguration(AutoConfigurations.of(
-					PolarisServiceRegistryAutoConfiguration.class, PolarisDiscoveryClientConfiguration.class))
+					PolarisContextAutoConfiguration.class,
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+					PolarisServiceRegistryAutoConfiguration.class,
+					PolarisDiscoveryClientConfiguration.class))
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081");
 
 	@BeforeClass
@@ -57,7 +59,7 @@ public class PolarisServiceRegistryAutoConfigurationTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -73,9 +75,7 @@ public class PolarisServiceRegistryAutoConfigurationTest {
 
 	@Configuration
 	@EnableAutoConfiguration
-	@EnableDiscoveryClient
 	static class PolarisServiceRegistryAutoConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryTest.java

@@ -49,11 +49,14 @@ public class PolarisServiceRegistryTest {
 
 	private static NamingServer namingServer;
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(
-					AutoConfigurations.of(PolarisContextAutoConfiguration.class, PolarisPropertiesConfiguration.class,
+					PolarisContextAutoConfiguration.class,
-							PolarisDiscoveryClientConfiguration.class, PolarisDiscoveryAutoConfiguration.class))
+					PolarisPropertiesConfiguration.class,
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER).withPropertyValues("server.port=" + PORT)
+					PolarisDiscoveryClientConfiguration.class,
+					PolarisDiscoveryAutoConfiguration.class))
+			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
+			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
 			.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
 			.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
@@ -67,7 +70,7 @@ public class PolarisServiceRegistryTest {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -126,5 +129,4 @@ public class PolarisServiceRegistryTest {
 	static class PolarisPropertiesConfiguration {
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitAutoConfiguration.java

@@ -115,5 +115,4 @@ public class PolarisRateLimitAutoConfiguration {
 		}
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/RateLimitConfigModifier.java

@@ -28,7 +28,7 @@ import com.tencent.polaris.factory.config.ConfigurationImpl;
  */
 public class RateLimitConfigModifier implements PolarisConfigModifier {
 
-	private PolarisRateLimitProperties polarisRateLimitProperties;
+	private final PolarisRateLimitProperties polarisRateLimitProperties;
 
 	public RateLimitConfigModifier(PolarisRateLimitProperties polarisRateLimitProperties) {
 		this.polarisRateLimitProperties = polarisRateLimitProperties;

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/constant/RateLimitConstant.java

@@ -44,5 +44,4 @@ public final class RateLimitConstant {
 
 	private RateLimitConstant() {
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java

@@ -97,5 +97,4 @@ public class PolarisRateLimitRuleEndpoint {
 		}
 		return rateLimitRule;
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointAutoConfiguration.java

@@ -46,5 +46,4 @@ public class PolarisRateLimitRuleEndpointAutoConfiguration {
 	public PolarisRateLimitRuleEndpoint polarisRateLimitRuleEndpoint(ServiceRuleManager serviceRuleManager, PolarisRateLimitProperties properties) {
 		return new PolarisRateLimitRuleEndpoint(serviceRuleManager, properties);
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java

@@ -162,5 +162,4 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 		Set<String> expressionLabels = rateLimitRuleLabelResolver.getExpressionLabelKeys(namespace, service);
 		return ExpressionLabelUtils.resolve(exchange, expressionLabels);
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java

@@ -105,6 +105,7 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 			}
 			// Unirate
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultOk && quotaResponse.getWaitMs() > 0) {
+				LOG.debug("Unirate sleep for {}ms.", quotaResponse.getWaitMs());
 				Thread.sleep(quotaResponse.getWaitMs());
 			}
 

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/spi/PolarisRateLimiterLabelReactiveResolver.java

@@ -31,9 +31,9 @@ public interface PolarisRateLimiterLabelReactiveResolver {
 
 	/**
 	 * Resolve custom label from request.
+	 *
 	 * @param exchange the http request
 	 * @return resolved labels
 	 */
 	Map<String, String> resolve(ServerWebExchange exchange);
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/spi/PolarisRateLimiterLabelServletResolver.java

@@ -31,6 +31,7 @@ public interface PolarisRateLimiterLabelServletResolver {
 
 	/**
 	 * Resolve custom label from request.
+	 *
 	 * @param request the http request
 	 * @return resolved labels
 	 */

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/utils/QuotaCheckUtils.java

@@ -55,5 +55,4 @@ public final class QuotaCheckUtils {
 			return new QuotaResponse(new QuotaResult(QuotaResult.Code.QuotaResultOk, 0, "get quota failed"));
 		}
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/utils/RateLimitUtils.java

@@ -63,5 +63,4 @@ public final class RateLimitUtils {
 
 		return RateLimitConstant.QUOTA_LIMITED_INFO;
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java

@@ -42,13 +42,11 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class RateLimitRuleLabelResolverTest {
 
-	private ServiceRuleManager serviceRuleManager;
-
 	private RateLimitRuleLabelResolver rateLimitRuleLabelResolver;
 
 	@Before
 	public void setUp() {
-		serviceRuleManager = mock(ServiceRuleManager.class);
+		ServiceRuleManager serviceRuleManager = mock(ServiceRuleManager.class);
 		when(serviceRuleManager.getServiceRateLimitRule(any(), anyString())).thenAnswer(invocationOnMock -> {
 			String serviceName = invocationOnMock.getArgument(1).toString();
 			if (serviceName.equals("TestApp1")) {

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitAutoConfigurationTest.java

@@ -39,11 +39,12 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PolarisRateLimitAutoConfigurationTest {
 
-	private ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner();
+	private final ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner();
 
-	private WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner();
+	private final WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner();
 
-	private ReactiveWebApplicationContextRunner reactiveWebApplicationContextRunner = new ReactiveWebApplicationContextRunner();
+	private final ReactiveWebApplicationContextRunner reactiveWebApplicationContextRunner =
+			new ReactiveWebApplicationContextRunner();
 
 	@Test
 	public void testNoWebApplication() {

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesAutoConfigurationTest.java

@@ -31,9 +31,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PolarisRateLimitPropertiesAutoConfigurationTest {
 
-	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(PolarisRateLimitPropertiesAutoConfiguration.class));
-					AutoConfigurations.of(PolarisRateLimitPropertiesAutoConfiguration.class));
 
 	@Test
 	public void testDefaultInitialization() {

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesBootstrapConfigurationTest.java

@@ -31,9 +31,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PolarisRateLimitPropertiesBootstrapConfigurationTest {
 
-	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(
+			.withConfiguration(AutoConfigurations.of(PolarisRateLimitPropertiesBootstrapConfiguration.class))
-					AutoConfigurations.of(PolarisRateLimitPropertiesBootstrapConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.enabled=true");
 
 	@Test

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/controller/CalleeControllerTests.java

@@ -56,9 +56,9 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		classes = { CalleeControllerTests.Config.class, TestController.class },
+		classes = {CalleeControllerTests.Config.class, TestController.class},
-		properties = { "spring.application.name=java_provider_test", "spring.cloud.polaris.discovery.namespace=Test",
+		properties = {"spring.application.name=java_provider_test", "spring.cloud.polaris.discovery.namespace=Test",
-				"spring.cloud.polaris.address=grpc://127.0.0.1:10081" })
+				"spring.cloud.polaris.address=grpc://127.0.0.1:10081"})
 public class CalleeControllerTests {
 
 	private static NamingServer namingServer;
@@ -86,7 +86,7 @@ public class CalleeControllerTests {
 	}
 
 	@AfterClass
-	public static void afterClass() throws Exception {
+	public static void afterClass() {
 		if (null != namingServer) {
 			namingServer.terminate();
 		}
@@ -142,5 +142,4 @@ public class CalleeControllerTests {
 		}
 
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/controller/TestController.java

@@ -34,5 +34,4 @@ public class TestController {
 	public String info() throws Exception {
 		return "hello service info";
 	}
-
 }

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java

@@ -51,7 +51,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class PolarisRateLimitRuleEndpointTests {
 
-	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
+	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(
 					PolarisRateLimitRuleEndpointTests.PolarisRateLimitAutoConfiguration.class,
 					PolarisRateLimitRuleEndpointAutoConfiguration.class,
@@ -60,8 +60,7 @@ public class PolarisRateLimitRuleEndpointTests {
 			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
 			.withPropertyValues("server.port=" + PORT)
 			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
-			.withPropertyValues(
+			.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
-					"spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
 			.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
 
 	private ServiceRuleManager serviceRuleManager;