From f0035d3f692cd0938db3f1dd9b1a04d9ce1658c4 Mon Sep 17 00:00:00 2001 From: DerekYRC <44155264+DerekYRC@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:35:39 +0800 Subject: [PATCH] Fix typo & Code optimization (#511) * Fix typo & Code optimization * update changelog --- CHANGELOG.md | 1 + .../cloud/polaris/discovery/PolarisDiscoveryHandler.java | 2 +- .../cloud/polaris/discovery/PolarisServiceDiscovery.java | 4 ++-- .../config/PolarisRateLimitPropertiesAutoConfiguration.java | 4 ++-- .../cloud/polaris/ratelimit/constant/RateLimitConstant.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 371cb3d58..0f6979ab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,3 +16,4 @@ - [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/497) - [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/499) - [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/503) +- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/511) \ No newline at end of file diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 2482c263d..2388c1381 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -89,7 +89,7 @@ public class PolarisDiscoveryHandler { * Return all service for given namespace. * @return service list */ - public ServicesResponse GetServices() { + public ServicesResponse getServices() { String namespace = polarisDiscoveryProperties.getNamespace(); GetServicesRequest request = new GetServicesRequest(); request.setNamespace(namespace); diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java index 85c79897d..6ef1eacfc 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java @@ -67,10 +67,10 @@ public class PolarisServiceDiscovery { * @throws PolarisException polarisException */ public List getServices() throws PolarisException { - if (CollectionUtils.isEmpty(polarisDiscoveryHandler.GetServices().getServices())) { + if (CollectionUtils.isEmpty(polarisDiscoveryHandler.getServices().getServices())) { return Collections.emptyList(); } - return polarisDiscoveryHandler.GetServices().getServices().stream() + return polarisDiscoveryHandler.getServices().getServices().stream() .map(ServiceInfo::getService).collect(Collectors.toList()); } } diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesAutoConfiguration.java index e00d6f635..672a1dae2 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/config/PolarisRateLimitPropertiesAutoConfiguration.java @@ -20,9 +20,9 @@ package com.tencent.cloud.polaris.ratelimit.config; import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** * Properties auto configuration of rate limit. @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisEnabled -@Import({PolarisRateLimitProperties.class}) +@EnableConfigurationProperties(PolarisRateLimitProperties.class) public class PolarisRateLimitPropertiesAutoConfiguration { @Bean diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/constant/RateLimitConstant.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/constant/RateLimitConstant.java index 22f11ed04..814bed565 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/constant/RateLimitConstant.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/constant/RateLimitConstant.java @@ -35,7 +35,7 @@ public final class RateLimitConstant { /** * Info of rate limit. */ - public static String QUOTA_LIMITED_INFO = "The request is deny by rate limit because the throttling threshold is reached"; + public static String QUOTA_LIMITED_INFO = "The request is denied by rate limit because the throttling threshold is reached"; /** * The build in label method.