optimize: use curator instead of zkclient in config model (#6779)

apache · Sep 12, 2024 · be01fb0 · be01fb0
1 parent 1df92e9
commit be01fb0
Show file tree

Hide file tree

Showing 8 changed files with 329 additions and 152 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -95,6 +95,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
 - [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add independent nacos for the CI process
+- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] use curator instead of zkclient in config model
 
 
 ### refactor:

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -95,7 +95,7 @@
 - [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
 - [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
-
+- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] 在config模块中使用curator替代zkclient
 
 ### refactor:
 

diff --git a/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationChangeEvent.java b/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationChangeEvent.java
@@ -141,4 +141,15 @@ public ConfigurationChangeEvent setNamespace(String namespace) {
         this.namespace = namespace;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "ConfigurationChangeEvent{" +
+            "dataId='" + dataId + '\'' +
+            ", oldValue='" + oldValue + '\'' +
+            ", newValue='" + newValue + '\'' +
+            ", namespace='" + namespace + '\'' +
+            ", changeType=" + changeType +
+            '}';
+    }
 }
diff --git a/config/seata-config-zk/pom.xml b/config/seata-config-zk/pom.xml
@@ -36,14 +36,16 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.101tec</groupId>
-            <artifactId>zkclient</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-test</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/config/seata-config-zk/src/main/java/org/apache/seata/config/zk/DefaultZkSerializer.java b/config/seata-config-zk/src/main/java/org/apache/seata/config/zk/DefaultZkSerializer.java