From b82ff9e08d5aefbd2eae8452786c636fbffd51bc Mon Sep 17 00:00:00 2001
From: Haotian Zhang <skyebefreeman@qq.com>
Date: Mon, 2 Sep 2024 11:00:31 +0800
Subject: [PATCH] fix:fix actuator name warning from #1428 . (#1429)
---
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 1942ca4c0..bdf8d4dbf 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 f7c34a006..5781df978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<properties>
<!-- Project revision -->
- <revision>2.0.0.0-2022.0.5-RC1</revision>
+ <revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
<!-- Spring Framework -->
<spring.framework.version>6.0.22</spring.framework.version>
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 f9ada5121..3b4997915 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 @@ import org.springframework.boot.actuate.endpoint.annotation.Selector;
*
* @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 2740d0fe2..52bdff756 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 @@ import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
*
* @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 6603896d2..fde9de58d 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 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
*
* @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 9aba2592d..0e29b6928 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 @@ import org.springframework.util.CollectionUtils;
*
* @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 661af3a1c..959c2677d 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 @@ import org.springframework.util.StringUtils;
*
* @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 bf22ce327..b21ab2f92 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 @@ import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
*
* @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 7584d60a9..a31c20ede 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -71,10 +71,10 @@
<properties>
<!-- Project revision -->
- <revision>2.0.0.0-2022.0.5-RC1</revision>
+ <revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
<!-- Polaris SDK version -->
- <polaris.version>2.0.0.0-RC1</polaris.version>
+ <polaris.version>2.0.0.0-SNAPSHOT</polaris.version>
<!-- Dependencies -->
<guava.version>32.0.1-jre</guava.version>