This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new e57fa5491d optimize: rename namingserver registry type (#6827)
e57fa5491d is described below
commit e57fa5491d97dc93f827279102f0bdaefac245a8
Author: ggbocoder <119659920+ggboco...@users.noreply.github.com>
AuthorDate: Mon Sep 9 13:51:16 2024 +0800
optimize: rename namingserver registry type (#6827)
---
changes/en-us/2.x.md | 3 ++-
changes/zh-cn/2.x.md | 1 +
common/src/main/java/org/apache/seata/common/ConfigurationKeys.java | 2 +-
.../main/java/org/apache/seata/discovery/registry/RegistryType.java | 4 ++--
.../registry/namingserver/NamingserverRegistryProvider.java | 2 +-
.../registry/namingserver/NamingserverRegistryServiceImpl.java | 2 +-
script/client/conf/registry.conf | 4 ++--
script/client/spring/application.properties | 6 +++---
script/client/spring/application.yml | 2 +-
.../apache/seata/spring/boot/autoconfigure/StarterConstants.java | 2 +-
server/src/main/resources/application.example.yml | 4 ++--
11 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 9093aed1db..ce93bc3771 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -84,7 +84,8 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize
NacosMockTest UT case
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize
`tableMeta` cache scheduled refresh issue
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change
version to 2.2.0-SNAPSHOT
-
+- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename
namingserver registry type
+
### refactor:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 850f1d7ea7..91322d33a3 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -83,6 +83,7 @@
- [[#6793](https://github.com/apache/incubator-seata/pull/6795)]
独立server的meta信息初始化逻辑
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)]
优化`tableMeta`缓存定时刷新问题
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)]
修改版本号为2.2.0-SNAPSHOT
+- [[#6827](https://github.com/apache/incubator-seata/pull/6827)]
重命名namingserver注册类型改为seata
### refactor:
diff --git
a/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
b/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
index fc3f9c9402..dec76f51b7 100644
--- a/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
+++ b/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
@@ -814,7 +814,7 @@ public interface ConfigurationKeys {
/**
* The constant NAMING_SERVER
*/
- String NAMING_SERVER = "namingserver";
+ String NAMING_SERVER = "seata";
/**
* The constant APPLICATION_ID.
diff --git
a/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryType.java
b/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryType.java
index 20d3d8a7d4..cad816d42c 100644
---
a/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryType.java
+++
b/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryType.java
@@ -62,9 +62,9 @@ public enum RegistryType {
*/
Custom,
/**
- * NamingServer registry type
+ * Seata namingServer registry type
*/
- NamingServer;
+ Seata;
/**
* Gets type.
diff --git
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryProvider.java
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryProvider.java
index 79e52ecf0f..af54037212 100644
---
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryProvider.java
+++
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryProvider.java
@@ -21,7 +21,7 @@ import org.apache.seata.discovery.registry.RegistryProvider;
import org.apache.seata.discovery.registry.RegistryService;
-@LoadLevel(name = "NamingServer", order = 1)
+@LoadLevel(name = "Seata", order = 1)
public class NamingserverRegistryProvider implements RegistryProvider {
@Override
public RegistryService provide() {
diff --git
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
index 837c6d8f4b..fa53bd45f1 100644
---
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
+++
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
@@ -73,7 +73,7 @@ public class NamingserverRegistryServiceImpl implements
RegistryService<NamingLi
private static final String NAMING_SERVICE_URL_KEY = "server-addr";
private static final String FILE_ROOT_REGISTRY = "registry";
private static final String FILE_CONFIG_SPLIT_CHAR = ".";
- private static final String REGISTRY_TYPE = "namingserver";
+ private static final String REGISTRY_TYPE = "seata";
private static final String HTTP_PREFIX = "http://";;
private static final String TIME_OUT_KEY = "timeout";
diff --git a/script/client/conf/registry.conf b/script/client/conf/registry.conf
index 48f2cd60b4..d956abc4c3 100644
--- a/script/client/conf/registry.conf
+++ b/script/client/conf/registry.conf
@@ -16,7 +16,7 @@
#
registry {
- # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa、custom、raft、namingserver
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa、custom、raft、seata
type = "file"
raft {
@@ -44,7 +44,7 @@ registry {
##if use Nacos naming meta-data for SLB service registry, specify nacos
address pattern rules here
#slbPattern = ""
}
- namingserver {
+ seata {
server-addr = "127.0.0.1:8081"
namespace = "public"
heartbeat-period = 5000
diff --git a/script/client/spring/application.properties
b/script/client/spring/application.properties
index e4c004afc0..cb7d93c2ab 100755
--- a/script/client/spring/application.properties
+++ b/script/client/spring/application.properties
@@ -134,9 +134,9 @@ seata.registry.etcd3.server-addr=http://localhost:2379
seata.registry.eureka.weight=1
seata.registry.eureka.service-url=http://localhost:8761/eureka
-seata.registry.namingserver.server-addr=127.0.0.1:8081
-seata.registry.namingserver.namespace=public
-seata.registry.namingserver.heartbeat-period=5000
+seata.registry.seata.server-addr=127.0.0.1:8081
+seata.registry.seata.namespace=public
+seata.registry.seata.heartbeat-period=5000
seata.registry.nacos.application=seata-server
seata.registry.nacos.server-addr=127.0.0.1:8848
diff --git a/script/client/spring/application.yml
b/script/client/spring/application.yml
index e1a170c764..9eef693d33 100755
--- a/script/client/spring/application.yml
+++ b/script/client/spring/application.yml
@@ -131,7 +131,7 @@ seata:
name:
registry:
type: file
- namingserver:
+ seata:
server-addr: 127.0.0.1:8081
namespace: public
heartbeat-period: 5000
diff --git
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
index 3d1d7dcce1..5ec088d43f 100644
---
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
+++
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
@@ -53,7 +53,7 @@ public interface StarterConstants {
String REGISTRY_REDIS_PREFIX = REGISTRY_PREFIX + ".redis";
String REGISTRY_ZK_PREFIX = REGISTRY_PREFIX + ".zk";
String REGISTRY_CONSUL_PREFIX = REGISTRY_PREFIX + ".consul";
- String REGISTRY_NAMINGSERVER_PREFIX = REGISTRY_PREFIX + ".namingserver";
+ String REGISTRY_NAMINGSERVER_PREFIX = REGISTRY_PREFIX + ".seata";
String REGISTRY_ETCD3_PREFIX = REGISTRY_PREFIX + ".etcd3";
String REGISTRY_SOFA_PREFIX = REGISTRY_PREFIX + ".sofa";
String REGISTRY_CUSTOM_PREFIX = REGISTRY_PREFIX + ".custom";
diff --git a/server/src/main/resources/application.example.yml
b/server/src/main/resources/application.example.yml
index 09360ccbaf..de1fc3cde6 100644
--- a/server/src/main/resources/application.example.yml
+++ b/server/src/main/resources/application.example.yml
@@ -76,12 +76,12 @@ seata:
server-addr: http://localhost:2379
key: seata.properties
registry:
- # support: nacos 、 eureka 、 redis 、 zk 、 consul 、 etcd3 、 sofa
+ # support: nacos 、 eureka 、 redis 、 zk 、 consul 、 etcd3 、 sofa 、 seata
type: file
preferred-networks: 30.240.*
metadata:
weight: 100
- namingserver:
+ seata:
server-addr: 127.0.0.1:8081
cluster: default
namespace: public
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
