fix:fix actuator name warning from Tencent#1428 . (Tencent#1429)

SkyeBeFreeman · web-flow · commit b82ff9e08d5a · 2024-09-02T11:00:31.000+08:00
diff --git 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)
+- [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)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`*`
`42`	`42`	`* @author wenxuan70`
`43`	`43`	`*/`
`44`		`-@Endpoint(id = "polaris-circuit-breaker")`
	`44`	`+@Endpoint(id = "polariscircuitbreaker")`
`45`	`45`	`public class PolarisCircuitBreakerEndpoint {`
`46`	`46`
`47`	`47`	`private static final Logger LOG = LoggerFactory.getLogger(PolarisCircuitBreakerEndpoint.class);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`*`
`34`	`34`	`* @author shuiqingliu`
`35`	`35`	`**/`
`36`		`-@Endpoint(id = "polaris-config")`
	`36`	`+@Endpoint(id = "polarisconfig")`
`37`	`37`	`public class PolarisConfigEndpoint {`
`38`	`38`
`39`	`39`	`private final PolarisConfigProperties polarisConfigProperties;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`* @author shuiqingliu`
`40`	`40`	`*/`
`41`		`-@Endpoint(id = "polaris-discovery")`
	`41`	`+@Endpoint(id = "polarisdiscovery")`
`42`	`42`	`public class PolarisDiscoveryEndpoint {`
`43`	`43`
`44`	`44`	`private final PolarisDiscoveryProperties polarisDiscoveryProperties;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`*`
`44`	`44`	`* @author lepdou 2022-07-25`
`45`	`45`	`*/`
`46`		`-@Endpoint(id = "polaris-router")`
	`46`	`+@Endpoint(id = "polarisrouter")`
`47`	`47`	`public class PolarisRouterEndpoint {`
`48`	`48`	`private static final Logger LOGGER = LoggerFactory.getLogger(PolarisRouterEndpoint.class);`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author shuiqingliu`
`32`	`32`	`**/`
`33`		`-@Endpoint(id = "polaris-metadata")`
	`33`	`+@Endpoint(id = "polarismetadata")`
`34`	`34`	`public class PolarisMetadataEndpoint {`
`35`	`35`
`36`	`36`	`private final StaticMetadataManager staticMetadataManager;`