From 7fa4b7f9d2e200eb844d3e0ee5495ab44d036bd8 Mon Sep 17 00:00:00 2001 From: stellar Date: Thu, 11 Apr 2024 17:35:16 +0800 Subject: [PATCH] feat:merge dubbo-remoting-zookeeper-curator5 and dubbo-remoting-zookeeper-api (#13960) --- .artifacts | 2 +- dubbo-compatible/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../dubbo-configcenter-zookeeper/pom.xml | 4 ++-- .../support/zookeeper/ZookeeperDataListener.java | 4 ++-- .../zookeeper/ZookeeperDynamicConfiguration.java | 4 ++-- .../ZookeeperDynamicConfigurationFactory.java | 2 +- dubbo-distribution/dubbo-all-shaded/pom.xml | 4 ++-- dubbo-distribution/dubbo-all/pom.xml | 4 ++-- dubbo-distribution/dubbo-bom/pom.xml | 2 +- dubbo-metadata/dubbo-metadata-report-zookeeper/pom.xml | 2 +- .../store/zookeeper/ZookeeperMetadataReport.java | 8 ++++---- .../zookeeper/ZookeeperMetadataReportFactory.java | 2 +- .../registry/multiple/MultipleRegistry2S2RTest.java | 4 ++-- dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +- .../dubbo/registry/zookeeper/ZookeeperRegistry.java | 10 +++++----- .../registry/zookeeper/ZookeeperRegistryFactory.java | 2 +- .../pom.xml | 2 +- .../zookeeper/curator5}/AbstractZookeeperClient.java | 2 +- .../remoting/zookeeper/curator5}/ChildListener.java | 2 +- .../zookeeper/curator5}/Curator5ZookeeperClient.java | 2 +- .../remoting/zookeeper/curator5}/DataListener.java | 2 +- .../dubbo/remoting/zookeeper/curator5}/EventType.java | 2 +- .../remoting/zookeeper/curator5}/StateListener.java | 2 +- .../remoting/zookeeper/curator5}/ZookeeperClient.java | 2 +- .../zookeeper/curator5}/ZookeeperClientManager.java | 2 +- ...ator5ZookeeperReflectionTypeDescriberRegistrar.java | 2 +- ...ache.dubbo.aot.api.ReflectionTypeDescriberRegistrar | 0 .../curator5}/Curator5ZookeeperClientManagerTest.java | 2 +- .../curator5}/Curator5ZookeeperClientTest.java | 2 +- .../curator5}/support/ZookeeperClientManagerTest.java | 6 +++--- .../src/test/resources/log4j2-test.xml | 0 dubbo-remoting/pom.xml | 2 +- dubbo-test/dubbo-dependencies-all/pom.xml | 2 +- 34 files changed, 47 insertions(+), 47 deletions(-) rename dubbo-remoting/{dubbo-remoting-zookeeper-api => dubbo-remoting-zookeeper-curator5}/pom.xml (98%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/AbstractZookeeperClient.java (99%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/ChildListener.java (94%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/Curator5ZookeeperClient.java (99%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/DataListener.java (94%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/EventType.java (96%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/StateListener.java (94%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/ZookeeperClient.java (98%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/ZookeeperClientManager.java (99%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5}/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java (97%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api => dubbo-remoting-zookeeper-curator5}/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar (100%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5}/Curator5ZookeeperClientManagerTest.java (97%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5}/Curator5ZookeeperClientTest.java (99%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper => dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5}/support/ZookeeperClientManagerTest.java (98%) rename dubbo-remoting/{dubbo-remoting-zookeeper-api => dubbo-remoting-zookeeper-curator5}/src/test/resources/log4j2-test.xml (100%) diff --git a/.artifacts b/.artifacts index 1411e793082..6a500ca04fd 100644 --- 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 index 771016b2f7c..999941c6c69 100644 --- a/dubbo-compatible/pom.xml +++ b/dubbo-compatible/pom.xml @@ -45,7 +45,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index c455a4a0594..a09bb6ab894 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -194,7 +194,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} test diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml b/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml index e3dc062391b..c1deb8c3e5b 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml @@ -36,7 +36,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} @@ -92,7 +92,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java index 5ec5a3cd574..508b9430a87 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/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/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java index 9ca919a772c..1dee56fb636 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/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/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java index 9a90d5fa416..542d0c48d27 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/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 index f6f5cb38a8e..cf41c2bb2b1 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -328,7 +328,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.version} compile true @@ -495,7 +495,7 @@ org.apache.dubbo:dubbo-remoting-http org.apache.dubbo:dubbo-remoting-netty4 org.apache.dubbo:dubbo-remoting-netty - org.apache.dubbo:dubbo-remoting-zookeeper-api + org.apache.dubbo:dubbo-remoting-zookeeper-curator5 org.apache.dubbo:dubbo-rpc-api org.apache.dubbo:dubbo-rpc-dubbo org.apache.dubbo:dubbo-rpc-injvm diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index ca30dda2fcc..48725092bac 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -373,7 +373,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.version} compile true @@ -543,7 +543,7 @@ org.apache.dubbo:dubbo-remoting-http12 org.apache.dubbo:dubbo-remoting-netty4 org.apache.dubbo:dubbo-remoting-netty - org.apache.dubbo:dubbo-remoting-zookeeper-api + org.apache.dubbo:dubbo-remoting-zookeeper-curator5 org.apache.dubbo:dubbo-rpc-api org.apache.dubbo:dubbo-rpc-dubbo org.apache.dubbo:dubbo-rpc-injvm diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index 7a3d764ec1d..80335d6743b 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -412,7 +412,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.version} diff --git a/dubbo-metadata/dubbo-metadata-report-zookeeper/pom.xml b/dubbo-metadata/dubbo-metadata-report-zookeeper/pom.xml index 6c87287df7b..7a344bdfdde 100644 --- a/dubbo-metadata/dubbo-metadata-report-zookeeper/pom.xml +++ b/dubbo-metadata/dubbo-metadata-report-zookeeper/pom.xml @@ -70,7 +70,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} diff --git a/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReport.java index f3fefaa5aad..205138cf472 100644 --- a/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReport.java +++ b/dubbo-metadata/dubbo-metadata-report-zookeeper/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/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportFactory.java b/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportFactory.java index 3ff78904f84..568eacf6d43 100644 --- a/dubbo-metadata/dubbo-metadata-report-zookeeper/src/main/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportFactory.java +++ b/dubbo-metadata/dubbo-metadata-report-zookeeper/src/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/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java b/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java index e90a40769b4..7a258f7ff5b 100644 --- a/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java +++ b/dubbo-registry/dubbo-registry-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 index f545effa0c5..f9228eb8786 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml +++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml @@ -38,7 +38,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.parent.version} diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java index a68a27a3aa9..7ac6e69d5b5 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java +++ b/dubbo-registry/dubbo-registry-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. *

- * '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/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java index 6aada64b11b..c830c557a3e 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-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/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml similarity index 98% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml index 4c397767bed..5f57672cedb 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml @@ -23,7 +23,7 @@ ${revision} ../pom.xml - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 jar ${project.artifactId} The zookeeper remoting module of dubbo project diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/AbstractZookeeperClient.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/AbstractZookeeperClient.java index e830246617a..fe7a9b6015f 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ChildListener.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ChildListener.java index 5ada2815a87..4586f23d9c3 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java index fa0dab5638b..fd51c9f0488 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/DataListener.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/DataListener.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/DataListener.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/DataListener.java index 95b948adafa..483c9d63acd 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/DataListener.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/EventType.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/EventType.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/EventType.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/EventType.java index 9e288036472..25e844fb40f 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/EventType.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/StateListener.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/StateListener.java index 202b6cc63bf..432db95eb35 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperClient.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperClient.java index b2877cd2598..5371f393fd1 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClientManager.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperClientManager.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClientManager.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperClientManager.java index 77332a16be1..53c63a889e8 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClientManager.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java index 1acbf727f04..728dbe819f1 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/aot/Curator5ZookeeperReflectionTypeDescriberRegistrar.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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar similarity index 100% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientManagerTest.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientManagerTest.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientManagerTest.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientManagerTest.java index e02f4061942..e256e4557b6 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientManagerTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientTest.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientTest.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientTest.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientTest.java index 59ca2df8c41..e515fc6504b 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/Curator5ZookeeperClientTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/support/ZookeeperClientManagerTest.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/ZookeeperClientManagerTest.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/support/ZookeeperClientManagerTest.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/ZookeeperClientManagerTest.java index 7ad0e487bc8..a66d94b0edd 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/java/org/apache/dubbo/remoting/zookeeper/support/ZookeeperClientManagerTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/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/dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/resources/log4j2-test.xml b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/resources/log4j2-test.xml similarity index 100% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/test/resources/log4j2-test.xml rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/resources/log4j2-test.xml diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index 35de0e0bf7d..5e4ec226cf5 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -31,7 +31,7 @@ dubbo-remoting-api dubbo-remoting-http dubbo-remoting-netty - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 dubbo-remoting-netty4 dubbo-remoting-http12 diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index 8ad9677d38e..b5c2a75abab 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -322,7 +322,7 @@ org.apache.dubbo - dubbo-remoting-zookeeper-api + dubbo-remoting-zookeeper-curator5 ${project.version}