Merge branch '3.3' into 3.3-add-triple-config

apache · May 15, 2024 · 03abedb · 03abedb
2 parents 0a863ca + e826b0c
commit 03abedb
Show file tree

Hide file tree

Showing 49 changed files with 135 additions and 2,211 deletions.
diff --git a/.artifacts b/.artifacts
@@ -38,7 +38,6 @@ dubbo-core-spi
 dubbo-dependencies
 dubbo-dependencies-all
 dubbo-dependencies-bom
-dubbo-dependencies-zookeeper
 dubbo-dependencies-zookeeper-curator5
 dubbo-distribution
 dubbo-filter-cache
@@ -78,8 +77,6 @@ dubbo-remoting-api
 dubbo-remoting-http12
 dubbo-remoting-netty
 dubbo-remoting-netty4
-dubbo-remoting-zookeeper-api
-dubbo-remoting-zookeeper
 dubbo-remoting-zookeeper-curator5
 dubbo-rpc
 dubbo-rpc-api

diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>

diff --git a/...o-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java b/...o-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java
diff --git a/.../src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java b/.../src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java
@@ -22,8 +22,8 @@
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.metrics.config.event.ConfigCenterEvent;
 import org.apache.dubbo.metrics.event.MetricsEventBus;
-import org.apache.dubbo.remoting.zookeeper.DataListener;
-import org.apache.dubbo.remoting.zookeeper.EventType;
+import org.apache.dubbo.remoting.zookeeper.curator5.DataListener;
+import org.apache.dubbo.remoting.zookeeper.curator5.EventType;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 import java.util.Set;

diff --git a/...n/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java b/...n/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
@@ -23,8 +23,8 @@
 import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.NamedThreadFactory;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 import java.util.Collection;
@@ -51,7 +51,7 @@ public class ZookeeperDynamicConfiguration extends TreePathDynamicConfiguration
     private final ApplicationModel applicationModel;
 
     ZookeeperDynamicConfiguration(
-            URL url, ZookeeperTransporter zookeeperTransporter, ApplicationModel applicationModel) {
+            URL url, ZookeeperClientManager zookeeperClientManager, ApplicationModel applicationModel) {
         super(url);
 
         this.cacheListener = new CacheListener();
@@ -67,7 +67,7 @@ public class ZookeeperDynamicConfiguration extends TreePathDynamicConfiguration
                 new NamedThreadFactory(threadName, true),
                 new AbortPolicyWithReport(threadName, url));
 
-        zkClient = zookeeperTransporter.connect(url);
+        zkClient = zookeeperClientManager.connect(url);
         boolean isConnected = zkClient.isConnected();
         if (!isConnected) {
 

diff --git a/...org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java b/...org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
@@ -19,22 +19,22 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.AbstractDynamicConfigurationFactory;
 import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigurationFactory {
 
-    private final ZookeeperTransporter zookeeperTransporter;
+    private final ZookeeperClientManager zookeeperClientManager;
 
     private final ApplicationModel applicationModel;
 
     public ZookeeperDynamicConfigurationFactory(ApplicationModel applicationModel) {
         this.applicationModel = applicationModel;
-        this.zookeeperTransporter = ZookeeperTransporter.getExtension(applicationModel);
+        this.zookeeperClientManager = ZookeeperClientManager.getInstance(applicationModel);
     }
 
     @Override
     protected DynamicConfiguration createDynamicConfiguration(URL url) {
-        return new ZookeeperDynamicConfiguration(url, zookeeperTransporter, applicationModel);
+        return new ZookeeperDynamicConfiguration(url, zookeeperClientManager, applicationModel);
     }
 }
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml
@@ -27,7 +27,6 @@
   <artifactId>dubbo-dependencies</artifactId>
   <packaging>pom</packaging>
   <modules>
-    <module>dubbo-dependencies-zookeeper</module>
     <module>dubbo-dependencies-zookeeper-curator5</module>
   </modules>
 

diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -326,13 +326,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
@@ -495,7 +488,6 @@
                   <include>org.apache.dubbo:dubbo-remoting-http</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty4</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty</include>
-                  <include>org.apache.dubbo:dubbo-remoting-zookeeper</include>
                   <include>org.apache.dubbo:dubbo-remoting-zookeeper-curator5</include>
                   <include>org.apache.dubbo:dubbo-rpc-api</include>
                   <include>org.apache.dubbo:dubbo-rpc-dubbo</include>
@@ -733,9 +725,6 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler</resource>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter</resource>
-                </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener</resource>
                 </transformer>