feat:merge dubbo-remoting-zookeeper-curator5 and dubbo-remoting-zooke…

…eper-api (#13960)
apache · Apr 11, 2024 · 7fa4b7f · 7fa4b7f
1 parent 114dad8
commit 7fa4b7f
Show file tree

Hide file tree

Showing 34 changed files with 47 additions and 47 deletions.
diff --git a/.artifacts b/.artifacts
@@ -79,7 +79,7 @@ dubbo-remoting-http
 dubbo-remoting-http12
 dubbo-remoting-netty
 dubbo-remoting-netty4
-dubbo-remoting-zookeeper-api
+dubbo-remoting-zookeeper-curator5
 dubbo-rpc
 dubbo-rpc-api
 dubbo-rpc-dubbo

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-api</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>

diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
@@ -194,7 +194,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper-api</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>

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

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.ZookeeperClientManager;
+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;

diff --git a/...org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java b/...org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
@@ -19,7 +19,7 @@
 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.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigurationFactory {

diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -328,7 +328,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper-api</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
@@ -495,7 +495,7 @@
                   <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-api</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>
                   <include>org.apache.dubbo:dubbo-rpc-injvm</include>

diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
@@ -373,7 +373,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper-api</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
@@ -543,7 +543,7 @@
                   <include>org.apache.dubbo:dubbo-remoting-http12</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty4</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty</include>
-                  <include>org.apache.dubbo:dubbo-remoting-zookeeper-api</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>
                   <include>org.apache.dubbo:dubbo-rpc-injvm</include>

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

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

diff --git a/...eper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReport.java b/...eper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReport.java
@@ -32,10 +32,10 @@
 import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
 import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
 import org.apache.dubbo.metadata.report.support.AbstractMetadataReport;
-import org.apache.dubbo.remoting.zookeeper.DataListener;
-import org.apache.dubbo.remoting.zookeeper.EventType;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.DataListener;
+import org.apache.dubbo.remoting.zookeeper.curator5.EventType;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...c/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportFactory.java b/...c/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportFactory.java
@@ -20,7 +20,7 @@
 import org.apache.dubbo.common.extension.DisableInject;
 import org.apache.dubbo.metadata.report.MetadataReport;
 import org.apache.dubbo.metadata.report.support.AbstractMetadataReportFactory;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 /**

diff --git a/...y-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java b/...y-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java
@@ -20,8 +20,8 @@
 import org.apache.dubbo.registry.NotifyListener;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.zookeeper.ZookeeperRegistry;
-import org.apache.dubbo.remoting.zookeeper.Curator5ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
 
 import java.util.ArrayList;
 import java.util.List;

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

diff --git a/...gistry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java b/...gistry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -26,10 +26,10 @@
 import org.apache.dubbo.registry.NotifyListener;
 import org.apache.dubbo.registry.support.CacheableFailbackRegistry;
 import org.apache.dubbo.remoting.Constants;
-import org.apache.dubbo.remoting.zookeeper.ChildListener;
-import org.apache.dubbo.remoting.zookeeper.StateListener;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.ChildListener;
+import org.apache.dubbo.remoting.zookeeper.curator5.StateListener;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.RpcException;
 
 import java.util.ArrayList;
@@ -393,7 +393,7 @@ protected boolean isMatch(URL subscribeUrl, URL providerUrl) {
     /**
      * Triggered when children get changed. It will be invoked by implementation of CuratorWatcher.
      * <p>
-     * 'org.apache.dubbo.remoting.zookeeper.Curator5ZookeeperClient.CuratorWatcherImpl' (Curator 5)
+     * 'org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperClient.CuratorWatcherImpl' (Curator 5)
      */
     private class RegistryChildListenerImpl implements ChildListener {
         private final ZookeeperRegistryNotifier notifier;

diff --git a/...zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java b/...zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java
@@ -20,7 +20,7 @@
 import org.apache.dubbo.common.extension.DisableInject;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.support.AbstractRegistryFactory;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 /**

diff --git a/...ting/dubbo-remoting-zookeeper-api/pom.xml → ...dubbo-remoting-zookeeper-curator5/pom.xml b/...ting/dubbo-remoting-zookeeper-api/pom.xml → ...dubbo-remoting-zookeeper-curator5/pom.xml
@@ -23,7 +23,7 @@
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>dubbo-remoting-zookeeper-api</artifactId>
+  <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
   <description>The zookeeper remoting module of dubbo project</description>

diff --git a/...ng/zookeeper/AbstractZookeeperClient.java → ...per/curator5/AbstractZookeeperClient.java b/...ng/zookeeper/AbstractZookeeperClient.java → ...per/curator5/AbstractZookeeperClient.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigItem;

diff --git a/...bbo/remoting/zookeeper/ChildListener.java → ...ing/zookeeper/curator5/ChildListener.java b/...bbo/remoting/zookeeper/ChildListener.java → ...ing/zookeeper/curator5/ChildListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import java.util.List;
 

diff --git a/...ng/zookeeper/Curator5ZookeeperClient.java → ...per/curator5/Curator5ZookeeperClient.java b/...ng/zookeeper/Curator5ZookeeperClient.java → ...per/curator5/Curator5ZookeeperClient.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigItem;

diff --git a/...ubbo/remoting/zookeeper/DataListener.java → ...ting/zookeeper/curator5/DataListener.java b/...ubbo/remoting/zookeeper/DataListener.java → ...ting/zookeeper/curator5/DataListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 /**
  * 2019-02-26

diff --git a/...e/dubbo/remoting/zookeeper/EventType.java → ...emoting/zookeeper/curator5/EventType.java b/...e/dubbo/remoting/zookeeper/EventType.java → ...emoting/zookeeper/curator5/EventType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 /**
  * 2019-02-26

diff --git a/...bbo/remoting/zookeeper/StateListener.java → ...ing/zookeeper/curator5/StateListener.java b/...bbo/remoting/zookeeper/StateListener.java → ...ing/zookeeper/curator5/StateListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 public interface StateListener {
 

diff --git a/...o/remoting/zookeeper/ZookeeperClient.java → ...g/zookeeper/curator5/ZookeeperClient.java b/...o/remoting/zookeeper/ZookeeperClient.java → ...g/zookeeper/curator5/ZookeeperClient.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigItem;

diff --git a/...ing/zookeeper/ZookeeperClientManager.java → ...eper/curator5/ZookeeperClientManager.java b/...ing/zookeeper/ZookeeperClientManager.java → ...eper/curator5/ZookeeperClientManager.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.RemotingConstants;

diff --git a/...eperReflectionTypeDescriberRegistrar.java → ...eperReflectionTypeDescriberRegistrar.java b/...eperReflectionTypeDescriberRegistrar.java → ...eperReflectionTypeDescriberRegistrar.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper.aot;
+package org.apache.dubbo.remoting.zookeeper.curator5.aot;
 
 import org.apache.dubbo.aot.api.MemberCategory;
 import org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar;

diff --git a/....aot.api.ReflectionTypeDescriberRegistrar → ....aot.api.ReflectionTypeDescriberRegistrar b/....aot.api.ReflectionTypeDescriberRegistrar → ....aot.api.ReflectionTypeDescriberRegistrar
diff --git a/...r/Curator5ZookeeperClientManagerTest.java → ...5/Curator5ZookeeperClientManagerTest.java b/...r/Curator5ZookeeperClientManagerTest.java → ...5/Curator5ZookeeperClientManagerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 

diff --git a/...ookeeper/Curator5ZookeeperClientTest.java → ...curator5/Curator5ZookeeperClientTest.java b/...ookeeper/Curator5ZookeeperClientTest.java → ...curator5/Curator5ZookeeperClientTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper;
+package org.apache.dubbo.remoting.zookeeper.curator5;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigItem;

diff --git a/...r/support/ZookeeperClientManagerTest.java → ...5/support/ZookeeperClientManagerTest.java b/...r/support/ZookeeperClientManagerTest.java → ...5/support/ZookeeperClientManagerTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.remoting.zookeeper.support;
+package org.apache.dubbo.remoting.zookeeper.curator5.support;
 
 import org.apache.dubbo.common.URL;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.ZookeeperClientManager;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
 
 import java.util.List;
 

diff --git a/...er-api/src/test/resources/log4j2-test.xml → ...rator5/src/test/resources/log4j2-test.xml b/...er-api/src/test/resources/log4j2-test.xml → ...rator5/src/test/resources/log4j2-test.xml
diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml
@@ -31,7 +31,7 @@
     <module>dubbo-remoting-api</module>
     <module>dubbo-remoting-http</module>
     <module>dubbo-remoting-netty</module>
-    <module>dubbo-remoting-zookeeper-api</module>
+    <module>dubbo-remoting-zookeeper-curator5</module>
     <module>dubbo-remoting-netty4</module>
     <module>dubbo-remoting-http12</module>
   </modules>

diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml
@@ -322,7 +322,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper-api</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.version}</version>
     </dependency>