From 4aa91e4ee5aac973ba971abea120d50ccfbbdd55 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Mon, 2 Sep 2024 10:24:00 +0800 Subject: [PATCH] fix:fix actuator name warning from #1428 . --- CHANGELOG.md | 3 ++- pom.xml | 2 +- .../endpoint/PolarisCircuitBreakerEndpoint.java | 2 +- .../cloud/polaris/config/endpoint/PolarisConfigEndpoint.java | 2 +- .../cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java | 2 +- .../ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java | 2 +- .../cloud/polaris/router/endpoint/PolarisRouterEndpoint.java | 2 +- .../common/metadata/endpoint/PolarisMetadataEndpoint.java | 2 +- spring-cloud-tencent-dependencies/pom.xml | 4 ++-- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1942ca4c00..bdf8d4dbfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,4 +31,5 @@ - [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1371) - [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1373) - [fix: fix TSF context bootstrap configuration](https://github.com/Tencent/spring-cloud-tencent/pull/1395) -- [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1418) \ No newline at end of file +- [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1418) +- [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1429) \ No newline at end of file diff --git a/pom.xml b/pom.xml index f7c34a006d..5781df978e 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 2.0.0.0-2022.0.5-RC1 + 2.0.0.0-2022.0.5-SNAPSHOT 6.0.22 diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpoint.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpoint.java index f9ada51210..3b49979152 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpoint.java @@ -41,7 +41,7 @@ * * @author wenxuan70 */ -@Endpoint(id = "polaris-circuit-breaker") +@Endpoint(id = "polariscircuitbreaker") public class PolarisCircuitBreakerEndpoint { private static final Logger LOG = LoggerFactory.getLogger(PolarisCircuitBreakerEndpoint.class); diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpoint.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpoint.java index 2740d0fe22..52bdff7564 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/endpoint/PolarisConfigEndpoint.java @@ -33,7 +33,7 @@ * * @author shuiqingliu **/ -@Endpoint(id = "polaris-config") +@Endpoint(id = "polarisconfig") public class PolarisConfigEndpoint { private final PolarisConfigProperties polarisConfigProperties; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java index 6603896d27..fde9de58d3 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java @@ -38,7 +38,7 @@ * * @author shuiqingliu */ -@Endpoint(id = "polaris-discovery") +@Endpoint(id = "polarisdiscovery") public class PolarisDiscoveryEndpoint { private final PolarisDiscoveryProperties polarisDiscoveryProperties; diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java index 9aba2592de..0e29b69288 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java @@ -41,7 +41,7 @@ * * @author shuiqingliu **/ -@Endpoint(id = "polaris-ratelimit") +@Endpoint(id = "polarisratelimit") public class PolarisRateLimitRuleEndpoint { private static final Logger LOG = LoggerFactory.getLogger(PolarisRateLimitRuleEndpoint.class); diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java index 661af3a1cd..959c2677d4 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java @@ -43,7 +43,7 @@ * * @author lepdou 2022-07-25 */ -@Endpoint(id = "polaris-router") +@Endpoint(id = "polarisrouter") public class PolarisRouterEndpoint { private static final Logger LOGGER = LoggerFactory.getLogger(PolarisRouterEndpoint.class); diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/endpoint/PolarisMetadataEndpoint.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/endpoint/PolarisMetadataEndpoint.java index bf22ce3276..b21ab2f92f 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/endpoint/PolarisMetadataEndpoint.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/endpoint/PolarisMetadataEndpoint.java @@ -30,7 +30,7 @@ * * @author shuiqingliu **/ -@Endpoint(id = "polaris-metadata") +@Endpoint(id = "polarismetadata") public class PolarisMetadataEndpoint { private final StaticMetadataManager staticMetadataManager; diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 7584d60a96..a31c20ede3 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,10 +71,10 @@ - 2.0.0.0-2022.0.5-RC1 + 2.0.0.0-2022.0.5-SNAPSHOT - 2.0.0.0-RC1 + 2.0.0.0-SNAPSHOT 32.0.1-jre